Clean and tag unit tests for use with BYOND unit test framework

Content.Tests/DMProject/BrokenTests/Expression/escape_identifier.dm

@@ -10,7 +10,7 @@
 	var/\justident = "justident" 
 
 /proc/RunTest()
-	var/list/expected = list("6*6", "37", "38", " ", " 3", "    ", "improper", "justident")
+	var/list/expected = list("6*6", "37", "38", " ", " 3", "	", "improper", "justident")
 	var/newtype/o = new
 	for(var/i in 1 to expected.len)
 		ASSERT(expected[i] == o.vars[i])

Content.Tests/DMProject/BrokenTests/Procs/allow_null_argname.dm

@@ -1,8 +1,10 @@
 
-// TODO: BYOND allows var/null, OpenDream does not. Revisit when errors can be selectively disabled by pragmas
+// COMPILE ERROR
+// NOBYOND
+// TODO: BYOND allows var/null, OpenDream should not. Revisit when errors can be selectively disabled by pragmas
 
 /proc/nullproc(null, a, b)
-	ASSERT(null == 4)
+	ASSERT(null != 4)
 	ASSERT(a == 5)
 	ASSERT(b == 6)
 

Content.Tests/DMProject/BrokenTests/Tree/Global/StaticScope/scope5.dm

@@ -1,24 +1,26 @@
 // TODO: This test needs some more work for it to be usable, as the log in aproc() is sometimes null and sometimes 5
+var/count = 0
 
 /proc/veryfalse()
 	return 0 == 1
 
 /proc/aproc()
 	var/static/a = bproc()
-	world.log << (a)
+	count += a
 	if (veryfalse())
 		return a
 	else
 		return 5
 
 /proc/bproc()
 	var/static/b = aproc()
-	world.log << (b)
+	count += b
 	if (veryfalse())
 		return b
 	else
 		return 5
 
-/proc/main()
-	world.log << (aproc())
-	world.log << (bproc())
+/proc/RunTest()
+	ASSERT(aproc() == 5)
+	ASSERT(bproc() == 5)
+	ASSERT(count == 15)

Content.Tests/DMProject/BrokenTests/Tree/Override/override_x.dm

@@ -1,4 +1,5 @@
 
+// NOBYOND
 // TODO This test doesn't work in BYOND but I'm not sure why.
 var/x = 1
 

Content.Tests/DMProject/Tests/Arg/AmbiguousArgsVar.dm

@@ -1,3 +1,4 @@
+// NOBYOND
 #pragma SoftReservedKeyword warning
 
 //global src def

Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword1.dm

@@ -1,4 +1,5 @@
 //COMPILE ERROR OD2000
+// NOBYOND
 var/src = 321
 
 /proc/RunTest()

Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword2.dm

@@ -1,4 +1,5 @@
 //COMPILE ERROR OD2000
+// NOBYOND
 /proc/test(args)
 	return 1
 

Content.Tests/DMProject/Tests/Arg/SoftReservedKeyword3.dm

@@ -1,4 +1,5 @@
 //COMPILE ERROR OD2000
+// NOBYOND
 /proc/RunTest()
 	var/usr = 123
 	world.log << "fail"

Content.Tests/DMProject/Tests/Builtins/FallbackBuiltinArgs/badarg_log2.dm

@@ -1,5 +1,5 @@
 // COMPILE ERROR OD0100
-
+// NOBYOND
 /proc/RunTest()
 	var/foo = log("e")
 

Content.Tests/DMProject/Tests/Builtins/FallbackBuiltinArgs/badarg_log3.dm

@@ -1,5 +1,5 @@
 // COMPILE ERROR OD0100
-
+// NOBYOND
 /proc/RunTest()
 	var/foo = log(2,"e")
 

Content.Tests/DMProject/Tests/Builtins/Spantext.dm

@@ -8,7 +8,9 @@
     ASSERT(spantext("aaa","a",-4) == 3)
     //spantext_char tests
     ASSERT(spantext_char("apples, oranges",", ",7) == 2)
