diff --git a/sefht.geany b/sefht.geany index a7a4699257ad890d3d227cffaa8d121762901a41..ece6a791b2dd21666dc0ea9f93e7a8fcb3ac9ab1 100644 --- a/sefht.geany +++ b/sefht.geany @@ -28,18 +28,18 @@ long_line_behaviour=1 long_line_column=72 [files] -current_page=16 +current_page=22 FILE_NAME_0=923;Sh;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fconfigure.ac;0;8 FILE_NAME_1=73;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2FMakefile.am;0;8 FILE_NAME_2=1082;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Fmain.c;0;8 FILE_NAME_3=640;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2FMakefile.am;0;8 FILE_NAME_4=1381;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fcms.c;0;8 FILE_NAME_5=1359;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fcms.h;0;8 -FILE_NAME_6=1438;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fdata.c;0;8 +FILE_NAME_6=4939;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fdata.c;0;8 FILE_NAME_7=1376;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fdata.h;0;8 FILE_NAME_8=1171;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment.c;0;8 FILE_NAME_9=2843;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment.h;0;8 -FILE_NAME_10=4671;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fnode_fragment.c;0;8 +FILE_NAME_10=1609;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fnode_fragment.c;0;8 FILE_NAME_11=3013;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fnode_fragment.h;0;8 FILE_NAME_12=3572;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ftext.c;0;8 FILE_NAME_13=1833;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ftext.h;0;8 @@ -51,16 +51,16 @@ FILE_NAME_18=4232;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fp FILE_NAME_19=1017;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Flog.h;0;4 FILE_NAME_20=1077;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fmacro.h;0;8 FILE_NAME_21=937;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fsefht.h;0;8 -FILE_NAME_22=98;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2FMakefile.am;0;8 +FILE_NAME_22=1408;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2FMakefile.am;0;8 FILE_NAME_23=872;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_cms.c;0;8 FILE_NAME_24=3552;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_data.c;0;8 -FILE_NAME_25=10063;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_node_fragment.c;0;8 +FILE_NAME_25=2373;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_node_fragment.c;0;8 FILE_NAME_26=5736;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_text.c;0;8 FILE_NAME_27=4687;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_validator.c;0;8 FILE_NAME_28=165;None;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftodo.txt;0;8 [VTE] -last_dir=/home/jonathan/Dokumente/projekte/prgm/internet/web/SeFHT/tests +last_dir=/home/jonathan/Documents/projects/prgm/internet/web/SeFHT/tests [prjorg] source_patterns=*.c;*.C;*.cpp;*.cxx;*.c++;*.cc;*.m; diff --git a/src/lib/sefht/node_fragment.c b/src/lib/sefht/node_fragment.c index 07ce9e96a0031f398309b9de881b2e99b44fb814..2c274fbcf878c7232de10ff0707cfe346f70bd22 100644 --- a/src/lib/sefht/node_fragment.c +++ b/src/lib/sefht/node_fragment.c @@ -61,14 +61,6 @@ SH_NodeFragment_new (const char * tag, struct SH_Data * data, { struct SH_NodeFragment * fragment; - if (!SH_Validator_check_tag (data->validator, tag)) - { - set_status_ (status, E_VALUE, 2, strlen (tag), - "Tag %s is'nt valid.\n", tag); - - return NULL; - } - fragment = malloc (sizeof (struct SH_NodeFragment)); if (fragment == NULL) { diff --git a/tests/Makefile.am b/tests/Makefile.am index 1fa43a0952b81e7946c9e84871e55917a0874d9d..ad3158300aeb2ae5c66eb21677424b941fb20db2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,7 +7,6 @@ TESTS += sefht_cms_test TESTS += sefht_data_test TESTS += sefht_node_fragment_test TESTS += sefht_text_test -TESTS += sefht_validator_test check_PROGRAMS = $(TESTS) @@ -44,7 +43,3 @@ sefht_node_fragment_test_LDADD += $(LDADD) sefht_text_test_SOURCES = test_text.c sefht_text_test_LDADD = sefht_text_test_LDADD += $(LDADD) - -sefht_validator_test_SOURCES = test_validator.c -sefht_validator_test_LDADD = -sefht_validator_test_LDADD += $(LDADD) diff --git a/tests/test_node_fragment.c b/tests/test_node_fragment.c index 203d5bb32c3372dc4068320f029ba32e52449c25..be2e1a3ea010eccd065aca56b7a0d109af2e21b4 100644 --- a/tests/test_node_fragment.c +++ b/tests/test_node_fragment.c @@ -37,10 +37,8 @@ START_TEST(test_node_fragment) struct SH_Fragment * fragment; struct SH_Data * data; const char * tag = "tag"; - const char * no_tag = "no_tag"; data = SH_Data_new (NULL); - SH_Validator_register_tag (data->validator, tag, NULL); /* valid tag - no error */ fragment = SH_NodeFragment_new (tag, data, NULL); @@ -50,10 +48,6 @@ START_TEST(test_node_fragment) SH_Fragment_free (fragment); - /* invalid tag - no error */ - fragment = SH_NodeFragment_new (no_tag, data, NULL); - ck_assert_int_eq ((long int) fragment, (long int) NULL); - /* valid tag - error */ status.status = UNDEFINED; fragment = SH_NodeFragment_new (tag, data, &status); @@ -64,12 +58,6 @@ START_TEST(test_node_fragment) SH_Fragment_free (fragment); - /* invalid tag - error */ - status.status = UNDEFINED; - fragment = SH_NodeFragment_new (no_tag, data, &status); - ck_assert_int_eq ((long int) fragment, (long int) NULL); - ck_assert_int_eq (status.status, E_VALUE); - SH_Data_free (data); } END_TEST @@ -231,8 +219,6 @@ START_TEST(test_node_fragment_tag) const char * tag2 = "body"; data = SH_Data_new (NULL); - SH_Validator_register_tag (data->validator, tag1, NULL); - SH_Validator_register_tag (data->validator, tag2, NULL); /* no error */ fragment = SH_NodeFragment_new (tag1, data, NULL); @@ -449,7 +435,6 @@ START_TEST(test_node_fragment_html) size_t length; data = SH_Data_new (NULL); - SH_Validator_register_tag (data->validator, "html", NULL); /* no error */ fragment1 = SH_NodeFragment_new ("html", data, NULL);