From: Tomek Mrugalski Date: Sat, 25 Jul 2015 00:08:32 +0000 (+0200) Subject: run-ntp_restrict.c: X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b23f85cf45a69c500fd67680b22a366b9a176088;p=thirdparty%2Fntp.git run-ntp_restrict.c: autogenerated, but modified manually... Makefile.am: removed something not longer in use ntp_restrict.c: added another test run-ntp_restrict.c, run-ntp_prio_q.c, run-sec-2853.c, run-bug-2803.c: autogenerated bk: 55b2d380HUq9jTlGTeTacIN_VA18xQ --- diff --git a/tests/bug-2803/run-bug-2803.c b/tests/bug-2803/run-bug-2803.c index 8382c5aa8..05e6a5d03 100644 --- a/tests/bug-2803/run-bug-2803.c +++ b/tests/bug-2803/run-bug-2803.c @@ -22,29 +22,33 @@ #include "unity.h" #include #include +#include +#include +#include +#include +#include //=======External Functions This Runner Calls===== extern void setUp(void); extern void tearDown(void); -void resetTest(void); extern void test_main(void ); //=======Test Reset Option===== -void resetTest() +void resetTest(void); +void resetTest(void) { tearDown(); setUp(); } -char *progname; +char const *progname; //=======MAIN===== int main(int argc, char *argv[]) { progname = argv[0]; - Unity.TestFile = "bug-2803.c"; UnityBegin("bug-2803.c"); RUN_TEST(test_main, 18); diff --git a/tests/ntpd/Makefile.am b/tests/ntpd/Makefile.am index edfb8fdd0..49bd20bb5 100644 --- a/tests/ntpd/Makefile.am +++ b/tests/ntpd/Makefile.am @@ -181,8 +181,5 @@ check-libunity: ../../sntp/unity/libunity.a $(top_builddir)/ntpd/ntpdsim-ntp_prio_q.o: cd ../../ntpd/ && $(MAKE) $(AM_MAKEFLAGS) ntpdsim-ntp_prio_q.o -#$(top_builddir)/ntpd/ntpdsim-ntp_restrict.o: -# cd ../../ntpd/ && $(MAKE) $(AM_MAKEFLAGS) ntpdsim-ntp_restrict.o - include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/tests/ntpd/ntp_restrict.c b/tests/ntpd/ntp_restrict.c index 285b5b248..98d6e8309 100644 --- a/tests/ntpd/ntp_restrict.c +++ b/tests/ntpd/ntp_restrict.c @@ -141,7 +141,7 @@ test_AddingNewRestriction(void) { void test_TheMostFittingRestrictionIsMatched(void) { - sockaddr_u resaddr = create_sockaddr_u(AF_INET, 54321, "11.22.33.44"); + sockaddr_u resaddr_target = create_sockaddr_u(AF_INET, 54321, "11.22.33.44"); sockaddr_u resaddr_not_matching = create_sockaddr_u(AF_INET, 54321, "11.99.33.44"); sockaddr_u resmask_not_matching = create_sockaddr_u(AF_INET, 54321, "255.255.0.0"); @@ -157,13 +157,13 @@ test_TheMostFittingRestrictionIsMatched(void) { hack_restrict(RESTRICT_FLAGS, &resaddr_best_match, &resmask_best_match, 0, 22, 0); hack_restrict(RESTRICT_FLAGS, &resaddr_second_match, &resmask_second_match, 0, 128, 0); - TEST_ASSERT_EQUAL(22, restrictions(&resaddr)); + TEST_ASSERT_EQUAL(22, restrictions(&resaddr_target)); } void test_DeletedRestrictionIsNotMatched(void) { - sockaddr_u resaddr = create_sockaddr_u(AF_INET, 54321, "11.22.33.44"); + sockaddr_u resaddr_target = create_sockaddr_u(AF_INET, 54321, "11.22.33.44"); sockaddr_u resaddr_not_matching = create_sockaddr_u(AF_INET, 54321, "11.99.33.44"); sockaddr_u resmask_not_matching = create_sockaddr_u(AF_INET, 54321, "255.255.0.0"); @@ -181,5 +181,18 @@ test_DeletedRestrictionIsNotMatched(void) { /* deleting the best match*/ hack_restrict(RESTRICT_REMOVE, &resaddr_best_match, &resmask_best_match, 0, 22, 0); - TEST_ASSERT_EQUAL(128, restrictions(&resaddr)); + TEST_ASSERT_EQUAL(128, restrictions(&resaddr_target)); +} + + +void +test_RestrictUnflagWorks(void) { + sockaddr_u resaddr = create_sockaddr_u(AF_INET, 54321, "11.22.30.20"); + sockaddr_u resmask = create_sockaddr_u(AF_INET, 54321, "255.255.0.0"); + + hack_restrict(RESTRICT_FLAGS, &resaddr, &resmask, 0, 11, 0); + + hack_restrict(RESTRICT_UNFLAG, &resaddr, &resmask, 0, 10, 0); + + TEST_ASSERT_EQUAL(1, restrictions(&resaddr)); } diff --git a/tests/ntpd/run-ntp_prio_q.c b/tests/ntpd/run-ntp_prio_q.c index dc33e0759..35af443de 100644 --- a/tests/ntpd/run-ntp_prio_q.c +++ b/tests/ntpd/run-ntp_prio_q.c @@ -22,11 +22,16 @@ #include "unity.h" #include #include +#include "config.h" +#include "ntp.h" +#include "ntp_calendar.h" +#include "ntp_stdlib.h" +#include "ntp_prio_q.h" +#include //=======External Functions This Runner Calls===== extern void setUp(void); extern void tearDown(void); -void resetTest(void); extern void test_AllocateDeallocateNode(void); extern void test_EmptyQueue(void); extern void test_OneElementQueue(void); @@ -37,20 +42,20 @@ extern void test_AppendQueues(void); //=======Test Reset Option===== -void resetTest() +void resetTest(void); +void resetTest(void) { tearDown(); setUp(); } -char *progname; +char const *progname; //=======MAIN===== int main(int argc, char *argv[]) { progname = argv[0]; - Unity.TestFile = "ntp_prio_q.c"; UnityBegin("ntp_prio_q.c"); RUN_TEST(test_AllocateDeallocateNode, 39); RUN_TEST(test_EmptyQueue, 46); diff --git a/tests/ntpd/run-ntp_restrict.c b/tests/ntpd/run-ntp_restrict.c index 26b1ef66b..89fd45734 100644 --- a/tests/ntpd/run-ntp_restrict.c +++ b/tests/ntpd/run-ntp_restrict.c @@ -22,11 +22,13 @@ #include "unity.h" #include #include +#include "config.h" +#include "ntpd.h" +#include "ntp_lists.h" //=======External Functions This Runner Calls===== extern void setUp(void); extern void tearDown(void); -void resetTest(void); extern void test_RestrictionsAreEmptyAfterInit(void); extern void test_ReturnsCorrectDefaultRestrictions(void); extern void test_HackingDefaultRestriction(void); @@ -34,23 +36,24 @@ extern void test_CantRemoveDefaultEntry(void); extern void test_AddingNewRestriction(void); extern void test_TheMostFittingRestrictionIsMatched(void); extern void test_DeletedRestrictionIsNotMatched(void); +extern void test_RestrictUnflagWorks(void); //=======Test Reset Option===== -void resetTest() +void resetTest(void); +void resetTest(void) { tearDown(); setUp(); } -char *progname; +char const * progname; //=======MAIN===== int main(int argc, char *argv[]) { progname = argv[0]; - Unity.TestFile = "ntp_restrict.c"; UnityBegin("ntp_restrict.c"); RUN_TEST(test_RestrictionsAreEmptyAfterInit, 59); RUN_TEST(test_ReturnsCorrectDefaultRestrictions, 85); @@ -59,6 +62,7 @@ int main(int argc, char *argv[]) RUN_TEST(test_AddingNewRestriction, 130); RUN_TEST(test_TheMostFittingRestrictionIsMatched, 143); RUN_TEST(test_DeletedRestrictionIsNotMatched, 165); + RUN_TEST(test_RestrictUnflagWorks, 189); return (UnityEnd()); } diff --git a/tests/sec-2853/run-sec-2853.c b/tests/sec-2853/run-sec-2853.c index 66f0c34a0..1159a77c1 100644 --- a/tests/sec-2853/run-sec-2853.c +++ b/tests/sec-2853/run-sec-2853.c @@ -22,33 +22,32 @@ #include "unity.h" #include #include +#include +#include //=======External Functions This Runner Calls===== extern void setUp(void); extern void tearDown(void); -void resetTest(void); -extern void test_main(void ); extern void test_main(void ); //=======Test Reset Option===== -void resetTest() +void resetTest(void); +void resetTest(void) { tearDown(); setUp(); } -char *progname; +char const *progname; //=======MAIN===== int main(int argc, char *argv[]) { progname = argv[0]; - Unity.TestFile = "sec-2853.c"; UnityBegin("sec-2853.c"); RUN_TEST(test_main, 10); - RUN_TEST(test_main, 10); return (UnityEnd()); }