[Scummvm-git-logs] scummvm master -> 02cf8bc3710cfbf2dcfbe3c079607d3d2ee70def

bluegr noreply at scummvm.org
Sat Feb 7 15:58:54 UTC 2026


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
02cf8bc371 TESTS: Replace ULTIMA strings and vectors with common code


Commit: 02cf8bc3710cfbf2dcfbe3c079607d3d2ee70def
    https://github.com/scummvm/scummvm/commit/02cf8bc3710cfbf2dcfbe3c079607d3d2ee70def
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-02-07T17:58:51+02:00

Commit Message:
TESTS: Replace ULTIMA strings and vectors with common code

Replaced Ultima::Std::string and Ultima::Std::vector with Common::String and Common::Array in the test suite for string splitting tests.

Changed paths:
    test/engines/ultima/ultima8/misc/util.h


diff --git a/test/engines/ultima/ultima8/misc/util.h b/test/engines/ultima/ultima8/misc/util.h
index 9b2fae65b03..5662f38122c 100644
--- a/test/engines/ultima/ultima8/misc/util.h
+++ b/test/engines/ultima/ultima8/misc/util.h
@@ -1,5 +1,4 @@
 #include <cxxtest/TestSuite.h>
-#include "engines/ultima/shared/std/string.h"
 #include "engines/ultima/ultima8/misc/util.h"
 
 /**
@@ -12,20 +11,20 @@ class U8UtilTestSuite : public CxxTest::TestSuite {
 	}
 
 	void test_split_string() {
-		Ultima::Std::string s1 = "abc,def";
-		Ultima::Std::vector<Ultima::Std::string> v1;
+		Common::String s1 = "abc,def";
+		Common::Array<Common::String> v1;
 		Ultima::Ultima8::SplitString(s1, ',', v1);
 
 		TS_ASSERT_EQUALS(v1.size(), 2);
 		TS_ASSERT_EQUALS(v1[0], "abc");
 		TS_ASSERT_EQUALS(v1[1], "def");
 
-		Ultima::Std::string s2;
-		Ultima::Std::vector<Ultima::Std::string> v2;
+		Common::String s2;
+		Common::Array<Common::String> v2;
 		Ultima::Ultima8::SplitString(s2, ',', v1);
 		TS_ASSERT_EQUALS(v1.size(), 0);
 
-		Ultima::Std::string s3 = " aa  bb  ";
+		Common::String s3 = " aa  bb  ";
 		Ultima::Ultima8::SplitString(s3, ' ', v1);
 		TS_ASSERT_EQUALS(v1.size(), 6);
 		TS_ASSERT_EQUALS(v1[0], "");




More information about the Scummvm-git-logs mailing list