From f2827fc3391567a28be59475061da1cda7da9ef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20Sch=C3=B6bel?= <jonathan@xn--schbel-yxa.info>
Date: Sun, 1 Oct 2023 12:50:45 +0200
Subject: [PATCH] Validator: unitized test names
The method names are now also unique.
---
sefht.geany | 8 +++----
tests/test_validator_attr.c | 46 ++++++++++++++++++-------------------
tests/test_validator_tag.c | 32 +++++++++++++-------------
todo.txt | 2 --
4 files changed, 43 insertions(+), 45 deletions(-)
diff --git a/sefht.geany b/sefht.geany
index b495fef..cab76a0 100644
--- a/sefht.geany
+++ b/sefht.geany
@@ -28,7 +28,7 @@ long_line_behaviour=1
long_line_column=72
[files]
-current_page=54
+current_page=55
FILE_NAME_0=139;None;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2FREADME;0;8
FILE_NAME_1=134;None;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2F.gitignore;0;8
FILE_NAME_2=1737;Sh;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fconfigure.ac;0;8
@@ -82,9 +82,9 @@ FILE_NAME_49=24;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprg
FILE_NAME_50=4221;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_text.c;0;8
FILE_NAME_51=994;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_text_mark.c;0;8
FILE_NAME_52=2447;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_validator.c;0;8
-FILE_NAME_53=9409;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_validator_tag.c;0;8
-FILE_NAME_54=54966;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_validator_attr.c;0;8
-FILE_NAME_55=521;None;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftodo.txt;0;8
+FILE_NAME_53=16197;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_validator_tag.c;0;8
+FILE_NAME_54=57386;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_validator_attr.c;0;8
+FILE_NAME_55=85;None;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftodo.txt;0;8
FILE_NAME_56=201;YAML;0;EUTF-8;0;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2F.gitlab-ci.yml;0;4
FILE_NAME_57=71;Sh;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fgitlab-ci%2Fupload.sh.in;0;8
FILE_NAME_58=806;Sh;0;EUTF-8;0;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fgitlab-ci%2Frelease.sh.in;0;4
diff --git a/tests/test_validator_attr.c b/tests/test_validator_attr.c
index 495d81b..752ef28 100644
--- a/tests/test_validator_attr.c
+++ b/tests/test_validator_attr.c
@@ -64,7 +64,7 @@ const struct HTML_ATTR_DEFINITION HTML_ATTRS[] = {
#include "validator.c"
-START_TEST(test_validator_no_status)
+START_TEST(test_validator_attr_no_status)
{
struct SH_Validator * validator;
@@ -77,7 +77,7 @@ START_TEST(test_validator_no_status)
}
END_TEST
-START_TEST(test_validator_with_status)
+START_TEST(test_validator_attr_with_status)
{
struct SH_Status status;
struct SH_Validator * validator;
@@ -93,7 +93,7 @@ START_TEST(test_validator_with_status)
}
END_TEST
-START_TEST(test_validator_copy_no_status)
+START_TEST(test_validator_attr_copy_no_status)
{
struct SH_Validator * validator;
struct SH_Validator * copy;
@@ -152,7 +152,7 @@ START_TEST(test_validator_copy_no_status)
}
END_TEST
-START_TEST(test_validator_copy_with_status)
+START_TEST(test_validator_attr_copy_with_status)
{
struct SH_Status status;
struct SH_Validator * validator;
@@ -214,7 +214,7 @@ START_TEST(test_validator_copy_with_status)
}
END_TEST
-START_TEST(test_validator_spec_no_status)
+START_TEST(test_validator_attr_spec_no_status)
{
struct SH_Validator * validator;
@@ -284,7 +284,7 @@ START_TEST(test_validator_spec_no_status)
}
END_TEST
-START_TEST(test_validator_spec_with_status)
+START_TEST(test_validator_attr_spec_with_status)
{
struct SH_Status status;
struct SH_Validator * validator;
@@ -357,7 +357,7 @@ START_TEST(test_validator_spec_with_status)
}
END_TEST
-START_TEST(test_validator_register_no_status)
+START_TEST(test_validator_attr_register_no_status)
{
struct SH_Validator * validator;
const char * tag1 = "html";
@@ -557,7 +557,7 @@ START_TEST(test_validator_register_no_status)
SH_Validator_free (validator);
}
-START_TEST(test_validator_register_with_status)
+START_TEST(test_validator_attr_register_with_status)
{
struct SH_Status status;
struct SH_Validator * validator;
@@ -788,7 +788,7 @@ START_TEST(test_validator_register_with_status)
SH_Validator_free (validator);
}
-START_TEST(test_validator_deregister_no_status)
+START_TEST(test_validator_attr_deregister_no_status)
{
struct SH_Validator * validator;
bool result;
@@ -1155,7 +1155,7 @@ START_TEST(test_validator_deregister_no_status)
}
END_TEST
-START_TEST(test_validator_deregister_with_status)
+START_TEST(test_validator_attr_deregister_with_status)
{
struct SH_Status status;
struct SH_Validator * validator;
@@ -1553,7 +1553,7 @@ START_TEST(test_validator_deregister_with_status)
}
END_TEST
-START_TEST(test_validator_check)
+START_TEST(test_validator_attr_check)
{
struct SH_Validator * validator;
const char * tag_1 = "html";
@@ -1620,22 +1620,22 @@ Suite * test_suite (void)
Suite *s;
TCase *tc_core;
- s = suite_create ("Testsuite SeFHT Validator Tag");
+ s = suite_create ("Testsuite SeFHT Validator Attr");
/* Core test case */
tc_core = tcase_create ("Core");
- tcase_add_test (tc_core, test_validator_no_status);
- tcase_add_test (tc_core, test_validator_with_status);
- tcase_add_test (tc_core, test_validator_copy_no_status);
- tcase_add_test (tc_core, test_validator_copy_with_status);
- tcase_add_test (tc_core, test_validator_spec_no_status);
- tcase_add_test (tc_core, test_validator_spec_with_status);
- tcase_add_test (tc_core, test_validator_register_no_status);
- tcase_add_test (tc_core, test_validator_register_with_status);
- tcase_add_test (tc_core, test_validator_deregister_no_status);
- tcase_add_test (tc_core, test_validator_deregister_with_status);
- tcase_add_test (tc_core, test_validator_check);
+ tcase_add_test (tc_core, test_validator_attr_no_status);
+ tcase_add_test (tc_core, test_validator_attr_with_status);
+ tcase_add_test (tc_core, test_validator_attr_copy_no_status);
+ tcase_add_test (tc_core, test_validator_attr_copy_with_status);
+ tcase_add_test (tc_core, test_validator_attr_spec_no_status);
+ tcase_add_test (tc_core, test_validator_attr_spec_with_status);
+ tcase_add_test (tc_core, test_validator_attr_register_no_status);
+ tcase_add_test (tc_core, test_validator_attr_register_with_status);
+ tcase_add_test (tc_core, test_validator_attr_deregister_no_status);
+ tcase_add_test (tc_core, test_validator_attr_deregister_with_status);
+ tcase_add_test (tc_core, test_validator_attr_check);
suite_add_tcase (s, tc_core);
return s;
diff --git a/tests/test_validator_tag.c b/tests/test_validator_tag.c
index 1856c15..aec3ec7 100644
--- a/tests/test_validator_tag.c
+++ b/tests/test_validator_tag.c
@@ -51,7 +51,7 @@ const struct HTML_TAG_DEFINITION HTML_TAGS[] = {
#include "validator.c"
-START_TEST(test_validator_no_status)
+START_TEST(test_validator_tag_no_status)
{
struct SH_Validator * validator;
@@ -64,7 +64,7 @@ START_TEST(test_validator_no_status)
}
END_TEST
-START_TEST(test_validator_with_status)
+START_TEST(test_validator_tag_with_status)
{
struct SH_Status status;
struct SH_Validator * validator;
@@ -80,7 +80,7 @@ START_TEST(test_validator_with_status)
}
END_TEST
-START_TEST(test_validator_copy_no_status)
+START_TEST(test_validator_tag_copy_no_status)
{
struct SH_Validator * validator;
struct SH_Validator * copy;
@@ -112,7 +112,7 @@ START_TEST(test_validator_copy_no_status)
}
END_TEST
-START_TEST(test_validator_copy_with_status)
+START_TEST(test_validator_tag_copy_with_status)
{
struct SH_Status status;
struct SH_Validator * validator;
@@ -147,7 +147,7 @@ START_TEST(test_validator_copy_with_status)
}
END_TEST
-START_TEST(test_validator_spec_no_status)
+START_TEST(test_validator_tag_spec_no_status)
{
struct SH_Validator * validator;
@@ -172,7 +172,7 @@ START_TEST(test_validator_spec_no_status)
}
END_TEST
-START_TEST(test_validator_spec_with_status)
+START_TEST(test_validator_tag_spec_with_status)
{
struct SH_Status status;
struct SH_Validator * validator;
@@ -373,7 +373,7 @@ START_TEST(test_validator_tag_register_with_status)
SH_Validator_free (validator);
}
-START_TEST(test_validator_deregister_no_status)
+START_TEST(test_validator_tag_deregister_no_status)
{
struct SH_Validator * validator;
const char * tag1 = "tag1";
@@ -444,7 +444,7 @@ START_TEST(test_validator_deregister_no_status)
}
END_TEST
-START_TEST(test_validator_deregister_with_status)
+START_TEST(test_validator_tag_deregister_with_status)
{
struct SH_Status status;
struct SH_Validator * validator;
@@ -565,16 +565,16 @@ Suite * test_suite (void)
/* Core test case */
tc_core = tcase_create ("Core");
- tcase_add_test (tc_core, test_validator_no_status);
- tcase_add_test (tc_core, test_validator_with_status);
- tcase_add_test (tc_core, test_validator_copy_no_status);
- tcase_add_test (tc_core, test_validator_copy_with_status);
- tcase_add_test (tc_core, test_validator_spec_no_status);
- tcase_add_test (tc_core, test_validator_spec_with_status);
+ tcase_add_test (tc_core, test_validator_tag_no_status);
+ tcase_add_test (tc_core, test_validator_tag_with_status);
+ tcase_add_test (tc_core, test_validator_tag_copy_no_status);
+ tcase_add_test (tc_core, test_validator_tag_copy_with_status);
+ tcase_add_test (tc_core, test_validator_tag_spec_no_status);
+ tcase_add_test (tc_core, test_validator_tag_spec_with_status);
tcase_add_test (tc_core, test_validator_tag_register_no_status);
tcase_add_test (tc_core, test_validator_tag_register_with_status);
- tcase_add_test (tc_core, test_validator_deregister_no_status);
- tcase_add_test (tc_core, test_validator_deregister_with_status);
+ tcase_add_test (tc_core, test_validator_tag_deregister_no_status);
+ tcase_add_test (tc_core, test_validator_tag_deregister_with_status);
tcase_add_test (tc_core, test_validator_tag_check);
suite_add_tcase (s, tc_core);
diff --git a/todo.txt b/todo.txt
index 828f94e..f783128 100644
--- a/todo.txt
+++ b/todo.txt
@@ -5,8 +5,6 @@ create Docs
remove -Wno-nonnull from AM_CFLAGS
fix warnings for tests
-rewrite validator test
-
Fragment:
- create html on single Text object
- add customized styling in html generation
--
GitLab