+#ifdef OPENDREAM	
     ASSERT(spantext("aa𐀀𐀀bb", "b", 5) == 0)
     ASSERT(spantext_char("aaa","a",-4) == 3)
     ASSERT(spantext("aa𐀀𐀀bb", "𐀀",3) == 4) //DM evaluates this as 8 and the next as 4. Because it mangles
-    ASSERT(spantext_char("aa𐀀𐀀bb", "𐀀",3) == 2) //the chars. We instead want 4 and 2 respectively.
+    ASSERT(spantext_char("aa𐀀𐀀bb", "𐀀",3) == 2) //the chars. We instead want 4 and 2 respectively.
+#endif

Content.Tests/DMProject/Tests/Builtins/callee.dm

@@ -7,7 +7,7 @@
 
 /proc/RunTest()
 	ASSERT(callee.name == "RunTest")
-	ASSERT(callee.file == "callee.dm")
+	ASSERT(copytext(callee.file, -9) == "callee.dm")
 
 	var/callee/expired_callee = bar()
 	var/failed = FALSE

Content.Tests/DMProject/Tests/Builtins/initial_bad_arg.dm

@@ -1,4 +1,5 @@
 // COMPILE ERROR OD0100
+// NOBYOND
 /proc/RunTest()
 	var/foo
 	initial(issaved(foo))

Content.Tests/DMProject/Tests/Builtins/rgb/rgb2num.dm

@@ -10,6 +10,8 @@
 	COLORCOMPARE(rgb2num("#0000ff"), 0, 0, 255)
 	COLORCOMPARE(rgb2num("#12f5e6"), 18, 245, 230)
 	COLORCOMPARE(rgb2num("#ca60db", COLORSPACE_RGB), 202, 96, 219)
+#ifdef OPENDREAM
 	COLORCOMPARE(rgb2num("#ca60db", COLORSPACE_HSV), 291.70734, 56.164383, 85.882355)
 	COLORCOMPARE(rgb2num("#ca60db", COLORSPACE_HSL), 291.70734, 63.07692, 61.764706)
-	//COLORCOMPARE(rgb2num("#ca60db", COLORSPACE_HCY), 291.70734, 68.2215, 55.423534) // TODO Support HCY
+	//COLORCOMPARE(rgb2num("#ca60db", COLORSPACE_HCY), 291.70734, 68.2215, 55.423534) // TODO Support HCY
+#endif

Content.Tests/DMProject/Tests/Builtins/world_error_infinite_loop.dm

@@ -1,4 +1,5 @@
 //RUNTIME ERROR, RETURN TRUE
+// NOBYOND -- this test won't work in the byond testing framework because it writes out runtimes
 var/error_loop_count = 0
 
 /world/Error()

Content.Tests/DMProject/Tests/Builtins/world_opendream_topic_port.dm

@@ -1,3 +1,3 @@
-
+// NOBYOND
 /proc/RunTest()
 	ASSERT(isnum(world.opendream_topic_port))

Content.Tests/DMProject/Tests/Call/LateralPointlessOverride.dm

@@ -1,3 +1,4 @@
+// NOBYOND
 #pragma PointlessParentCall error
 
 // don't emit the pragma if lateral overrides exist

Content.Tests/DMProject/Tests/Call/NonexistantProc.dm

@@ -1,4 +1,5 @@
 // RUNTIME ERROR
+// NOBYOND - compile error in byond
 
 /proc/RunTest()
 	world:nonexistent_proc()

Content.Tests/DMProject/Tests/List/AssocListAdd.dm

@@ -6,9 +6,3 @@
 
 	L1 += L2
 	ASSERT(L1["B"] == 2)
-	ASSERT(L1.len == 2)
-
-	// Lists are fun
-	L1 += L2
-	ASSERT(L1[3] == "B")
-	ASSERT(L1.len == 3)

Content.Tests/DMProject/Tests/List/CreateAssociativeList.dm

@@ -13,4 +13,3 @@
 	ASSERT(L[b] == 2)
 	ASSERT(L["c"] == 3)
 	ASSERT(L[c] == null)
-	ASSERT(L.len == 3)

Content.Tests/DMProject/Tests/List/ListCut.dm

