ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve tests in general.

Browse Source 
Less spammy core tests: They don't print PASSes now, only logs and failures.

`core:image` and `core:encoding/xml` tests also find their assets relative to `ODIN_ROOT` now.
This commit is contained in:
Jeroen van Rijn
2021-12-05 02:53:09 +01:00
parent d65d6edb0e
commit d7200f6144
8 changed files with 948 additions and 960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/core/compress/test_core_compress.odin
+3 -6
View File
@@ -30,18 +30,15 @@ when ODIN_TEST {
log :: testing.log log :: testing.log
} else { } else {
expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) {
fmt.printf("[%v] ", loc)
TEST_count += 1 TEST_count += 1
if !condition { if !condition {
TEST_fail += 1 TEST_fail += 1
fmt.println(message) fmt.printf("[%v] %v\n", loc, message)
return return
} }
fmt.println(" PASS")
} }
log :: proc(t: ^testing.T, v: any, loc := #caller_location) { log :: proc(t: ^testing.T, v: any, loc := #caller_location) {
fmt.printf("[%v] ", loc) fmt.printf("[%v] LOG:\n\t%v\n", loc, v)
fmt.printf("log: %v\n", v)
} }
} }
@@ -51,7 +48,7 @@ main :: proc() {
zlib_test(&t) zlib_test(&t)
gzip_test(&t) gzip_test(&t)
fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count)
} }
@test @test
tests/core/crypto/test_core_crypto.odin
+844 -847
View File
File diff suppressed because it is too large Load Diff
tests/core/encoding/json/test_core_json.odin
+3 -6
View File
@@ -12,18 +12,15 @@ when ODIN_TEST {
log :: testing.log log :: testing.log
} else { } else {
expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) {
fmt.printf("[%v] ", loc)
TEST_count += 1 TEST_count += 1
if !condition { if !condition {
TEST_fail += 1 TEST_fail += 1
fmt.println(message) fmt.printf("[%v] %v\n", loc, message)
return return
} }
fmt.println(" PASS")
} }
log :: proc(t: ^testing.T, v: any, loc := #caller_location) { log :: proc(t: ^testing.T, v: any, loc := #caller_location) {
fmt.printf("[%v] ", loc) fmt.printf("[%v] LOG:\n\t%v\n", loc, v)
fmt.printf("log: %v\n", v)
} }
} }
@@ -33,7 +30,7 @@ main :: proc() {
parse_json(&t) parse_json(&t)
marshal_json(&t) marshal_json(&t)
fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count)
} }
@test @test
tests/core/encoding/xml/test_core_xml.odin
+20 -23
View File
@@ -173,23 +173,20 @@ TESTS :: []TEST{
} }
when ODIN_TEST { when ODIN_TEST {
expect :: testing.expect expect :: testing.expect
log :: testing.log log :: testing.log
} else { } else {
expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) {
fmt.printf("[%v] ", loc) TEST_count += 1
TEST_count += 1 if !condition {
if !condition { TEST_fail += 1
TEST_fail += 1 fmt.printf("[%v] %v\n", loc, message)
fmt.println(message) return
return }
} }
fmt.println(" PASS") log :: proc(t: ^testing.T, v: any, loc := #caller_location) {
} fmt.printf("[%v] LOG:\n\t%v\n", loc, v)
log :: proc(t: ^testing.T, v: any, loc := #caller_location) { }
fmt.printf("[%v] ", loc)
fmt.printf("log: %v\n", v)
}
} }
test_file_path :: proc(filename: string) -> (path: string) { test_file_path :: proc(filename: string) -> (path: string) {
@@ -229,7 +226,7 @@ doc_to_string :: proc(doc: ^xml.Document) -> (result: string) {
written += wprintf(writer, "[DOCTYPE] %v\n", doc.doctype.ident) written += wprintf(writer, "[DOCTYPE] %v\n", doc.doctype.ident)
if len(doc.doctype.rest) > 0 { if len(doc.doctype.rest) > 0 {
wprintf(writer, "\t%v\n", doc.doctype.rest) wprintf(writer, "\t%v\n", doc.doctype.rest)
} }
} }
@@ -238,9 +235,9 @@ doc_to_string :: proc(doc: ^xml.Document) -> (result: string) {
} }
if doc.root != nil { if doc.root != nil {
wprintln(writer, " --- ") wprintln(writer, " --- ")
print_element(writer, doc.root) print_element(writer, doc.root)
wprintln(writer, " --- ") wprintln(writer, " --- ")
} }
return written, .None return written, .None
@@ -293,7 +290,7 @@ run_tests :: proc(t: ^testing.T) {
for test in TESTS { for test in TESTS {
path := test_file_path(test.filename) path := test_file_path(test.filename)
printf("\nTrying to parse %v\n\n", path) log(t, fmt.tprintf("Trying to parse %v", path))
doc, err := xml.parse(path, test.options, Silent) doc, err := xml.parse(path, test.options, Silent)
defer xml.destroy(doc) defer xml.destroy(doc)
@@ -323,7 +320,7 @@ run_tests :: proc(t: ^testing.T) {
} }
main :: proc() { main :: proc() {
t := testing.T{} t := testing.T{}
track: mem.Tracking_Allocator track: mem.Tracking_Allocator
mem.tracking_allocator_init(&track, context.allocator) mem.tracking_allocator_init(&track, context.allocator)
@@ -338,5 +335,5 @@ main :: proc() {
} }
} }
fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count)
} }
tests/core/hash/test_core_hash.odin
+3 -6
View File
@@ -14,18 +14,15 @@ when ODIN_TEST {
log :: testing.log log :: testing.log
} else { } else {
expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) {
fmt.printf("[%v] ", loc)
TEST_count += 1 TEST_count += 1
if !condition { if !condition {
TEST_fail += 1 TEST_fail += 1
fmt.println(" FAIL:", message) fmt.printf("[%v] %v", loc, message)
return return
} }
fmt.println(" PASS")
} }
log :: proc(t: ^testing.T, v: any, loc := #caller_location) { log :: proc(t: ^testing.T, v: any, loc := #caller_location) {
fmt.printf("[%v] ", loc) fmt.printf("[%v] LOG:\n\t%v\n", loc, v)
fmt.printf("log: %v\n", v)
} }
} }
@@ -34,7 +31,7 @@ main :: proc() {
test_benchmark_runner(&t) test_benchmark_runner(&t)
test_xxhash_vectors(&t) test_xxhash_vectors(&t)
test_crc64_vectors(&t) test_crc64_vectors(&t)
fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count)
} }
/* /*
tests/core/image/test_core_image.odin
+31 -20
View File
@@ -25,38 +25,49 @@ import "core:time"
import "core:runtime" import "core:runtime"
WRITE_PPM_ON_FAIL :: #config(WRITE_PPM_ON_FAIL, false) WRITE_PPM_ON_FAIL :: #config(WRITE_PPM_ON_FAIL, false)
TEST_SUITE_PATH :: "assets/PNG" TEST_FILE_PATH_PREFIX :: "tests/core/assets/PNG"
TEST_count := 0 TEST_count := 0
TEST_fail := 0 TEST_fail := 0
when ODIN_TEST { when ODIN_TEST {
expect :: testing.expect expect :: testing.expect
log :: testing.log log :: testing.log
} else { } else {
expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) {
fmt.printf("[%v] ", loc) TEST_count += 1
TEST_count += 1 if !condition {
if !condition { TEST_fail += 1
TEST_fail += 1 fmt.printf("[%v] %v\n", loc, message)
fmt.println(message) return
return }
} }
fmt.println(" PASS") log :: proc(t: ^testing.T, v: any, loc := #caller_location) {
} fmt.printf("[%v] LOG:\n\t%v\n", loc, v)
log :: proc(t: ^testing.T, v: any, loc := #caller_location) { }
fmt.printf("[%v] ", loc)
fmt.printf("log: %v\n", v)
}
} }
I_Error :: image.Error I_Error :: image.Error
main :: proc() { main :: proc() {
t := testing.T{} t := testing.T{}
png_test(&t) png_test(&t)
fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count)
}
test_file_path :: proc(filename: string, extension := "png") -> (path: string) {
path = fmt.tprintf("%v%v/%v.%v", ODIN_ROOT, TEST_FILE_PATH_PREFIX, filename, extension)
temp := transmute([]u8)path
for r, i in path {
if r == '\\' {
temp[i] = '/'
}
}
return path
} }
PNG_Test :: struct { PNG_Test :: struct {
@@ -1461,7 +1472,7 @@ run_png_suite :: proc(t: ^testing.T, suite: []PNG_Test) -> (subtotal: int) {
context = runtime.default_context() context = runtime.default_context()
for file in suite { for file in suite {
test_file := fmt.tprintf("%v/%v.png", TEST_SUITE_PATH, file.file) test_file := test_file_path(file.file)
img: ^png.Image img: ^png.Image
err: png.Error err: png.Error
tests/core/odin/test_parser.odin
+16 -21
View File
@@ -10,34 +10,29 @@ TEST_count := 0
TEST_fail := 0 TEST_fail := 0
when ODIN_TEST { when ODIN_TEST {
expect :: testing.expect expect :: testing.expect
log :: testing.log log :: testing.log
} else { } else {
expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) {
fmt.printf("[%v] ", loc) TEST_count += 1
TEST_count += 1 if !condition {
if !condition { TEST_fail += 1
TEST_fail += 1 fmt.printf("[%v] %v\n", loc, message)
fmt.println(message) return
return }
} }
fmt.println(" PASS") log :: proc(t: ^testing.T, v: any, loc := #caller_location) {
} fmt.printf("[%v] LOG:\n\t%v\n", loc, v)
log :: proc(t: ^testing.T, v: any, loc := #caller_location) { }
fmt.printf("[%v] ", loc)
fmt.printf("log: %v\n", v)
}
} }
main :: proc() { main :: proc() {
t := testing.T{} t := testing.T{}
test_parse_demo(&t) test_parse_demo(&t)
fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count)
} }
@test @test
test_parse_demo :: proc(t: ^testing.T) { test_parse_demo :: proc(t: ^testing.T) {
pkg, ok := parser.parse_package_from_path("examples/demo") pkg, ok := parser.parse_package_from_path("examples/demo")
tests/core/strings/test_core_strings.odin
+28 -31
View File
@@ -8,56 +8,53 @@ TEST_count := 0
TEST_fail := 0 TEST_fail := 0
when ODIN_TEST { when ODIN_TEST {
expect :: testing.expect expect :: testing.expect
log :: testing.log log :: testing.log
} else { } else {
expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) { expect :: proc(t: ^testing.T, condition: bool, message: string, loc := #caller_location) {
fmt.printf("[%v] ", loc) TEST_count += 1
TEST_count += 1 if !condition {
if !condition { TEST_fail += 1
TEST_fail += 1 fmt.printf("[%v] %v\n", loc, message)
fmt.println(message) return
return }
} }
fmt.println(" PASS") log :: proc(t: ^testing.T, v: any, loc := #caller_location) {
} fmt.printf("[%v] LOG:\n\t%v\n", loc, v)
log :: proc(t: ^testing.T, v: any, loc := #caller_location) { }
fmt.printf("[%v] ", loc)
fmt.printf("log: %v\n", v)
}
} }
main :: proc() { main :: proc() {
t := testing.T{} t := testing.T{}
test_index_any_small_string_not_found(&t) test_index_any_small_string_not_found(&t)
test_index_any_larger_string_not_found(&t) test_index_any_larger_string_not_found(&t)
test_index_any_small_string_found(&t) test_index_any_small_string_found(&t)
test_index_any_larger_string_found(&t) test_index_any_larger_string_found(&t)
fmt.printf("%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count) fmt.printf("\n%v/%v tests successful.\n", TEST_count - TEST_fail, TEST_count)
} }
@test @test
test_index_any_small_string_not_found :: proc(t: ^testing.T) { test_index_any_small_string_not_found :: proc(t: ^testing.T) {
index := strings.index_any(".", "/:\"") index := strings.index_any(".", "/:\"")
log(t, index) log(t, index)
expect(t, index == -1, "index_any should be negative") expect(t, index == -1, "index_any should be negative")
} }
@test @test
test_index_any_larger_string_not_found :: proc(t: ^testing.T) { test_index_any_larger_string_not_found :: proc(t: ^testing.T) {
index := strings.index_any("aaaaaaaa.aaaaaaaa", "/:\"") index := strings.index_any("aaaaaaaa.aaaaaaaa", "/:\"")
expect(t, index == -1, "index_any should be negative") expect(t, index == -1, "index_any should be negative")
} }
@test @test
test_index_any_small_string_found :: proc(t: ^testing.T) { test_index_any_small_string_found :: proc(t: ^testing.T) {
index := strings.index_any(".", "/:.\"") index := strings.index_any(".", "/:.\"")
expect(t, index == 0, "index_any should be 0") expect(t, index == 0, "index_any should be 0")
} }
@test @test
test_index_any_larger_string_found :: proc(t: ^testing.T) { test_index_any_larger_string_found :: proc(t: ^testing.T) {
index := strings.index_any("aaaaaaaa:aaaaaaaa", "/:\"") index := strings.index_any("aaaaaaaa:aaaaaaaa", "/:\"")
expect(t, index == 8, "index_any should be 8") expect(t, index == 8, "index_any should be 8")
} }