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

Content.Tests/DMProject/BrokenTests/Tree/Global/Var/vars_field.dm

@@ -0,0 +1,7 @@
+
+//# issue 697
+
+// TODO: A lot of macros seem to also be in global.vars in BYOND but this isn't implemented in OD yet
+
+/proc/RunTest()
+	ASSERT(global.vars["TRUE"] == 1)

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

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

Content.Tests/DMProject/Tests/Arg/DefaultArgument.dm

@@ -1,2 +1,2 @@
-/proc/RunTest(datum/arg = new())
+/proc/RunTest(datum/arg = new())
 	ASSERT(istype(arg, /datum))

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/AssertFail.dm

@@ -1,4 +1,4 @@
-// RUNTIME ERROR
+// RUNTIME ERROR
 
 /proc/RunTest()
 	ASSERT(FALSE)

Content.Tests/DMProject/Tests/Builtins/AssertPass.dm

@@ -1,2 +1,2 @@
-/proc/RunTest()
+/proc/RunTest()
 	ASSERT(TRUE)

Content.Tests/DMProject/Tests/Builtins/Clamp.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/out1 = clamp(10, 1, 5)
 	ASSERT(out1 == 5)
 	var/out2 = clamp(-10, 1, 5)

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/JsonEncode.dm

@@ -1,4 +1,4 @@
-
+
 /datum/proc/foo()
 
 /proc/RunTest()

Content.Tests/DMProject/Tests/Builtins/MD5.dm

@@ -1,3 +1,3 @@
-/proc/RunTest()
+/proc/RunTest()
 	ASSERT(md5("md5_test") == "c74318b61a3024520c466f828c043c79")
 	ASSERT(md5(file('turf.dmi')) == "0ce21a42eed3205f5e22eabac6f02eaa")

Content.Tests/DMProject/Tests/Builtins/Matrix/MatrixNew.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/matrix/M = matrix(1,2,3,4,5,6)
 	var/matrix/N = matrix()
 	var/matrix/B = matrix(M)

Content.Tests/DMProject/Tests/Builtins/Max.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	// Single arg returns that arg
 	ASSERT(max(1) == 1)
 

Content.Tests/DMProject/Tests/Builtins/Nonspantext.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	ASSERT(nonspantext("Hello, World!", ", ", -1) == 1)
 	ASSERT(nonspantext("Hello, World!", ", ", 3) == 3)
 	ASSERT(nonspantext("Hello, World!", ", ", 7) == 0)

Content.Tests/DMProject/Tests/Builtins/SHA1.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	ASSERT(sha1("ABCDEF") == "970093678b182127f60bb51b8af2c94d539eca3a")
 	ASSERT(sha1("abcdef") == "1f8ac10f23c5b5bc1167bda84b833e5c057a77d2")
 	ASSERT(sha1(file('turf.dmi')) == "513e55e301c44636c3e9cf6162cf896107c1d984")

Content.Tests/DMProject/Tests/Builtins/gradient.dm

