improve Validator test (memory leaks)

Changing sefht_validator_test so that no memory leaks occur.

sefht.geany

@@ -28,7 +28,7 @@ long_line_behaviour=1
 long_line_column=72
 
 [files]
-current_page=21
+current_page=22
 FILE_NAME_0=607;Sh;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fconfigure.ac;0;8
 FILE_NAME_1=395;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2FMakefile.am;0;8
 FILE_NAME_2=847;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Fmain.c;0;8
@@ -51,7 +51,7 @@ FILE_NAME_18=1113;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fp
 FILE_NAME_19=3059;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_data.c;0;8
 FILE_NAME_20=2736;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_fragment.c;0;8
 FILE_NAME_21=1860;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_text.c;0;8
-FILE_NAME_22=4613;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_validator.c;0;8
+FILE_NAME_22=6057;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_validator.c;0;8
 FILE_NAME_23=55;None;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftodo.txt;0;8
 
 [VTE]

tests/test_validator.c

@@ -123,6 +123,8 @@ START_TEST(test_validator_tag)
 		SH_Validator_register_tag (validator, tagN, NULL);
 	}
 
+	free (tagN);
+
 	tag = SH_Validator_register_tag (validator, tag2, NULL);
 	ck_assert_int_eq (tag, TAG_ERR);
 
@@ -145,19 +147,35 @@ START_TEST(test_validator_tag)
 	tag_return = SH_Validator_get_tag (validator, tag3);
 	ck_assert_int_eq (tag_return, TAG_ERR);
 
-	/* success with error */
-	validator->last_tag = 1;
+	/* also free garbage created for overflow test */
+	validator->tag_n = UINT_MAX;
+
+	/* check tag */
+	check = SH_Validator_check_tag (validator, tag1);
+	ck_assert_int_eq (check, TRUE);
+
+	check = SH_Validator_check_tag (validator, tag2);
+	ck_assert_int_eq (check, FALSE);
+
+	check = SH_Validator_check_tag (validator, tag3);
+	ck_assert_int_eq (check, FALSE);
+
+	SH_Validator_free (validator, NULL);
+
+
+	validator = SH_Validator_new (NULL);
 
+	/* success with error */
 	error.type = UNDEFINED;
 	tag = SH_Validator_register_tag (validator, tag4, &error);
-	ck_assert_int_eq (tag, 2);
+	ck_assert_int_eq (tag, 1);
 	ck_assert_int_eq (error.type, SUCCESS);
 
-	ck_assert_int_eq (validator->tag_n, 2);
+	ck_assert_int_eq (validator->tag_n, 1);
 	ck_assert_int_eq (validator->last_tag, tag);
 
-	ck_assert_int_eq (validator->tags[1].id, tag);
-	ck_assert_str_eq (validator->tags[1].name, tag4);
+	ck_assert_int_eq (validator->tags[0].id, tag);
+	ck_assert_str_eq (validator->tags[0].name, tag4);
 
 	tag_return = SH_Validator_get_tag (validator, tag4);
 	ck_assert_int_eq (tag_return, tag);
@@ -182,6 +200,8 @@ START_TEST(test_validator_tag)
 		SH_Validator_register_tag (validator, tagN, NULL);
 	}
 
+	free (tagN);
+
 	error.type = UNDEFINED;
 	tag = SH_Validator_register_tag (validator, tag5, &error);
 	ck_assert_int_eq (tag, TAG_ERR);
@@ -194,7 +214,7 @@ START_TEST(test_validator_tag)
 	ck_assert_int_eq (tag_return, TAG_ERR);
 
 	/* fail2 with error */
-	validator->tag_n = 2;
+	validator->tag_n = 1;
 	validator->last_tag = TAG_MAX;
 
 	error.type = UNDEFINED;
@@ -202,7 +222,7 @@ START_TEST(test_validator_tag)
 	ck_assert_int_eq (tag, TAG_ERR);
 	ck_assert_int_eq (error.type, DOMAIN_ERROR);
 
-	ck_assert_int_eq (validator->tag_n, 2);
+	ck_assert_int_eq (validator->tag_n, 1);
 	ck_assert_int_eq (validator->last_tag, TAG_MAX);
 
 	tag_return = SH_Validator_get_tag (validator, tag6);
@@ -210,15 +230,6 @@ START_TEST(test_validator_tag)
 
 
 	/* check tag */
-	check = SH_Validator_check_tag (validator, tag1);
-	ck_assert_int_eq (check, TRUE);
-
-	check = SH_Validator_check_tag (validator, tag2);
-	ck_assert_int_eq (check, FALSE);
-
-	check = SH_Validator_check_tag (validator, tag3);
-	ck_assert_int_eq (check, FALSE);
-
 	check = SH_Validator_check_tag (validator, tag4);
 	ck_assert_int_eq (check, TRUE);
 
@@ -228,6 +239,8 @@ START_TEST(test_validator_tag)
 	check = SH_Validator_check_tag (validator, tag6);
 	ck_assert_int_eq (check, FALSE);
 
+	/* also free garbage created for overflow test */
+	validator->tag_n = UINT_MAX;
 
 	SH_Validator_free (validator, NULL);
 }