run-refidsmear.c:

  updated autogenerated file
refidsmear.c:
  added the assertions and a nice message if a test fails

bk: 558e0e7dlvTnre_5I9K1YibUaLnstQ

diff --git a/tests/libntp/refidsmear.c b/tests/libntp/refidsmear.c
index 7f2adcc8dc7c560616e1f8f4b532cba02f044735..b95152600bac901eb1194d122b581c4a8c9acd22 100644 (file)
--- a/tests/libntp/refidsmear.c
+++ b/tests/libntp/refidsmear.c
@@ -9,6 +9,8 @@
 
 #include "unity.h"
 
+#include <stdio.h>
+
 /*
  * we want to test a refid format of:
  * 254.x.y.x
@@ -33,13 +35,19 @@ rtol(uint32_t r, char *es)
 {
        l_fp l;
        char *as;
+       char msg[100];
 
-       printf("rtol: ");
+       snprintf(msg, 100, "rtol was called with r=%#.8x, es=%s", r, es);
 
        l = convertRefIDToLFP(htonl(r));
        as = lfptoa(&l, 8);
-       printf("refid %#x, smear %s\n", r, as);
-       // ASSERT: as and es are equal
+       
+       //printf("refid %#x, smear %s\n", r, as);
+
+       TEST_ASSERT_NOT_NULL_MESSAGE(as, msg);
+       TEST_ASSERT_NOT_NULL_MESSAGE(es, msg);
+       TEST_ASSERT_EQUAL_STRING_MESSAGE(es, as, msg);
+
 
        return;
 }
@@ -53,16 +61,21 @@ rtoltor(uint32_t er, char *es)
        l_fp l;
        char *as;
        uint32_t ar;
+       char msg[100];
+
+       snprintf(msg, 100, "rtoltor was called with er=%#.8x, es=%s", er, es);
 
-       printf("rtoltor: ");
        l = convertRefIDToLFP(htonl(er));
        as = lfptoa(&l, 8);
 
        ar = convertLFPToRefID(l);
-       printf("smear %s, refid %#.8x\n", lfptoa(&l, 8), ntohl(ar));
 
-       //ASSERT es == as
-       //ASSERT er == ar
+       //printf("smear %s, refid %#.8x\n", lfptoa(&l, 8), ntohl(ar));
+
+       TEST_ASSERT_NOT_NULL_MESSAGE(as, msg);
+       TEST_ASSERT_NOT_NULL_MESSAGE(es, msg);
+       TEST_ASSERT_EQUAL_STRING_MESSAGE(es, as, msg);
+       TEST_ASSERT_EQUAL_UINT_MESSAGE(er, ntohl(ar), msg);
 
        return;
 }

diff --git a/tests/libntp/run-refidsmear.c b/tests/libntp/run-refidsmear.c
index 7cbb83fe6bb53d78eda300a1f357a1fb8363632d..30651f35f0a9197500e1c7dca5e4f542e7889922 100644 (file)
--- a/tests/libntp/run-refidsmear.c
+++ b/tests/libntp/run-refidsmear.c
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
   progname = argv[0];
   Unity.TestFile = "refidsmear.c";
   UnityBegin("refidsmear.c");
-  RUN_TEST(test_refidsmear, 87);
+  RUN_TEST(test_refidsmear, 100);
 
   return (UnityEnd());
 }