gtest->Unity cleanup

bk: 5585ec1eswPgBO8mCYMeXKCfxHpgTA

diff --git a/sntp/tests/Makefile.am b/sntp/tests/Makefile.am
index 523d32341052dc43e6f490e203e8889d706fd7f0..0a204876904e9177648b3442067a0fcefa97f926 100644 (file)
--- a/sntp/tests/Makefile.am
+++ b/sntp/tests/Makefile.am
@@ -11,7 +11,7 @@ run_unity =   cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
 #EXTRA_PROGRAMS +=     test-keyFile
 
 check_PROGRAMS =               \
-       test-crypto         \
+       test-crypto             \
        test-keyFile            \
        test-kodDatabase        \
        test-kodFile            \
@@ -35,16 +35,20 @@ base_SOURCES =                      \
 
 tests_SOURCES =                        \
        $(base_SOURCES)         \
-       g_crypto.cpp            \
-       g_keyFile.cpp           \
-       g_kodDatabase.cpp       \
-       g_kodFile.cpp           \
        g_networking.cpp        \
        packetHandling.cpp      \
        packetProcessing.cpp    \
-       g_utilities.cpp         \
        $(NULL)
 
+#HMS: Somebody needs to audit the following files to
+# make sure all of these tests are now handled by Unity
+#
+#      g_utilities.cpp         
+#      g_kodDatabase.cpp       
+#      g_keyFile.cpp           
+#      g_crypto.cpp            
+#      g_kodFile.cpp           
+
 noinst_HEADERS =               \
        fileHandlingTest.h      \
        sntptest.h              \

diff --git a/sntp/tests_main.cpp b/sntp/tests_main.cpp
index 3d11bb1302effdc5fd97658a59f29610c5864848..584165d66d87576398588ec6a55a80e6c042407e 100644 (file)
--- a/sntp/tests_main.cpp
+++ b/sntp/tests_main.cpp
@@ -1,5 +1,9 @@
 #include "tests_main.h"
 
+extern "C" {
+const char * Version = "stub unit test Version string";
+};
+
 int main(int argc, char **argv) {
        ::testing::InitGoogleTest(&argc, argv);
 

diff --git a/tests/libntp/g_buftvtots.cpp b/tests/libntp/g_buftvtots.cpp
index bb8a32d35bfa839536445a1fcc4bb60e269669a2..050398b28369415b4878c3109358a1d4a3dbd1fe 100644 (file)
--- a/tests/libntp/g_buftvtots.cpp
+++ b/tests/libntp/g_buftvtots.cpp
@@ -1,4 +1,4 @@
-#include "lfptest.h"
+#include "g_lfptest.h"
 
 extern "C" {
 #include "ntp_unixtime.h"

diff --git a/tests/libntp/g_decodenetnum.cpp b/tests/libntp/g_decodenetnum.cpp
index c6766de288ee2cb5f1173742d7d29d58d1c5cb89..059642890601f2864266709fb3b05e340b8c31c0 100644 (file)
--- a/tests/libntp/g_decodenetnum.cpp
+++ b/tests/libntp/g_decodenetnum.cpp
@@ -1,4 +1,4 @@
-#include "sockaddrtest.h"
+#include "g_sockaddrtest.h"
 
 class decodenetnumTest : public sockaddrtest {
 };

diff --git a/tests/libntp/g_hextolfp.cpp b/tests/libntp/g_hextolfp.cpp
index 2e9f072cd6d19aa5db3e2b07a53fec4dd3c722f1..bcfb094f902b5442612577861ba8048a3205715c 100644 (file)
--- a/tests/libntp/g_hextolfp.cpp
+++ b/tests/libntp/g_hextolfp.cpp
@@ -1,4 +1,4 @@
-#include "lfptest.h"
+#include "g_lfptest.h"
 
 class hextolfpTest : public lfptest {
 };

diff --git a/tests/libntp/g_netof.cpp b/tests/libntp/g_netof.cpp
index 67b9df4e7cf77e0191701b2846581f480993b9c4..8fc9ac7689be9929c17913c96e7fe0c2eacd1102 100644 (file)
--- a/tests/libntp/g_netof.cpp
+++ b/tests/libntp/g_netof.cpp
@@ -1,4 +1,4 @@
-#include "sockaddrtest.h"
+#include "g_sockaddrtest.h"
 
 class netofTest : public sockaddrtest  {
 };

diff --git a/tests/libntp/g_socktoa.cpp b/tests/libntp/g_socktoa.cpp
index 6c70b6d8ddc1ad32ca16de84bbcfcf4b2feee85d..2bb2fb1e779c4012c08aa40b0a6a204673eb45ed 100644 (file)
--- a/tests/libntp/g_socktoa.cpp
+++ b/tests/libntp/g_socktoa.cpp
@@ -1,4 +1,4 @@
-#include "sockaddrtest.h"
+#include "g_sockaddrtest.h"
 
 class socktoaTest : public sockaddrtest {
 };

diff --git a/tests/libntp/g_strtolfp.cpp b/tests/libntp/g_strtolfp.cpp
index 729996e0b17db8fcc0fee1444413c81a58a8ff45..d1b361e86e99b3e55ddaffe751925a226bb6a3a4 100644 (file)
--- a/tests/libntp/g_strtolfp.cpp
+++ b/tests/libntp/g_strtolfp.cpp
@@ -1,4 +1,4 @@
-#include "lfptest.h"
+#include "g_lfptest.h"
 
 /* This class tests both atolfp and mstolfp */
 

diff --git a/tests/libntp/g_tvtots.cpp b/tests/libntp/g_tvtots.cpp
index c51b7f59e63f57a42a44517789159d5e2aeb9b43..fcb82a30bdc691a9a530bed2d6dea7583d3fa73a 100644 (file)
--- a/tests/libntp/g_tvtots.cpp
+++ b/tests/libntp/g_tvtots.cpp
@@ -1,4 +1,4 @@
-#include "lfptest.h"
+#include "g_lfptest.h"
 
 extern "C" {
 #include "timevalops.h"