packetHandling.c:

  put init_lib() every time. Unlike init_auth(), works every time in setUp() without causing segfault
  added init_lib() in setUp(), so now stuff works!

bk: 558c0b69zh9WActyL0x8PvB2jjkpFg

diff --git a/sntp/tests/packetHandling.c b/sntp/tests/packetHandling.c
index 2766fcfce5665a026faaae108851bb59f492f669..4cb5a91c9308eac0c3a68a7e556193fe1348ba39 100644 (file)
--- a/sntp/tests/packetHandling.c
+++ b/sntp/tests/packetHandling.c
@@ -1,8 +1,8 @@
 #include "config.h"
-#include "unity.h"
-//#include "ntp_stdlib.h"
-#include "ntp_types.h"
 #include "ntp_debug.h"
+#include "ntp_stdlib.h"
+#include "ntp_types.h"
+
 #include "sntptest.h"
 
 #include "kod_management.h"
@@ -10,6 +10,20 @@
 #include "networking.h"
 #include "ntp.h"
 
+#include "unity.h"
+
+
+int counter = 0;
+
+
+// old code from google test framework, moved to SetUp() for unity
+void setUp(void)
+{ 
+       init_lib(); 
+}
+
+
+
 int LfpEquality(const l_fp expected, const l_fp actual) {
                if (L_ISEQU(&expected, &actual)) {
                        return TRUE; 

diff --git a/sntp/tests/run-packetHandling.c b/sntp/tests/run-packetHandling.c
index e8b6b3a9efc0aa1c5298de15e9575b759c9207b0..69e958e4c15c76c16c4da34d1d5c9f0f96048534 100644 (file)
--- a/sntp/tests/run-packetHandling.c
+++ b/sntp/tests/run-packetHandling.c
@@ -55,16 +55,16 @@ int main(int argc, char *argv[])
   progname = argv[0];
   Unity.TestFile = "packetHandling.c";
   UnityBegin("packetHandling.c");
-  RUN_TEST(test_GenerateUnauthenticatedPacket, 21);
-  RUN_TEST(test_GenerateAuthenticatedPacket, 44);
-  RUN_TEST(test_OffsetCalculationPositiveOffset, 83);
-  RUN_TEST(test_OffsetCalculationNegativeOffset, 127);
-  RUN_TEST(test_HandleUnusableServer, 170);
-  RUN_TEST(test_HandleUnusablePacket, 181);
-  RUN_TEST(test_HandleServerAuthenticationFailure, 192);
-  RUN_TEST(test_HandleKodDemobilize, 203);
-  RUN_TEST(test_HandleKodRate, 227);
-  RUN_TEST(test_HandleCorrectPacket, 238);
+  RUN_TEST(test_GenerateUnauthenticatedPacket, 35);
+  RUN_TEST(test_GenerateAuthenticatedPacket, 58);
+  RUN_TEST(test_OffsetCalculationPositiveOffset, 97);
+  RUN_TEST(test_OffsetCalculationNegativeOffset, 141);
+  RUN_TEST(test_HandleUnusableServer, 184);
+  RUN_TEST(test_HandleUnusablePacket, 195);
+  RUN_TEST(test_HandleServerAuthenticationFailure, 206);
+  RUN_TEST(test_HandleKodDemobilize, 217);
+  RUN_TEST(test_HandleKodRate, 241);
+  RUN_TEST(test_HandleCorrectPacket, 252);
 
   return (UnityEnd());
 }