Division unit test fixes (#2150)

Co-authored-by: ike709 <[email protected]>
OpenDreamProject · Dec 30, 2024 · aab2f49 · aab2f49
1 parent f7b6d43
commit aab2f49
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero1.dm b/Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero1.dm
@@ -1,4 +1,4 @@
-// COMPILE ERROR
+// COMPILE ERROR OD0011
 
 var/a = 1 / 0
 

diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero3.dm b/Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero3.dm
@@ -1,4 +1,4 @@
-// COMPILE ERROR
+// COMPILE ERROR OD0011
 
 var/static/a = 1 / 0
 

diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero4.dm b/Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero4.dm
@@ -1,4 +1,4 @@
-// COMPILE ERROR
+// COMPILE ERROR OD0011
 
 /proc/one()
 	return 1

diff --git a/Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero6.dm b/Content.Tests/DMProject/Broken Tests/Tree/Const/Div_Zero/div_zero6.dm
@@ -1,4 +1,4 @@
-// COMPILE ERROR
+// COMPILE ERROR OD0011
 
 var/const/a = 0
 var/b = 1 / a

diff --git a/...en Tests/Tree/Const/Div_Zero/div_zero2.dm → ...ct/Tests/Tree/Const/Div_Zero/div_zero2.dm b/...en Tests/Tree/Const/Div_Zero/div_zero2.dm → ...ct/Tests/Tree/Const/Div_Zero/div_zero2.dm
diff --git a/...en Tests/Tree/Const/Div_Zero/div_zero5.dm → ...ct/Tests/Tree/Const/Div_Zero/div_zero5.dm b/...en Tests/Tree/Const/Div_Zero/div_zero5.dm → ...ct/Tests/Tree/Const/Div_Zero/div_zero5.dm
diff --git a/Content.Tests/DMTests.cs b/Content.Tests/DMTests.cs
@@ -79,6 +79,7 @@ public void TestFiles(string sourceFile, DMTestFlags testFlags, int errorCode) {
 
             Assert.That(compiledFile is not null && File.Exists(compiledFile), "Failed to compile DM source file");
             Assert.That(_dreamMan.LoadJson(compiledFile), $"Failed to load {compiledFile}");
+            _dreamMan.LastDMException = null; // Nuke any exception from a prior test
             _dreamMan.StartWorld();
 
             (bool successfulRun, DreamValue? returned, Exception? exception) = RunTest();
@@ -114,8 +115,6 @@ public void TestFiles(string sourceFile, DMTestFlags testFlags, int errorCode) {
     }
 
     private (bool Success, DreamValue? Returned, Exception? except) RunTest() {
-        var prev = _dreamMan.LastDMException;
-
         DreamValue? retValue = null;
         Task<DreamValue> callTask = null!;
 
@@ -143,7 +142,7 @@ public void TestFiles(string sourceFile, DMTestFlags testFlags, int errorCode) {
             }
         }
 
-        bool retSuccess = _dreamMan.LastDMException == prev; // Works because "null == null" is true in this language.
+        bool retSuccess = _dreamMan.LastDMException == null; // Works because "null == null" is true in this language.
         return (retSuccess, retValue, _dreamMan.LastDMException);
     }