Merge pull request #634 in SNORT/snort3 from cmake-appid-unit-tests to master

Squashed commit of the following:

commit d2c849d8fc628237be8f0e291213433cb23b3556
Author: Victor Roemer <viroemer@cisco.com>
Date:   Thu Sep 22 14:57:38 2016 -0400

    Fix another case of CPPUTest header order issues

diff --git a/src/network_inspectors/appid/client_plugins/test/client_app_smtp_test.cc b/src/network_inspectors/appid/client_plugins/test/client_app_smtp_test.cc
index 75f62fab727a26cf59c41a6d1679d80f07729fed..282c63849b2f8eb892acb9f4f3e684e72c1a179f 100644 (file)
--- a/src/network_inspectors/appid/client_plugins/test/client_app_smtp_test.cc
+++ b/src/network_inspectors/appid/client_plugins/test/client_app_smtp_test.cc
@@ -19,12 +19,12 @@
 // client_app_smtp_test.cc author Steve Chew <stechew@cisco.com>
 // unit test for client_app_smtp
 
+#include "network_inspectors/appid/client_plugins/client_app_smtp.cc"
+
 #include <CppUTest/CommandLineTestRunner.h>
 #include <CppUTest/TestHarness.h>
 #include <CppUTestExt/MockSupport.h>
 
-#include "network_inspectors/appid/client_plugins/client_app_smtp.cc"
-
 #include <string>
 
 void Debug::print(const char*, int, uint64_t, const char*, ...) { }

diff --git a/src/network_inspectors/appid/service_plugins/test/service_rsync_test.cc b/src/network_inspectors/appid/service_plugins/test/service_rsync_test.cc
index ac6eccc96fd4974efeb6ba8da4c71eee7d4c388e..f94bca47c32b26cd90ede98094532d0f8b58d38c 100644 (file)
--- a/src/network_inspectors/appid/service_plugins/test/service_rsync_test.cc
+++ b/src/network_inspectors/appid/service_plugins/test/service_rsync_test.cc
@@ -19,12 +19,12 @@
 // service_rsync_test.cc author Steve Chew <stechew@cisco.com>
 // unit test for service_rsync
 
+#include "network_inspectors/appid/service_plugins/service_rsync.cc"
+
 #include <CppUTest/CommandLineTestRunner.h>
 #include <CppUTest/TestHarness.h>
 #include <CppUTestExt/MockSupport.h>
 
-#include "network_inspectors/appid/service_plugins/service_rsync.cc"
-
 void Debug::print(const char*, int, uint64_t, const char*, ...) { }
 
 extern int rsync_validate(ServiceValidationArgs*);