Init unit test suite for all unit test apps

Move the init_unit_test_suite(...) function to a hpp file and include it in every unit test app: - app_test - chain_test - cli_test - es_test - performance_test
bitshares · Mar 6, 2021 · 44345ce · 44345ce
1 parent a035c6b
commit 44345ce
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 32 deletions.
diff --git a/tests/app/main.cpp b/tests/app/main.cpp
@@ -42,11 +42,12 @@
 
 #include "../../libraries/app/application_impl.hxx"
 
-#define BOOST_TEST_MODULE Test Application
-#include <boost/test/included/unit_test.hpp>
+#include "../common/init_unit_test_suite.hpp"
 
 #include "../common/genesis_file_util.hpp"
 
+uint32_t GRAPHENE_TESTING_GENESIS_TIMESTAMP = 1431700000; // needed for compiling, not used
+
 using namespace graphene;
 namespace bpo = boost::program_options;
 

diff --git a/tests/cli/main.cpp b/tests/cli/main.cpp
@@ -60,8 +60,9 @@
 
 #include <boost/filesystem/path.hpp>
 
-#define BOOST_TEST_MODULE Test Application
-#include <boost/test/included/unit_test.hpp>
+#include "../common/init_unit_test_suite.hpp"
+
+uint32_t GRAPHENE_TESTING_GENESIS_TIMESTAMP = 1431700000; // needed for compiling, not used
 
 /*****
  * Global Initialization for Windows

diff --git a/tests/common/init_unit_test_suite.hpp b/tests/common/init_unit_test_suite.hpp
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2015 Cryptonomex, Inc., and contributors.
+ *
+ * The MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <cstdlib>
+#include <iostream>
+#include <boost/test/included/unit_test.hpp>
+#include <chrono>
+
+extern uint32_t GRAPHENE_TESTING_GENESIS_TIMESTAMP;
+
+boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
+   const auto seed = std::chrono::high_resolution_clock::now().time_since_epoch().count();
+   std::srand( seed );
+   std::cout << "Random number generator seeded to " << seed << std::endl;
+   const char* genesis_timestamp_str = getenv("GRAPHENE_TESTING_GENESIS_TIMESTAMP");
+   if( genesis_timestamp_str != nullptr )
+   {
+      GRAPHENE_TESTING_GENESIS_TIMESTAMP = std::stoul( genesis_timestamp_str );
+   }
+   std::cout << "GRAPHENE_TESTING_GENESIS_TIMESTAMP is " << GRAPHENE_TESTING_GENESIS_TIMESTAMP << std::endl;
+   return nullptr;
+}
diff --git a/tests/elasticsearch/main.cpp b/tests/elasticsearch/main.cpp
@@ -31,8 +31,7 @@
 
 #include "../common/database_fixture.hpp"
 
-#define BOOST_TEST_MODULE Elastic Search Database Tests
-#include <boost/test/included/unit_test.hpp>
+#include "../common/init_unit_test_suite.hpp"
 
 #ifdef NDEBUG
   #define ES_WAIT_TIME (fc::milliseconds(1000))

diff --git a/tests/performance/performance_tests.cpp b/tests/performance/performance_tests.cpp
@@ -22,13 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include <boost/test/included/unit_test.hpp>
-
-boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-   std::srand(time(NULL));
-   std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
-   return nullptr;
-}
+#include "../common/init_unit_test_suite.hpp"
 
 #include <graphene/chain/database.hpp>
 

diff --git a/tests/tests/main.cpp b/tests/tests/main.cpp
@@ -21,22 +21,4 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <cstdlib>
-#include <iostream>
-#include <boost/test/included/unit_test.hpp>
-#include <chrono>
-
-extern uint32_t GRAPHENE_TESTING_GENESIS_TIMESTAMP;
-
-boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
-   const auto seed = std::chrono::high_resolution_clock::now().time_since_epoch().count();
-   std::srand( seed );
-   std::cout << "Random number generator seeded to " << seed << std::endl;
-   const char* genesis_timestamp_str = getenv("GRAPHENE_TESTING_GENESIS_TIMESTAMP");
-   if( genesis_timestamp_str != nullptr )
-   {
-      GRAPHENE_TESTING_GENESIS_TIMESTAMP = std::stoul( genesis_timestamp_str );
-   }
-   std::cout << "GRAPHENE_TESTING_GENESIS_TIMESTAMP is " << GRAPHENE_TESTING_GENESIS_TIMESTAMP << std::endl;
-   return nullptr;
-}
+#include "../common/init_unit_test_suite.hpp"