diff --git a/Makefile b/Makefile index cb52685..113348d 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ run: test: # go test ./... which gotestsum || go install gotest.tools/gotestsum@latest - gotestsum --format "testname" -- -tags="timetzdata sqlite_fts5 sqlite_foreign_keys" "./test" + gotestsum --format "testname" -- -tags="timetzdata sqlite_fts5 sqlite_foreign_keys" "./..." version: _data/version.sh \ No newline at end of file diff --git a/langext/array.go b/langext/array.go index 7b9b460..952d288 100644 --- a/langext/array.go +++ b/langext/array.go @@ -400,7 +400,7 @@ func ArrCastErr[T1 any, T2 any](arr []T1) ([]T2, error) { if vcast, ok := any(v).(T2); ok { r[i] = vcast } else { - return nil, errors.New(fmt.Sprintf("Cannot cast element %d of type %T to type %s", i, v, *new(T2))) + return nil, errors.New(fmt.Sprintf("Cannot cast element %d of type %T to type %v", i, v, *new(T2))) } } return r, nil @@ -412,7 +412,7 @@ func ArrCastPanic[T1 any, T2 any](arr []T1) []T2 { if vcast, ok := any(v).(T2); ok { r[i] = vcast } else { - panic(fmt.Sprintf("Cannot cast element %d of type %T to type %s", i, v, *new(T2))) + panic(fmt.Sprintf("Cannot cast element %d of type %T to type %v", i, v, *new(T2))) } } return r diff --git a/langext/base58_test.go b/langext/base58_test.go index 11b1b86..02fd341 100644 --- a/langext/base58_test.go +++ b/langext/base58_test.go @@ -1,6 +1,7 @@ package langext import ( + "gogs.mikescher.com/BlackForestBytes/goext/tst" "testing" ) @@ -60,7 +61,7 @@ func TestBase58FlickrDecoding(t *testing.T) { tst.AssertEqual(t, _decStr(t, Base58FlickrEncoding, "48638rmBiUzG5NKQoX4KcuE5C8paCFACnE28F7qDx13PRtennAmYSSJQ5gJSRihf5ZDyEQS4UimtihR7uARt4wbty2fW9duTQTM9n1DwUBevreyzGwu6W4YSgrvQgCPDxsiE1mCdZsF8VEBpuHHEiJyw"), "If debugging is the process of removing software bugs, then programming must be the process of putting them in.") } -func tst.AssertEqual(t *testing.T, actual string, expected string) { +func assertEqual(t *testing.T, actual string, expected string) { if actual != expected { t.Errorf("values differ: Actual: '%v', Expected: '%v'", actual, expected) } diff --git a/termext/termcolor_test.go b/termext/termcolor_test.go index cf7d229..5eb47c6 100644 --- a/termext/termcolor_test.go +++ b/termext/termcolor_test.go @@ -1,6 +1,7 @@ package termext import ( + "gogs.mikescher.com/BlackForestBytes/goext/tst" "math/rand" "testing" ) @@ -32,9 +33,3 @@ func TestColor(t *testing.T) { tst.AssertEqual(t, CleanString(Gray("test")), "test") tst.AssertEqual(t, CleanString(White("test")), "test") } - -func tst.AssertEqual(t *testing.T, actual string, expected string) { - if actual != expected { - t.Errorf("values differ: Actual: '%v', Expected: '%v'", actual, expected) - } -} diff --git a/timeext/parser_test.go b/timeext/parser_test.go index a8064e0..96b300e 100644 --- a/timeext/parser_test.go +++ b/timeext/parser_test.go @@ -7,56 +7,56 @@ import ( func TestParseDurationShortString(t *testing.T) { - tst.AssertPDSSEqual(t, FromSeconds(1), "1s") - tst.AssertPDSSEqual(t, FromSeconds(1), "1sec") - tst.AssertPDSSEqual(t, FromSeconds(1), "1second") - tst.AssertPDSSEqual(t, FromSeconds(1), "1seconds") - tst.AssertPDSSEqual(t, FromSeconds(100), "100second") - tst.AssertPDSSEqual(t, FromSeconds(100), "100seconds") - tst.AssertPDSSEqual(t, FromSeconds(1883639.77), "1883639.77second") - tst.AssertPDSSEqual(t, FromSeconds(1883639.77), "1883639.77seconds") - tst.AssertPDSSEqual(t, FromSeconds(50), "50s") - tst.AssertPDSSEqual(t, FromSeconds(50), "50sec") - tst.AssertPDSSEqual(t, FromSeconds(1), "1second") - tst.AssertPDSSEqual(t, FromSeconds(50), "50seconds") + assertPDSSEqual(t, FromSeconds(1), "1s") + assertPDSSEqual(t, FromSeconds(1), "1sec") + assertPDSSEqual(t, FromSeconds(1), "1second") + assertPDSSEqual(t, FromSeconds(1), "1seconds") + assertPDSSEqual(t, FromSeconds(100), "100second") + assertPDSSEqual(t, FromSeconds(100), "100seconds") + assertPDSSEqual(t, FromSeconds(1883639.77), "1883639.77second") + assertPDSSEqual(t, FromSeconds(1883639.77), "1883639.77seconds") + assertPDSSEqual(t, FromSeconds(50), "50s") + assertPDSSEqual(t, FromSeconds(50), "50sec") + assertPDSSEqual(t, FromSeconds(1), "1second") + assertPDSSEqual(t, FromSeconds(50), "50seconds") - tst.AssertPDSSEqual(t, FromMinutes(10), "10m") - tst.AssertPDSSEqual(t, FromMinutes(10), "10min") - tst.AssertPDSSEqual(t, FromMinutes(1), "1minute") - tst.AssertPDSSEqual(t, FromMinutes(10), "10minutes") - tst.AssertPDSSEqual(t, FromMinutes(10.5), "10.5minutes") + assertPDSSEqual(t, FromMinutes(10), "10m") + assertPDSSEqual(t, FromMinutes(10), "10min") + assertPDSSEqual(t, FromMinutes(1), "1minute") + assertPDSSEqual(t, FromMinutes(10), "10minutes") + assertPDSSEqual(t, FromMinutes(10.5), "10.5minutes") - tst.AssertPDSSEqual(t, FromMilliseconds(100), "100ms") - tst.AssertPDSSEqual(t, FromMilliseconds(100), "100milliseconds") - tst.AssertPDSSEqual(t, FromMilliseconds(100), "100millisecond") + assertPDSSEqual(t, FromMilliseconds(100), "100ms") + assertPDSSEqual(t, FromMilliseconds(100), "100milliseconds") + assertPDSSEqual(t, FromMilliseconds(100), "100millisecond") - tst.AssertPDSSEqual(t, FromNanoseconds(99235), "99235ns") - tst.AssertPDSSEqual(t, FromNanoseconds(99235), "99235nanoseconds") - tst.AssertPDSSEqual(t, FromNanoseconds(99235), "99235nanosecond") + assertPDSSEqual(t, FromNanoseconds(99235), "99235ns") + assertPDSSEqual(t, FromNanoseconds(99235), "99235nanoseconds") + assertPDSSEqual(t, FromNanoseconds(99235), "99235nanosecond") - tst.AssertPDSSEqual(t, FromMicroseconds(99235), "99235us") - tst.AssertPDSSEqual(t, FromMicroseconds(99235), "99235microseconds") - tst.AssertPDSSEqual(t, FromMicroseconds(99235), "99235microsecond") + assertPDSSEqual(t, FromMicroseconds(99235), "99235us") + assertPDSSEqual(t, FromMicroseconds(99235), "99235microseconds") + assertPDSSEqual(t, FromMicroseconds(99235), "99235microsecond") - tst.AssertPDSSEqual(t, FromHours(1), "1h") - tst.AssertPDSSEqual(t, FromHours(1), "1hour") - tst.AssertPDSSEqual(t, FromHours(2), "2hours") + assertPDSSEqual(t, FromHours(1), "1h") + assertPDSSEqual(t, FromHours(1), "1hour") + assertPDSSEqual(t, FromHours(2), "2hours") - tst.AssertPDSSEqual(t, FromDays(1), "1d") - tst.AssertPDSSEqual(t, FromDays(1), "1day") - tst.AssertPDSSEqual(t, FromDays(10), "10days") - tst.AssertPDSSEqual(t, FromDays(1), "1days") - tst.AssertPDSSEqual(t, FromDays(10), "10day") + assertPDSSEqual(t, FromDays(1), "1d") + assertPDSSEqual(t, FromDays(1), "1day") + assertPDSSEqual(t, FromDays(10), "10days") + assertPDSSEqual(t, FromDays(1), "1days") + assertPDSSEqual(t, FromDays(10), "10day") - tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d10m") - tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10)+FromSeconds(200), "1d10m200sec") - tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d:10m") - tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d 10m") - tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d,10m") - tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d, 10m") - tst.AssertPDSSEqual(t, FromDays(1)+FromSeconds(1000), "1d 1000seconds") + assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d10m") + assertPDSSEqual(t, FromDays(1)+FromMinutes(10)+FromSeconds(200), "1d10m200sec") + assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d:10m") + assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d 10m") + assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d,10m") + assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d, 10m") + assertPDSSEqual(t, FromDays(1)+FromSeconds(1000), "1d 1000seconds") - tst.AssertPDSSEqual(t, FromDays(1), "86400s") + assertPDSSEqual(t, FromDays(1), "86400s") } func assertPDSSEqual(t *testing.T, expected time.Duration, fmt string) {