[Scummvm-git-logs] scummvm master -> 88297933ce76a2dfc69e95e5c8edf6afa05cc383

[lephilousophe]

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:
88297933ce TEST: Fix test build


Commit: 88297933ce76a2dfc69e95e5c8edf6afa05cc383
    https://github.com/scummvm/scummvm/commit/88297933ce76a2dfc69e95e5c8edf6afa05cc383
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-02-07T17:19:54+01:00

Commit Message:
TEST: Fix test build

There is no Ultima specific Str class anymore.

Changed paths:
  R test/engines/ultima/shared/core/str.h
    test/engines/ultima/ultima8/games/treasure_loader.h
    test/module.mk


diff --git a/test/engines/ultima/shared/core/str.h b/test/engines/ultima/shared/core/str.h
deleted file mode 100644
index 98a2185aa67..00000000000
--- a/test/engines/ultima/shared/core/str.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <cxxtest/TestSuite.h>
-#include "engines/ultima/shared/core/str.h"
-
-/**
- * Test suite for the functions in engines/ultima/shared/core/str.h
- */
-
-class UltimaStrSuite : public CxxTest::TestSuite {
-
-	public:
-	UltimaStrSuite () {
-	}
-
-	void test_index_of() {
-		Ultima::Shared::String s = "  a  ";
-		TS_ASSERT_EQUALS(s.indexOf(' '), 0);
-		TS_ASSERT_EQUALS(s.indexOf('a'), 2);
-		TS_ASSERT_EQUALS(s.indexOf('z'), -1);
-
-		s = " alksjdf ][";
-		TS_ASSERT_EQUALS(s.indexOf("3245j9083f45"), 5);
-		TS_ASSERT_EQUALS(s.indexOf("0123456789"), -1);
-	}
-
-	void test_split() {
-		Ultima::Shared::String s = "abc,def,,aaa,";
-		Ultima::Shared::StringArray a = s.split(',');
-		// Note: final empty string is trimmed
-		TS_ASSERT_EQUALS(a.size(), 4);
-		TS_ASSERT_EQUALS(a[1], "def");
-		TS_ASSERT_EQUALS(a[2], "");
-
-		Ultima::Shared::String s2 = "e,";
-		a = s.split(s2);
-		TS_ASSERT_EQUALS(a.size(), 5);
-		TS_ASSERT_EQUALS(a[1], "d");
-		TS_ASSERT_EQUALS(a[2], "f");
-	}
-};
diff --git a/test/engines/ultima/ultima8/games/treasure_loader.h b/test/engines/ultima/ultima8/games/treasure_loader.h
index 15546f7b5bc..6655de8c654 100644
--- a/test/engines/ultima/ultima8/games/treasure_loader.h
+++ b/test/engines/ultima/ultima8/games/treasure_loader.h
@@ -18,7 +18,7 @@ class U8TreasureLoaderTestSuite : public CxxTest::TestSuite {
 
 	/* Parse nothing -> should return nothing */
 	void test_parse_empty() {
-		Ultima::Std::vector<Ultima::Ultima8::TreasureInfo> t;
+		Common::Array<Ultima::Ultima8::TreasureInfo> t;
 		bool result = loader.parse("", t);
 		TS_ASSERT(result);
 		TS_ASSERT(t.empty());
@@ -26,7 +26,7 @@ class U8TreasureLoaderTestSuite : public CxxTest::TestSuite {
 
 	/* Parse a single treasure type */
 	void test_parse_basic() {
-		Ultima::Std::vector<Ultima::Ultima8::TreasureInfo> t;
+		Common::Array<Ultima::Ultima8::TreasureInfo> t;
 
 		bool result = loader.parse("shape=123,456 frame=2,3 count=4-20 map=23 chance=0.234", t);
 		TS_ASSERT(result);
@@ -48,7 +48,7 @@ class U8TreasureLoaderTestSuite : public CxxTest::TestSuite {
 
 	/* Parse multiple treasure types */
 	void test_parse_multi() {
-		Ultima::Std::vector<Ultima::Ultima8::TreasureInfo> t;
+		Common::Array<Ultima::Ultima8::TreasureInfo> t;
 
 		bool result = loader.parse("shape=123;shape=456 frame=2-5;shape=888 map=-12", t);
 		TS_ASSERT(result);
@@ -79,7 +79,7 @@ class U8TreasureLoaderTestSuite : public CxxTest::TestSuite {
 
 	/* Check that various invalid strings don't parse */
 	void test_parse_invalid() {
-		Ultima::Std::vector<Ultima::Ultima8::TreasureInfo> t;
+		Common::Array<Ultima::Ultima8::TreasureInfo> t;
 
 		bool result;
 
diff --git a/test/module.mk b/test/module.mk
index 848d2e5466a..2b23cc0d7c3 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -40,9 +40,6 @@ ifeq ($(ENABLE_WINTERMUTE), STATIC_PLUGIN)
 endif
 
 ifeq ($(ENABLE_ULTIMA), STATIC_PLUGIN)
-ifdef ENABLE_ULTIMA1
-	TESTS += $(srcdir)/test/engines/ultima/shared/*/*.h
-endif
 ifdef ENABLE_ULTIMA8
 	TESTS += $(srcdir)/test/engines/ultima/ultima8/*/*.h
 endif