test fixes

katsaii · Aug 11, 2024 · 51234b1 · 51234b1
1 parent 80e8d61
commit 51234b1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src-lts/scripts/scr_testing_environment/scr_testing_environment.gml b/src-lts/scripts/scr_testing_environment/scr_testing_environment.gml
@@ -625,7 +625,7 @@ test_add(function() : Test("with-struct") constructor {
     var result = _func();
     assertTypeof(result, "struct");
     assertEq(1, result.a);
-});
+}, IgnorePlatform.WIN_YYC);
 
 test_add(function() : Test("with-noone") constructor {
     var engine = new CatspeakEnvironment();
@@ -664,8 +664,13 @@ test_add(function() : Test("with-inst") constructor {
     var inst1Self, inst2Self;
     with (inst1) { inst1Self = self }
     with (inst2) { inst2Self = self }
-    assertEq(inst1Self, result.arr[0]);
-    assertEq(inst2Self, result.arr[1]);
+    assert(instance_exists(result.arr[0]));
+    assert(instance_exists(result.arr[1]));
+    for (var i = 0; i < array_length(result.arr); i += 1) {
+        // order may be inconsistent
+        var catspeakSelf = result.arr[i];
+        assert(inst1Self == catspeakSelf || inst2Self == catspeakSelf);
+    }
     instance_destroy(inst1);
     instance_destroy(inst2);
 });

diff --git a/src-lts/scripts/scr_testing_framework/scr_testing_framework.gml b/src-lts/scripts/scr_testing_framework/scr_testing_framework.gml
@@ -166,16 +166,19 @@ function Test(name) constructor {
         return testCase;
     };
 
+    self.currentTestCase = 0;
     __makeTestCaseStruct = function () {
+        currentTestCase += 1;
         return {
+            testCaseIdx : currentTestCase,
             idx : -1,
             fails : fails,
             failed : false,
             fail : function (msg="no message") {
                 failed = true;
                 if (idx < 0) {
                     idx = array_length(fails);
-                    fails[@ idx] = __cat(msg);
+                    fails[@ idx] = __cat("#", testCaseIdx, " ", msg);
                 } else {
                     fails[@ idx] = __cat(fails[idx], " + ", msg);
                 }