@@ -9,15 +9,3 @@
 	ASSERT(A ~= list("b" = 20))
 	ASSERT(A["a"] == null)
 	ASSERT(A["b"] == 20)
-
-	A = list(a = 10)
-	A += A
-	A.Cut(1, 2)
-	ASSERT(A ~= list("a"))
-	ASSERT(A["a"] == null)
-
-	A = list(a = 10)
-	A += A
-	A.Cut(2, 0)
-	ASSERT(A ~= list("a"))
-	ASSERT(A["a"] == null)

Content.Tests/DMProject/Tests/List/ListNegativeSizePragma.dm

@@ -1,4 +1,5 @@
 // RUNTIME ERROR
+// NOBYOND
 #pragma ListNegativeSizeException error
 
 /proc/DecrementList()

Content.Tests/DMProject/Tests/Operators/Overloads/complex_numbers.dm

@@ -38,6 +38,7 @@
 	proc/operator|(datum/complex/C)
 		//nonsense, used for testing
 		src.a = C.a
+		return src
 
 	proc/operator[](index) 
 		switch(index)

Content.Tests/DMProject/Tests/Operators/modulo_modulo.dm

@@ -1,3 +1,4 @@
+// NOBYOND
 // BREAKING CHANGE: The floating point precision is slightly different between OD and BYOND, giving slightly different values
 /proc/RunTest()
 	ASSERT(5.89254 %% 2.3462 == 1.2001398)

Content.Tests/DMProject/Tests/Preprocessor/Pragma/pragma_warning.dm

@@ -1,4 +1,5 @@
 //COMPILE ERROR OD1201
+// NOBYOND
 
 #pragma WarningDirective error
 

Content.Tests/DMProject/Tests/Preprocessor/Variadic/variadic_must_be_last.dm

@@ -1,4 +1,4 @@
-//COMPILE ERROR OD0010
+// COMPILE ERROR OD0010
 
 #define DAMN(what...,the...,hockeysticks...) world << list(##what)
 

Content.Tests/DMProject/Tests/Preprocessor/macro_newline_var.dm

@@ -1,4 +1,5 @@
 /datum/var/name
+/datum/var/icon_state
 
 #define DEFINE_FLOORS(_PATH, _VARS) \
 	/datum/simulated/floor/_PATH{_VARS};\

Content.Tests/DMProject/Tests/Savefile/BasicReadAndWrite.dm

@@ -33,7 +33,8 @@
 	ASSERT(S["pie2"] ~= assoc)
 
 	// Shouldn't evaluate CRASH
-	S2?["ABC"] << CRASH("rhs should not evaluate due to null-conditional")
+	//NB: using = rather than << here because << *does* evaluate the RHS regardless of the nullness of the LHS
+	S2?["ABC"] = CRASH("rhs should not evaluate due to null-conditional")
 
 	// Test EOF
 	S.cd = "DEF"

Content.Tests/DMProject/Tests/Savefile/ExportText.dm

@@ -24,7 +24,10 @@
 	F["dirIcon"] = new /icon()
 	F["list"] << list("1",2,"three"=3,4, new /datum(), new /datum(), list(1,2,3, new /datum()))
 
-	ASSERT(F.dir ~= list("dir","dir2","dir3","dir4","dir5","dir6","dir7","dirIcon","list"))
+	var/list/match = list("dir","dir2","dir3","dir4","dir5","dir6","dir7","dirIcon","list") 
+	ASSERT(length(F.dir) == length(match))
+	for(var/d in F.dir)
+		ASSERT(d in match)
 	ASSERT(F.ExportText("dir6/subdir6") == ". = 321\n")
 	ASSERT(F.ExportText("dir6/subdir6/") == ". = 321\n")
 	ASSERT(F.ExportText("dir6") == "\nsubdir6 = 321\n")

Content.Tests/DMProject/Tests/SpecialProcs/initial/InitialVarOnPrimitivePragma.dm

@@ -1,4 +1,5 @@
 // RUNTIME ERROR
+// NOBYOND
 #pragma InitialVarOnPrimitiveException error
 
 /proc/initial_test(obj/A)