@@ -1,4 +1,4 @@
-// We do HSV gradients our own way
+// We do HSV gradients our own way
 
 /proc/RunTest()
 	var/list/gradlist = list(0, "#ff0000", 1, "#00ff00")

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/params2list.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	ASSERT(params2list("a;b;c") ~= list(a="", b="", c=""))
 	ASSERT(json_encode(params2list("a;a;a")) == @#{"a":["","",""]}#)
 

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

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	ASSERT(rgb(255, 255, 255) =="#ffffff")
 	ASSERT(rgb(255, 0, 0) == "#ff0000" )
 	ASSERT(rgb(0, 0, 255) == "#0000ff")

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

@@ -1,4 +1,4 @@
-#define COLORCOMPARE(rgb, r, g, b) ASSERT((rgb[1] == r) && (rgb[2] == g) && (rgb[3] == b))
+#define COLORCOMPARE(rgb, r, g, b) ASSERT((rgb[1] == r) && (rgb[2] == g) && (rgb[3] == b))
 
 /proc/RunTest()
 	COLORCOMPARE(rgb2num(null), 255, 255, 255)

Content.Tests/DMProject/Tests/Builtins/text2ascii2text.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	ASSERT(text2ascii_char("abcdéfg",6) == 102) //102 is f
 	ASSERT(ascii2text(text2ascii("a")) == "a")
 	var/list/values = list(

Content.Tests/DMProject/Tests/Builtins/trimtext.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	ASSERT(trimtext("   test") == "test")
 	ASSERT(trimtext("test   ") == "test")
 	ASSERT(trimtext("   test   ") == "test")

Content.Tests/DMProject/Tests/Builtins/turn.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	// Note byond goes counterclockwise (why) (unlike every other turn proc also)
 
 	// Handle the testable invalid case

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/AsyncReturn.dm

@@ -1,4 +1,4 @@
-/proc/async_return()
+/proc/async_return()
 	. = 420
 	sleep(0)
 	return 1337

Content.Tests/DMProject/Tests/Call/CallProcName.dm

@@ -1,4 +1,4 @@
-/datum/proc/call_target()
+/datum/proc/call_target()
 	return 13
 
 /proc/RunTest()

Content.Tests/DMProject/Tests/Call/Crash.dm

@@ -1,4 +1,4 @@
-// RUNTIME ERROR, RETURN TRUE
+// RUNTIME ERROR, RETURN TRUE
 
 /proc/RunTest()
 	. = TRUE

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
+// RUNTIME ERROR
+// NOBYOND - compile error in byond
 
 /proc/RunTest()
 	world:nonexistent_proc()

Content.Tests/DMProject/Tests/Call/StackOverflow.dm

@@ -1,4 +1,4 @@
-// RUNTIME ERROR, NO RETURN
+// RUNTIME ERROR, NO RETURN
 
 /proc/RunTest()
 	. = TRUE

Content.Tests/DMProject/Tests/Call/Super.dm

@@ -1,4 +1,4 @@
-/datum/parent
+/datum/parent
 	proc/f(a)
 		return a
 

Content.Tests/DMProject/Tests/Call/Synchronous.dm

@@ -1,4 +1,4 @@
-/proc/sync_test()
+/proc/sync_test()
 	return 1992
 
 /proc/RunTest()

Content.Tests/DMProject/Tests/Const/Const6.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/a = 137
 	switch(a)
 		if(20)

Content.Tests/DMProject/Tests/Dereference/ConditionalAccess.dm

@@ -1,4 +1,4 @@
-#include "Shared/Recursive.dm"
+#include "Shared/Recursive.dm"
 
 /proc/RunTest()
 	var/datum/recursive/R = new()

Content.Tests/DMProject/Tests/Dereference/ConditionalAccessError.dm

@@ -1,4 +1,4 @@
-// RUNTIME ERROR
+// RUNTIME ERROR
 #include "Shared/Recursive.dm"
 
 /proc/RunTest()

Content.Tests/DMProject/Tests/Dereference/ConditionalCall.dm

@@ -1,4 +1,4 @@
-// IGNORE
+// IGNORE
 // This test case is currently broken
 #include "Shared/Recursive.dm"
 

Content.Tests/DMProject/Tests/Dereference/ConditionalCallError.dm

@@ -1,4 +1,4 @@
-// RUNTIME ERROR
+// RUNTIME ERROR
 #include "Shared/Recursive.dm"
 
 /proc/RunTest()

Content.Tests/DMProject/Tests/Dereference/ConditionalMutate.dm

@@ -1,4 +1,4 @@
-#include "Shared/Recursive.dm"
+#include "Shared/Recursive.dm"
 
 /proc/RunTest()
 	var/datum/recursive/R = null

Content.Tests/DMProject/Tests/Dereference/Shared/Recursive.dm

@@ -1,4 +1,4 @@
-// IGNORE
+// IGNORE
 
 /datum/recursive
 	var/datum/recursive/inner

Content.Tests/DMProject/Tests/Dereference/SrcAssignment.dm

@@ -1,4 +1,4 @@
-/datum/A/var/TestSrcVar = "A"
+/datum/A/var/TestSrcVar = "A"
 /datum/A/proc/TestSrcProc()
 	return "A"
 

Content.Tests/DMProject/Tests/Expression/edge_comparison.dm

@@ -1,4 +1,4 @@
-
+
 /proc/RunTest()
 	// null violates the holy trichotomy here, with how it compares to an empty string.
 	ASSERT( (null > "") == 0 )

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

@@ -1,14 +1,8 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/list/L1 = list("A" = 1)
 	var/list/L2 = list("B" = 2)
 
 	ASSERT( (L1 + L2)["B"] == 2 )
 
 	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/AssocListCombine.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/list/L = list("A")
 	L |= list("B" = 1)
 	ASSERT(L ~= list("A", "B" = 1))

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

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/a = "World"
 	var/b = "Hello"
 	var/c = "Goodbye"
@@ -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

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/list/A = list(1,2,3)
 	ASSERT(A.len == 3)
 	A.Cut()
@@ -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/ListEmptyCut.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/list/L = list()
 	L.Cut()
 	// Incase of weird proc issues

Content.Tests/DMProject/Tests/List/ListJoin.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/list/L = list(1, 2, 3, 4, 5)
 
 	ASSERT(L.Join(";") == "1;2;3;4;5")

Content.Tests/DMProject/Tests/List/ListMutation.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/list/L = list(1, 2, 3)
 	L[2] *= 15
 	L[3] *= 0

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

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

Content.Tests/DMProject/Tests/List/RemoveKey.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/list/L = list("foo" = "bar")
 
 	// Removing the key should remove the associated value as well

Content.Tests/DMProject/Tests/List/ValueInList.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/list/L = list(1, 2, 3)
 	ASSERT(!(4 in L))
 	ASSERT(3 in L)

Content.Tests/DMProject/Tests/List/alist/AListAdd.dm

@@ -3,9 +3,7 @@
 	AL.Add("c", "d")
 	ASSERT(AL["c"] == -4)
 	ASSERT(AL["d"] == null)
-	ASSERT(length(AL) == 4)
 
 	AL.Add(list("c", "d"))
 	ASSERT(AL["c"] == -4)
-	ASSERT(AL["d"] == null)
-	ASSERT(length(AL) == 4)
+	ASSERT(AL["d"] == null)

Content.Tests/DMProject/Tests/Loop/For.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/counter = 0
 	for(var/i in 1 to 3)
 		counter++

Content.Tests/DMProject/Tests/Loop/ForShortCircuit.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/i = 0
 	var/j = 0
 	var/list/L1 = null

Content.Tests/DMProject/Tests/Loop/GlobalLoop.dm

@@ -1,4 +1,4 @@
-/datum/a
+/datum/a
 /datum/b
 
 /proc/RunTest()

Content.Tests/DMProject/Tests/Math/IncrementAndDecrement.dm

@@ -1,4 +1,4 @@
-/proc/RunTest()
+/proc/RunTest()
 	var/i = 1
 
 	i++