From 509b05b3fe5197a3c479f553daddfbb0369c37e8 Mon Sep 17 00:00:00 2001 From: Alex Pickering Date: Sat, 28 Sep 2019 14:37:43 -0400 Subject: Fixed test to use new template alloc --- t/test_1.c | 43 +++++++++++++++++++++++++------------------ t/test_2.c | 38 ++++++++++++++++++++++++++++---------- 2 files changed, 53 insertions(+), 28 deletions(-) (limited to 't') diff --git a/t/test_1.c b/t/test_1.c index 4fc8b72..068197d 100644 --- a/t/test_1.c +++ b/t/test_1.c @@ -74,6 +74,12 @@ char c_18_1[] = "Test var with spaces between attribute and name:Correct!"; char c_18_2[] = "Test var with spaces between attribute and name:Blah"; #define log(x) printf(x) +#define template(x,y) \ + err = TMPL_alloc_template(x,&y);\ + if(err != 0){\ + printf("Error: %s\n",TMPL_err(y,&dummy));\ + return -1;\ + } int main(){ log("Running tests\n"); @@ -81,9 +87,10 @@ int main(){ struct TMPL_varlist* vl; char* ret; size_t dummy; + int err; /*Test 1: Variable*/ - t = TMPL_alloc_template(t_1); + template(t_1,t); vl = TMPL_alloc_varlist(); TMPL_add_var_to_varlist(vl,"what","template"); ret = TMPL_render(t,vl,&dummy); @@ -97,7 +104,7 @@ int main(){ log("Test 1 complete\n"); /*Test 2: Variable with default parameter*/ - t = TMPL_alloc_template(t_2); + template(t_2,t); vl = TMPL_alloc_varlist(); ret = TMPL_render(t,vl,&dummy); if(strcmp(ret,c_2_1) != 0){ @@ -110,7 +117,7 @@ int main(){ log("Test 2 complete\n"); /*Test 3: Template that starts with a tag*/ - t = TMPL_alloc_template(t_3); + template(t_3,t); vl = TMPL_alloc_varlist(); TMPL_add_var_to_varlist(vl,"what","This"); ret = TMPL_render(t,vl,&dummy); @@ -124,7 +131,7 @@ int main(){ log("Test 3 complete\n"); /*Test 4: Starts with a tag with a default value*/ - t = TMPL_alloc_template(t_4); + template(t_4,t); vl = TMPL_alloc_varlist(); ret = TMPL_render(t,vl,&dummy); if(strcmp(ret,c_4_1) != 0){ @@ -137,7 +144,7 @@ int main(){ log("Test 4 complete\n"); /*Test 5: Ends with a tag*/ - t = TMPL_alloc_template(t_5); + template(t_5,t); vl = TMPL_alloc_varlist(); TMPL_add_var_to_varlist(vl,"what","tag"); ret = TMPL_render(t,vl,&dummy); @@ -151,7 +158,7 @@ int main(){ log("Test 5 complete\n"); /*Test 6: Ends with a tag with a default value*/ - t = TMPL_alloc_template(t_6); + template(t_6,t); vl = TMPL_alloc_varlist(); ret = TMPL_render(t,vl,&dummy); if(strcmp(ret,c_6_1) != 0){ @@ -164,7 +171,7 @@ int main(){ log("Test 6 complete\n"); /*Test 7: Simple loop*/ - t = TMPL_alloc_template(t_7); + template(t_7,t); vl = TMPL_alloc_varlist(); { struct TMPL_loop* l = TMPL_alloc_loop(); @@ -217,7 +224,7 @@ int main(){ log("Test 7 complete\n"); /*Test 8: Simple if*/ - t = TMPL_alloc_template(t_8); + template(t_8,t); vl = TMPL_alloc_varlist(); TMPL_add_var_to_varlist(vl,"var","correct"); ret = TMPL_render(t,vl,&dummy); @@ -248,7 +255,7 @@ int main(){ log("Test 8 complete\n"); /*Test 9: Use if to check for variable existance*/ - t = TMPL_alloc_template(t_9); + template(t_9,t); vl = TMPL_alloc_varlist(); TMPL_add_var_to_varlist(vl,"var","thing"); ret = TMPL_render(t,vl,&dummy); @@ -270,7 +277,7 @@ int main(){ log("Test 9 complete\n"); /*Test 10: If with else section, if used to check for existance*/ - t = TMPL_alloc_template(t_10); + template(t_10,t); vl = TMPL_alloc_varlist(); TMPL_add_var_to_varlist(vl,"var","True"); ret = TMPL_render(t,vl,&dummy); @@ -292,7 +299,7 @@ int main(){ log("Test 10 complete\n"); /*Test 11: If with else section, if used for equivalence*/ - t = TMPL_alloc_template(t_11); + template(t_11,t); vl = TMPL_alloc_varlist(); TMPL_add_var_to_varlist(vl,"var","thing"); ret = TMPL_render(t,vl,&dummy); @@ -314,7 +321,7 @@ int main(){ log("Test 11 complete\n"); /*Test 12: If with elseif, no else*/ - t = TMPL_alloc_template(t_12); + template(t_12,t); vl = TMPL_alloc_varlist(); TMPL_add_var_to_varlist(vl,"var","thing"); ret = TMPL_render(t,vl,&dummy); @@ -345,7 +352,7 @@ int main(){ log("Test 12 complete\n"); /*Test 13: If with elseif, no else*/ - t = TMPL_alloc_template(t_13); + template(t_13,t); vl = TMPL_alloc_varlist(); TMPL_add_var_to_varlist(vl,"var","one"); ret = TMPL_render(t,vl,&dummy); @@ -376,7 +383,7 @@ int main(){ log("Test 13 complete\n"); /*Test 14: If with with empty value*/ - t = TMPL_alloc_template(t_14); + template(t_14,t); vl = TMPL_alloc_varlist(); TMPL_add_var_to_varlist(vl,"var",""); ret = TMPL_render(t,vl,&dummy); @@ -390,7 +397,7 @@ int main(){ log("Test 14 complete\n"); /*Test 15: Elseif with with empty value*/ - t = TMPL_alloc_template(t_15); + template(t_15,t); vl = TMPL_alloc_varlist(); TMPL_add_var_to_varlist(vl,"var",""); ret = TMPL_render(t,vl,&dummy); @@ -404,7 +411,7 @@ int main(){ log("Test 15 complete\n"); /*Test 16: var with multiple spaces in between*/ - t = TMPL_alloc_template(t_16); + template(t_16,t); vl = TMPL_alloc_varlist(); TMPL_add_var_to_varlist(vl,"test","Test"); ret = TMPL_render(t,vl,&dummy); @@ -418,7 +425,7 @@ int main(){ log("Test 16 complete\n"); /*Test 17: var with multiple spaces in between, and a default*/ - t = TMPL_alloc_template(t_17); + template(t_17,t); vl = TMPL_alloc_varlist(); ret = TMPL_render(t,vl,&dummy); if(strcmp(ret,c_17_1) != 0){ @@ -431,7 +438,7 @@ int main(){ log("Test 17 complete\n"); /*Test 18: spaces between attribute and value*/ - t = TMPL_alloc_template(t_18); + template(t_18,t); vl = TMPL_alloc_varlist(); ret = TMPL_render(t,vl,&dummy); if(strcmp(ret,c_18_1) != 0){ diff --git a/t/test_2.c b/t/test_2.c index f099460..86438c0 100644 --- a/t/test_2.c +++ b/t/test_2.c @@ -21,7 +21,24 @@ char c_3_3[] = "Check variable scope after breaking loop one four five eight nin char c_3_4[] = "Check variable scope after breaking loop one four five eight and a half nine.";//loop1 does not have test1, loop1 has loop2, after is "and a half " #define log(x) printf(x) -#define check(n,n2,a,b) if(strcmp(a,b) != 0){fprintf(stderr, "Error in test 2.%d.%d\n",n,n2);printf("Result should have been '%s'\n was '%s'\n", b, a); if(t->error) printf(TMPL_err(t, NULL)); return -1;}else{printf("\n\n##########\n##Test %d.%d passed\n##########\n\n\n",n,n2);} + +#define check(n,n2,a,b)\ + if(strcmp(a,b) != 0){\ + fprintf(stderr, "Error in test 2.%d.%d\n",n,n2);\ + printf("Result should have been '%s'\n was '%s'\n", b, a);\ + if(t->error)\ + printf(TMPL_err(t, NULL));\ + return -1;\ + }else{\ + printf("\n\n##########\n##Test %d.%d passed\n##########\n\n\n",n,n2);\ + } + +#define template(x,y) \ + err = TMPL_alloc_template(x,&y);\ + if(err != 0){\ + printf("Error: %s\n",TMPL_err(y,&dummy));\ + return -1;\ + } int main(){ log("Running tests2\n"); @@ -30,9 +47,10 @@ int main(){ struct TMPL_loop *l1,*l2; char* ret; size_t dummy; + int err; /*Test 1: Variable*/ - t = TMPL_alloc_template(t_1); + template(t_1,t); vl = TMPL_alloc_varlist(); TMPL_add_var_to_varlist(vl,"what","template"); l1 = TMPL_alloc_loop(); @@ -59,7 +77,7 @@ int main(){ TMPL_free_varlist(vl); log("Test 1 complete\n"); - t = TMPL_alloc_template(t_2); + template(t_2,t); vl = TMPL_alloc_varlist(); l1 = TMPL_alloc_loop(); TMPL_add_loop_to_varlist(vl,"loop1",l1); @@ -70,7 +88,7 @@ int main(){ printf("Freed template...\n"); TMPL_free_varlist(vl); - t = TMPL_alloc_template(t_2); + template(t_2,t); vl = TMPL_alloc_varlist(); l1 = TMPL_alloc_loop(); vl1 = TMPL_alloc_varlist(); @@ -83,7 +101,7 @@ int main(){ TMPL_free_template(t); TMPL_free_varlist(vl); - t = TMPL_alloc_template(t_2); + template(t_2,t); vl = TMPL_alloc_varlist(); l1 = TMPL_alloc_loop(); for(int i = 0; i < 3; i++){ @@ -97,7 +115,7 @@ int main(){ TMPL_free_template(t); TMPL_free_varlist(vl); - t = TMPL_alloc_template(t_2); + template(t_2,t); vl = TMPL_alloc_varlist(); l1 = TMPL_alloc_loop(); vl1 = TMPL_alloc_varlist(); @@ -110,7 +128,7 @@ int main(){ TMPL_free_template(t); TMPL_free_varlist(vl); - t = TMPL_alloc_template(t_2); + template(t_2,t); vl = TMPL_alloc_varlist(); l1 = TMPL_alloc_loop(); vl1 = TMPL_alloc_varlist(); @@ -125,7 +143,7 @@ int main(){ TMPL_free_template(t); TMPL_free_varlist(vl); - t = TMPL_alloc_template(t_3); + template(t_3,t); vl = TMPL_alloc_varlist(); l1 = TMPL_alloc_loop(); vl1 = TMPL_alloc_varlist(); @@ -138,7 +156,7 @@ int main(){ TMPL_free_template(t); TMPL_free_varlist(vl); - t = TMPL_alloc_template(t_3); + template(t_3,t); vl = TMPL_alloc_varlist(); l1 = TMPL_alloc_loop(); vl1 = TMPL_alloc_varlist(); @@ -152,7 +170,7 @@ int main(){ TMPL_free_template(t); TMPL_free_varlist(vl); - t = TMPL_alloc_template(t_3); + template(t_3,t); vl = TMPL_alloc_varlist(); l1 = TMPL_alloc_loop(); vl1 = TMPL_alloc_varlist(); -- cgit v1.2.3-70-g09d2