s/ErrorIf/TErrorIf/g

1 files changed, 40 insertions, 30 deletions

diff --git a/src/gobang.go b/src/gobang.go
index 0e5bbd9..2efaca4 100644
--- a/src/gobang.go
+++ b/src/gobang.go
@@ -288,20 +288,6 @@ func MakeGauge(label string, staticArgs ...any) Gauge {
 	}
 }
 
-func ErrorIf(err error) {
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Unexpected error: %#v\n", err)
-		os.Exit(1)
-	}
-}
-
-func ErrorNil(err error) {
-	if err == nil {
-		fmt.Fprintf(os.Stderr, "Expected error, got nil\n")
-		os.Exit(1)
-	}
-}
-
 func showColour() bool {
 	return os.Getenv("NO_COLOUR") == ""
 }
@@ -326,31 +312,55 @@ func Testing(message string, body func()) {
 	}
 }
 
+func terr() {
+	if showColour() {
+		fmt.Fprintf(os.Stderr, "\033[0;31mERR\033[0m.\n")
+	} else {
+		fmt.Fprintf(os.Stderr, "ERR.\n")
+	}
+}
+
 func TAssertEqual(given any, expected any) {
 	if !reflect.DeepEqual(given, expected) {
-		if showColour() {
-			fmt.Fprintf(os.Stderr, "\033[0;31mERR\033[0m.\n")
-		} else {
-			fmt.Fprintf(os.Stderr, "ERR.\n")
-		}
+		terr()
 		fmt.Fprintf(os.Stderr, "given != expected\n")
 		fmt.Fprintf(os.Stderr, "given:    %#v\n", given)
 		fmt.Fprintf(os.Stderr, "expected: %#v\n", expected)
-		os.Exit(1)
+		os.Exit(100)
 	}
 }
 
-func TAssertEqualI(i int, given any, expected any) {
-	if !reflect.DeepEqual(given, expected) {
-		if showColour() {
-			fmt.Fprintf(os.Stderr, "\033[0;31mERR\033[0m.\n")
-		} else {
-			fmt.Fprintf(os.Stderr, "ERR.\n")
+func TAssertEqualI(givenarr []any, expectedarr []any) {
+	for i, _ := range givenarr {
+		given    := givenarr[i]
+		expected := expectedarr[i]
+		if !reflect.DeepEqual(given, expected) {
+			terr()
+			fmt.Fprintf(
+				os.Stderr,
+				"given != expected (i = %d)\n",
+				i,
+			)
+			fmt.Fprintf(os.Stderr, "given:    %#v\n", given)
+			fmt.Fprintf(os.Stderr, "expected: %#v\n", expected)
+			os.Exit(100)
 		}
-		fmt.Fprintf(os.Stderr, "given != expected (i = %d)\n", i)
-		fmt.Fprintf(os.Stderr, "given:    %#v\n", given)
-		fmt.Fprintf(os.Stderr, "expected: %#v\n", expected)
-		os.Exit(1)
+	}
+}
+
+func TErrorIf(err error) {
+	if err != nil {
+		terr()
+		fmt.Fprintf(os.Stderr, "Unexpected error: %#v\n", err)
+		os.Exit(100)
+	}
+}
+
+func TErrorNil(err error) {
+	if err == nil {
+		terr()
+		fmt.Fprintf(os.Stderr, "Expected error, got nil\n")
+		os.Exit(100)
 	}
 }