summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gobang.go4
-rw-r--r--tests/gobang.go184
2 files changed, 94 insertions, 94 deletions
diff --git a/src/gobang.go b/src/gobang.go
index e46b468..8bff74e 100644
--- a/src/gobang.go
+++ b/src/gobang.go
@@ -326,7 +326,7 @@ func Testing(message string, body func()) {
}
}
-func AssertEqual(given any, expected any) {
+func TAssertEqual(given any, expected any) {
if !reflect.DeepEqual(given, expected) {
if showColour() {
fmt.Fprintf(os.Stderr, "\033[0;31mERR\033[0m.\n")
@@ -340,7 +340,7 @@ func AssertEqual(given any, expected any) {
}
}
-func AssertEqualI(i int, given any, expected any) {
+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")
diff --git a/tests/gobang.go b/tests/gobang.go
index 06fcd7f..3033268 100644
--- a/tests/gobang.go
+++ b/tests/gobang.go
@@ -25,7 +25,7 @@ func test_ValidSQLTablePrefix() {
}
for _, given := range input {
- AssertEqual(ValidSQLTablePrefix(given), true)
+ TAssertEqual(ValidSQLTablePrefix(given), true)
}
})
@@ -40,7 +40,7 @@ func test_ValidSQLTablePrefix() {
}
for _, given := range input {
- AssertEqual(ValidSQLTablePrefix(given), false)
+ TAssertEqual(ValidSQLTablePrefix(given), false)
}
})
}
@@ -50,7 +50,7 @@ func test_SomeError() {
Testing("an empty array is nil", func() {
given := []error{}
- AssertEqual(SomeError(given), nil)
+ TAssertEqual(SomeError(given), nil)
})
Testing("only nil values is nil", func() {
@@ -59,7 +59,7 @@ func test_SomeError() {
nil,
nil,
}
- AssertEqual(SomeError(given), nil)
+ TAssertEqual(SomeError(given), nil)
})
Testing("we get the first non-nil value", func() {
@@ -70,7 +70,7 @@ func test_SomeError() {
err1,
err2,
}
- AssertEqual(SomeError(given), err1)
+ TAssertEqual(SomeError(given), err1)
})
}
@@ -79,7 +79,7 @@ func test_SomeFnError() {
Testing("an empty arrays is also nil", func() {
given := [](func() error){}
- AssertEqual(SomeFnError(given), nil)
+ TAssertEqual(SomeFnError(given), nil)
})
Testing("all functions are called", func() {
@@ -93,8 +93,8 @@ func test_SomeFnError() {
fn,
fn,
}
- AssertEqual(SomeFnError(given), nil)
- AssertEqual(i, 3)
+ TAssertEqual(SomeFnError(given), nil)
+ TAssertEqual(i, 3)
})
Testing("we call all functions even if we get an error", func() {
@@ -116,8 +116,8 @@ func test_SomeFnError() {
fn,
fn,
}
- AssertEqual(SomeFnError(given), errs[2])
- AssertEqual(i, 4)
+ TAssertEqual(SomeFnError(given), errs[2])
+ TAssertEqual(i, 4)
})
}
@@ -127,7 +127,7 @@ func test_Random() {
Testing("we get the desired output size", func() {
for i := 0; i < 100; i++ {
buffer := Random(i)
- AssertEqual(len(buffer), i)
+ TAssertEqual(len(buffer), i)
}
})
}
@@ -138,41 +138,41 @@ func test_sourceInfo() {
Testing("sourceInfo() is defined at...", func() {
const FILENAME = "src/gobang.go"
info := sourceInfo(1)
- AssertEqual(info.Key, "src")
- AssertEqual(len(info.Value.Group()), 3)
+ TAssertEqual(info.Key, "src")
+ TAssertEqual(len(info.Value.Group()), 3)
- AssertEqual(info.Value.Group()[0].Key, "file")
+ TAssertEqual(info.Value.Group()[0].Key, "file")
file := info.Value.Group()[0].Value.String()
- AssertEqual(file[len(file) - len(FILENAME):], FILENAME)
+ TAssertEqual(file[len(file) - len(FILENAME):], FILENAME)
- AssertEqual(info.Value.Group()[1].Key, "function")
- AssertEqual(
+ TAssertEqual(info.Value.Group()[1].Key, "function")
+ TAssertEqual(
info.Value.Group()[1].Value.String(),
"gobang.sourceInfo",
)
- AssertEqual(info.Value.Group()[2].Key, "line")
- AssertEqual(info.Value.Group()[2].Value.Kind(), slog.KindInt64)
+ TAssertEqual(info.Value.Group()[2].Key, "line")
+ TAssertEqual(info.Value.Group()[2].Value.Kind(), slog.KindInt64)
})
Testing("we're calling it from...", func() {
const FILENAME = "tests/gobang.go"
info := sourceInfo(2)
- AssertEqual(info.Key, "src")
- AssertEqual(len(info.Value.Group()), 3)
+ TAssertEqual(info.Key, "src")
+ TAssertEqual(len(info.Value.Group()), 3)
- AssertEqual(info.Value.Group()[0].Key, "file")
+ TAssertEqual(info.Value.Group()[0].Key, "file")
file := info.Value.Group()[0].Value.String()
- AssertEqual(file[len(file) - len(FILENAME):], FILENAME)
+ TAssertEqual(file[len(file) - len(FILENAME):], FILENAME)
- AssertEqual(info.Value.Group()[1].Key, "function")
- AssertEqual(
+ TAssertEqual(info.Value.Group()[1].Key, "function")
+ TAssertEqual(
info.Value.Group()[1].Value.String(),
"gobang.test_sourceInfo.func2",
)
- AssertEqual(info.Value.Group()[2].Key, "line")
- AssertEqual(info.Value.Group()[2].Value.Kind(), slog.KindInt64)
+ TAssertEqual(info.Value.Group()[2].Key, "line")
+ TAssertEqual(info.Value.Group()[2].Value.Kind(), slog.KindInt64)
})
}
@@ -181,14 +181,14 @@ func test_logArgs() {
Testing("direct string array return", func() {
args := logArgs("the-type")
- AssertEqual(len(args), 6)
- AssertEqual(args[0], "id")
+ TAssertEqual(len(args), 6)
+ TAssertEqual(args[0], "id")
_, err := guuid.FromString(args[1])
ErrorIf(err)
expected := []string { "kind", "log", "type", "the-type" }
- AssertEqual(args[2:], expected)
+ TAssertEqual(args[2:], expected)
})
}
@@ -200,7 +200,7 @@ func test_anyArr() {
var given []any = anyArr(input)
var expected []any = []any { "one", "two", "three" }
- AssertEqual(given, expected)
+ TAssertEqual(given, expected)
})
}
@@ -226,11 +226,11 @@ func testLog(
_, err = time.Parse(time.RFC3339, data["time"].(string))
ErrorIf(err)
- AssertEqual(data["level"].(string), levelName)
- AssertEqual(data["kind" ].(string), "log")
- AssertEqual(data["msg" ].(string), "a-message")
- AssertEqual(data["type" ].(string), "a-type")
- AssertEqual(data["a-key"].(string), "a-value")
+ TAssertEqual(data["level"].(string), levelName)
+ TAssertEqual(data["kind" ].(string), "log")
+ TAssertEqual(data["msg" ].(string), "a-message")
+ TAssertEqual(data["type" ].(string), "a-type")
+ TAssertEqual(data["a-key"].(string), "a-value")
}
slog.SetDefault(savedLogger)
@@ -246,7 +246,7 @@ func testNoLog(filterLevel LogLevel, fn func(string, string, ...any)) {
level = filterLevel
fn("a-message", "a-type", "a-key", "a-value")
- AssertEqual(s.String(), "")
+ TAssertEqual(s.String(), "")
slog.SetDefault(savedLogger)
level = savedLevel
@@ -312,7 +312,7 @@ func test_metric() {
emitMetric = false
metric("", "")
- AssertEqual(s.String(), "")
+ TAssertEqual(s.String(), "")
slog.SetDefault(savedLogger)
emitMetric = savedFlag
@@ -339,12 +339,12 @@ func test_metric() {
_, err = guuid.FromString(data["id"].(string))
ErrorIf(err)
- AssertEqual(data["level"].(string), "INFO")
- AssertEqual(data["msg" ].(string), "_")
- AssertEqual(data["kind" ].(string), "metric")
- AssertEqual(data["type" ].(string), "a-type")
- AssertEqual(data["label"].(string), "a-label")
- AssertEqual(int(data["count-something"].(float64)), 123)
+ TAssertEqual(data["level"].(string), "INFO")
+ TAssertEqual(data["msg" ].(string), "_")
+ TAssertEqual(data["kind" ].(string), "metric")
+ TAssertEqual(data["type" ].(string), "a-type")
+ TAssertEqual(data["label"].(string), "a-label")
+ TAssertEqual(int(data["count-something"].(float64)), 123)
slog.SetDefault(savedLogger)
emitMetric = savedFlag
@@ -368,17 +368,17 @@ func test_Timed() {
err := json.Unmarshal([]byte(s.String()), &data)
ErrorIf(err)
- AssertEqual(data["type"].(string), "timer")
- AssertEqual(data["label"].(string), "timer-label")
- AssertEqual(data["key-1"].(string), "value-1")
+ TAssertEqual(data["type"].(string), "timer")
+ TAssertEqual(data["label"].(string), "timer-label")
+ TAssertEqual(data["key-1"].(string), "value-1")
var ok bool
_, ok = data["start"].(string)
- AssertEqual(ok, true)
+ TAssertEqual(ok, true)
_, ok = data["end"].(string)
- AssertEqual(ok, true)
+ TAssertEqual(ok, true)
_, ok = data["duration"].(float64)
- AssertEqual(ok, true)
+ TAssertEqual(ok, true)
slog.SetDefault(savedLogger)
emitMetric = savedFlag
@@ -403,10 +403,10 @@ func test_MakeCounter() {
err := json.Unmarshal([]byte(s.String()), &data)
ErrorIf(err)
- AssertEqual(data["type" ].(string), "counter")
- AssertEqual(data["label"].(string), "emit-tcp-error")
- AssertEqual(int(data["value" ].(float64)), 1)
- AssertEqual(int(data["more-data"].(float64)), 555)
+ TAssertEqual(data["type" ].(string), "counter")
+ TAssertEqual(data["label"].(string), "emit-tcp-error")
+ TAssertEqual(int(data["value" ].(float64)), 1)
+ TAssertEqual(int(data["more-data"].(float64)), 555)
slog.SetDefault(savedLogger)
emitMetric = savedFlag
@@ -427,10 +427,10 @@ func test_MakeCounter() {
err := json.Unmarshal([]byte(s.String()), &data)
ErrorIf(err)
- AssertEqual(data["type"].(string), "counter")
- AssertEqual(data["label"].(string), "label-1")
- AssertEqual(data["key-1"].(string), "value-1")
- AssertEqual(data["key-2"].(string), "value-2")
+ TAssertEqual(data["type"].(string), "counter")
+ TAssertEqual(data["label"].(string), "label-1")
+ TAssertEqual(data["key-1"].(string), "value-1")
+ TAssertEqual(data["key-2"].(string), "value-2")
slog.SetDefault(savedLogger)
emitMetric = savedFlag
@@ -456,11 +456,11 @@ func test_MakeGauge() {
err := json.Unmarshal([]byte(s.String()), &data)
ErrorIf(err)
- AssertEqual(data["level"].(string), "ERROR")
- AssertEqual(data["msg" ].(string), "Gauge went negative")
- AssertEqual(data["kind" ].(string), "log")
- AssertEqual(data["type" ].(string), "process-metric")
- AssertEqual(int(data["value"].(float64)), -1)
+ TAssertEqual(data["level"].(string), "ERROR")
+ TAssertEqual(data["msg" ].(string), "Gauge went negative")
+ TAssertEqual(data["kind" ].(string), "log")
+ TAssertEqual(data["type" ].(string), "process-metric")
+ TAssertEqual(int(data["value"].(float64)), -1)
}
slog.SetDefault(savedLogger)
@@ -483,17 +483,17 @@ func test_MakeGauge() {
activeTCPConnections.Inc("more-data", 999)
strs := strings.Split(s.String(), "\n")
- AssertEqual(len(strs), 6)
- AssertEqual(strs[5], "")
+ TAssertEqual(len(strs), 6)
+ TAssertEqual(strs[5], "")
var data map[string]interface{}
err := json.Unmarshal([]byte(strs[len(strs) - 2]), &data)
ErrorIf(err)
- AssertEqual(data["type" ].(string), "gauge")
- AssertEqual(data["label"].(string), "active-tcp-connections")
- AssertEqual(int(data["value" ].(float64)), 3)
- AssertEqual(int(data["more-data"].(float64)), 999)
+ TAssertEqual(data["type" ].(string), "gauge")
+ TAssertEqual(data["label"].(string), "active-tcp-connections")
+ TAssertEqual(int(data["value" ].(float64)), 3)
+ TAssertEqual(int(data["more-data"].(float64)), 999)
slog.SetDefault(savedLogger)
emitMetric = savedFlag
@@ -524,17 +524,17 @@ func test_showColour() {
Testing("true when envvar is unset", func() {
ErrorIf(os.Unsetenv(NAME))
- AssertEqual(showColour(), true)
+ TAssertEqual(showColour(), true)
})
Testing("true when envvar is empty", func() {
ErrorIf(os.Setenv(NAME, ""))
- AssertEqual(showColour(), true)
+ TAssertEqual(showColour(), true)
})
Testing("false otherwise", func() {
ErrorIf(os.Setenv(NAME, "1"))
- AssertEqual(showColour(), false)
+ TAssertEqual(showColour(), false)
})
ErrorIf(os.Setenv(NAME, savedEnvvar))
@@ -560,10 +560,10 @@ func test_SetLoggerOutput() {
src := data["src"].(map[string]interface{})
file := src["file"].(string)
const FILENAME = "tests/gobang.go"
- AssertEqual(file[len(file) - len(FILENAME):], FILENAME)
- AssertEqual(src["function"].(string), "gobang.test_SetLoggerOutput.func1")
+ TAssertEqual(file[len(file) - len(FILENAME):], FILENAME)
+ TAssertEqual(src["function"].(string), "gobang.test_SetLoggerOutput.func1")
line := src["line"].(float64)
- AssertEqual(line > 0, true)
+ TAssertEqual(line > 0, true)
SourceInfoSkip = saved
})
@@ -579,8 +579,8 @@ func test_SetLoggerOutput() {
info := data["info"].(map[string]interface{})
- AssertEqual(int(info["pid" ].(float64)), os.Getpid())
- AssertEqual(int(info["ppid"].(float64)), os.Getppid())
+ TAssertEqual(int(info["pid" ].(float64)), os.Getpid())
+ TAssertEqual(int(info["ppid"].(float64)), os.Getppid())
_, err = guuid.FromString(info["puuid"].(string))
ErrorIf(err)
@@ -595,7 +595,7 @@ func test_SetLoggerOutput() {
err := json.Unmarshal([]byte(s.String()), &data)
ErrorIf(err)
- AssertEqual(data["one"].(map[string]interface{})["key"].(string), "value")
+ TAssertEqual(data["one"].(map[string]interface{})["key"].(string), "value")
})
Testing("the puuid is the same across calls to the logger", func() {
@@ -605,8 +605,8 @@ func test_SetLoggerOutput() {
Info("", "second")
strs := strings.Split(s.String(), "\n")
- AssertEqual(len(strs), 3)
- AssertEqual(strs[2], "")
+ TAssertEqual(len(strs), 3)
+ TAssertEqual(strs[2], "")
log1 := strs[0]
log2 := strs[1]
@@ -621,13 +621,13 @@ func test_SetLoggerOutput() {
puuid1 := puuidFromString(log1)
puuid2 := puuidFromString(log2)
- AssertEqual(puuid1, puuid2)
+ TAssertEqual(puuid1, puuid2)
uuid1, err := guuid.FromString(puuid1)
ErrorIf(err)
uuid2, err := guuid.FromString(puuid2)
ErrorIf(err)
- AssertEqual(uuid1, uuid2)
+ TAssertEqual(uuid1, uuid2)
})
slog.SetDefault(savedLogger)
@@ -645,14 +645,14 @@ func test_levelFromString() {
theLevel >= LevelNone &&
theLevel <= LevelDebug &&
theLevel != fallback
- AssertEqual(notFallback, true)
+ TAssertEqual(notFallback, true)
}
})
Testing("fallback for unexpected values", func() {
var fallback LogLevel = 123
theLevel := levelFromString(string(Random(10)), fallback)
- AssertEqual(theLevel, fallback)
+ TAssertEqual(theLevel, fallback)
})
}
@@ -670,7 +670,7 @@ func test_setLogLevel() {
setLogLevel()
- AssertEqual(level, fallbackValue)
+ TAssertEqual(level, fallbackValue)
})
Testing("noop when envvar is empty", func() {
@@ -679,7 +679,7 @@ func test_setLogLevel() {
setLogLevel()
- AssertEqual(level, fallbackValue)
+ TAssertEqual(level, fallbackValue)
})
Testing("update variable otherwise", func() {
@@ -688,7 +688,7 @@ func test_setLogLevel() {
setLogLevel()
- AssertEqual(level, LevelDebug)
+ TAssertEqual(level, LevelDebug)
})
ErrorIf(os.Setenv(NAME, savedEnvvar))
@@ -710,7 +710,7 @@ func test_SetLevel() {
}
for _, l := range levels {
SetLevel(l)
- AssertEqual(l, level)
+ TAssertEqual(l, level)
}
})
@@ -730,7 +730,7 @@ func test_setMetric() {
setMetric()
- AssertEqual(emitMetric, true)
+ TAssertEqual(emitMetric, true)
})
Testing("noop when envvar is empty", func() {
@@ -739,7 +739,7 @@ func test_setMetric() {
setMetric()
- AssertEqual(emitMetric, true)
+ TAssertEqual(emitMetric, true)
})
Testing("make variable false otherwise", func() {
@@ -748,7 +748,7 @@ func test_setMetric() {
setMetric()
- AssertEqual(emitMetric, false)
+ TAssertEqual(emitMetric, false)
})
ErrorIf(os.Setenv(NAME, savedEnvvar))
@@ -778,7 +778,7 @@ func test_setHostname() {
name, _ := os.Hostname()
hostname = ""
setHostname()
- AssertEqual(hostname, name)
+ TAssertEqual(hostname, name)
})
}
generated by cgit v1.2.3 (git 2.49.0) at 2025-07-12 23:18:24 +0000