From 587d52aab3ad94bb1c2d6786b34c6fa37afe2a2a Mon Sep 17 00:00:00 2001 From: PreacherDHM Date: Sat, 8 Feb 2025 13:09:55 -0800 Subject: [PATCH] working on fixing tests --- .gitmodules | 3 +++ source/tart.c | 1 - testing/externals/Pickler | 1 + testing/test_tart.cpp | 10 +++++----- 4 files changed, 9 insertions(+), 6 deletions(-) create mode 160000 testing/externals/Pickler diff --git a/.gitmodules b/.gitmodules index e6ba0fb..577f6ec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "externals/Pickler"] path = externals/Pickler url = http://www.gitea.preacherdhm.com/PreacherDHM/Pickler.git +[submodule "testing/externals/Pickler"] + path = testing/externals/Pickler + url = http://www.gitea.preacherdhm.com/PreacherDHM/Pickler.git diff --git a/source/tart.c b/source/tart.c index b5028ab..eaa7c0b 100644 --- a/source/tart.c +++ b/source/tart.c @@ -17,7 +17,6 @@ struct tart_window tart_create_window() { for(int i = 0; i < 0xFF; i++) { window.buffers[i] = tart_create_buffer(0, (struct tart_vec2){0,0},(struct tart_vec2){0,0}); } - char* data = (char*)malloc((size.x*size.y) * (sizeof(char) * TART_CELL_DATA_SIZE)); window.size = term_current_size(); return window; } diff --git a/testing/externals/Pickler b/testing/externals/Pickler new file mode 160000 index 0000000..22a9fb9 --- /dev/null +++ b/testing/externals/Pickler @@ -0,0 +1 @@ +Subproject commit 22a9fb9fabce4a1f3add4d2531858b20597190d1 diff --git a/testing/test_tart.cpp b/testing/test_tart.cpp index ec85623..7bf82fa 100644 --- a/testing/test_tart.cpp +++ b/testing/test_tart.cpp @@ -17,13 +17,13 @@ void tart_run(struct pickle_shelf* shelf) { pickle_shelf __pickle_shelf__ = *shelf; CREATEJAR(tart_objects_test); PICKLE(Test_create_buffer) { - tart_vec2 size = {25,25}; - tart_vec2 position = {0,0}; + struct tart_vec2 size = {25,25}; + struct tart_vec2 position = {0,0}; int data_count = (size.x*size.y) * TART_CELL_DATA_SIZE; unsigned int cell_count = (size.x * size.y); - struct tart_buffer buffer_correct = {cell_count,0,25,size,position,0,0,data_count}; + struct tart_buffer buffer_correct = {cell_count,0,25,size,position,0}; struct tart_buffer buffer_test = tart_create_buffer(25,size,position); if(DIFFERENT(buffer_correct.cell_count,buffer_test.cell_count)) @@ -40,7 +40,7 @@ void tart_run(struct pickle_shelf* shelf) { ASSERT("position.x is not the same.",false); if(DIFFERENT(buffer_correct.position.y,buffer_test.position.y)) ASSERT("position.y is not the same.",false); - if(DIFFERENT(buffer_correct.data_count,buffer_test.data_count)) + if(DIFFERENT(buffer_correct.cell_count,buffer_test.cell_count)) ASSERT("data_counts are not the same.",false); ASSERT("GOOD",true); }(); @@ -60,7 +60,7 @@ void tart_run(struct pickle_shelf* shelf) { #else tart_byte f = 20; tart_byte b = 40; - struct tart_cell cell_correct = {f, b, '1', 'f',0}; + struct tart_cell cell_correct = {f, b, '1', 'f'}; struct tart_cell cell_test = tart_create_cell('f', '1', f, b); if(DIFFERENT(cell_correct.foreground, cell_test.foreground)) ASSERT("Forground dose not match.",false);