Remove system libs from coverage report

.gitlab-ci.yml

@@ -18,14 +18,12 @@ build:
     - rm -rf build
     - mkdir build
     - cd build
-    - cmake -DCMAKE_BUILD_TYPE=Release ..
+    - cmake -DENABLE_COVERAGE_TESTING=true ..
-    - make -j$(nproc)
+    - make all_graphene_tests -j$(nproc)
   artifacts:
     untracked: true
     paths:
-      - build/libraries/
+      - build/tests/all_graphene_tests
-      - build/programs/
-      - build/tests/
   tags:
     - builder
 
@@ -34,8 +32,15 @@ test:
   dependencies:
     - build
   script:
-    - ./build/tests/betting_test --log_level=message
+    - ./build/tests/all_graphene_tests --log_level=message
-    - ./build/tests/chain_test --log_level=message
+    - lcov --capture --directory ./build/ --output-file ./build/coverage.tmp.info
-    - ./build/tests/cli_test --log_level=message
+    - lcov --remove ./build/coverage.tmp.info "/usr/*" --output-file ./build/coverage.info
+    - genhtml --output-directory ./build/coverage ./build/coverage.info
+  artifacts:
+    untracked: true
+    paths:
+      - build/coverage/
+      - build/coverage.info
+      - build/coverage.tmp.info
   tags:
     - builder

CMakeLists.txt

@@ -147,10 +147,10 @@ else( WIN32 ) # Apple AND Linux
 
 endif( WIN32 )
 
-set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build Peerplays for code coverage analysis")
+#set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build Peerplays for code coverage analysis")
 
 if(ENABLE_COVERAGE_TESTING)
-    SET(CMAKE_CXX_FLAGS "--coverage ${CMAKE_CXX_FLAGS}")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage -O0")
 endif()
 
 add_subdirectory( libraries )

tests/CMakeLists.txt

@@ -62,4 +62,10 @@ file(GLOB ES_SOURCES "elasticsearch/*.cpp")
 add_executable( es_test ${ES_SOURCES} )
 target_link_libraries( es_test PRIVATE graphene_tests_common )
 
+list(FILTER UNIT_TESTS EXCLUDE REGEX "[/]init_tests[.]cpp$")
+list(FILTER BETTING_TESTS EXCLUDE REGEX "[/]init_tests[.]cpp$")
+list(FILTER CLI_SOURCES EXCLUDE REGEX "[/]init_tests[.]cpp$")
+add_executable( all_graphene_tests ./all_graphene_tests/init_tests.cpp ${UNIT_TESTS} ${BETTING_TESTS} ${CLI_SOURCES} )
+target_link_libraries( all_graphene_tests PRIVATE graphene_wallet graphene_witness graphene_tests_common ${PLATFORM_SPECIFIC_LIBS} )
+
 add_subdirectory( generate_empty_blocks )

tests/all_graphene_tests/init_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Cryptonomex, Inc., and contributors.
+ * Copyright (c) 2019 PBSA, and contributors.
  *
  * The MIT License
  *
@@ -21,20 +21,9 @@
  * 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>
 
-extern uint32_t GRAPHENE_TESTING_GENESIS_TIMESTAMP;
+#define BOOST_TEST_MODULE "All Graphene Tests"
+#include <boost/test/unit_test.hpp>
 
-boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
+BOOST_AUTO_TEST_SUITE(AllGrapheneTests)
-   std::srand(time(NULL));
+BOOST_AUTO_TEST_SUITE_END()
-   std::cout << "Random number generator seeded to " << time(NULL) << 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;
-}

tests/app/main.cpp

@@ -41,7 +41,7 @@
 #include "../common/genesis_file_util.hpp"
 
 #define BOOST_TEST_MODULE Test Application
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 using namespace graphene;
 

tests/benchmarks/main.cpp

@@ -22,4 +22,4 @@
  * THE SOFTWARE.
  */
 #define BOOST_TEST_MODULE "C++ Benchmarks for Graphene Blockchain Database"
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>

tests/betting/betting_tests.cpp

@@ -132,191 +132,88 @@ using namespace graphene::chain::keywords;
 //    1.58    50:29  |   2.34   50:67  |    4.6      5:18  |     25      1:24  |    430     1:429  |
 //    1.59   100:59  |   2.36   25:34  |    4.7     10:37
 
-#define CREATE_ICE_HOCKEY_BETTING_MARKET(never_in_play, delay_before_settling) \
+struct database_fixture_for_betting_test : database_fixture {
-  create_sport({{"en", "Ice Hockey"}, {"zh_Hans", "冰球"}, {"ja", "アイスホッケー"}}); \
+    database_fixture_for_betting_test() : database_fixture(HARDFORK_1000_TIME.sec_since_epoch() + 2) {}
-  generate_blocks(1); \
+    ~database_fixture_for_betting_test() {}
-  const sport_object& ice_hockey = *db.get_index_type<sport_object_index>().indices().get<by_id>().rbegin(); \
+};
-  create_event_group({{"en", "NHL"}, {"zh_Hans", "國家冰球聯盟"}, {"ja", "ナショナルホッケーリーグ"}}, ice_hockey.id); \
-  generate_blocks(1); \
-  const event_group_object& nhl = *db.get_index_type<event_group_object_index>().indices().get<by_id>().rbegin(); \
-  create_event({{"en", "Washington Capitals/Chicago Blackhawks"}, {"zh_Hans", "華盛頓首都隊/芝加哥黑鷹"}, {"ja", "ワシントン・キャピタルズ/シカゴ・ブラックホークス"}}, {{"en", "2016-17"}}, nhl.id); \
-  generate_blocks(1); \
-  const event_object& capitals_vs_blackhawks = *db.get_index_type<event_object_index>().indices().get<by_id>().rbegin(); \
-  create_betting_market_rules({{"en", "NHL Rules v1.0"}}, {{"en", "The winner will be the team with the most points at the end of the game.  The team with fewer points will not be the winner."}}); \
-  generate_blocks(1); \
-  const betting_market_rules_object& betting_market_rules = *db.get_index_type<betting_market_rules_object_index>().indices().get<by_id>().rbegin(); \
-  create_betting_market_group({{"en", "Moneyline"}}, capitals_vs_blackhawks.id, betting_market_rules.id, asset_id_type(), never_in_play, delay_before_settling); \
-  generate_blocks(1); \
-  const betting_market_group_object& moneyline_betting_markets = *db.get_index_type<betting_market_group_object_index>().indices().get<by_id>().rbegin(); \
-  create_betting_market(moneyline_betting_markets.id, {{"en", "Washington Capitals win"}}); \
-  generate_blocks(1); \
-  const betting_market_object& capitals_win_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
-  create_betting_market(moneyline_betting_markets.id, {{"en", "Chicago Blackhawks win"}}); \
-  generate_blocks(1); \
-  const betting_market_object& blackhawks_win_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
-  (void)capitals_win_market; (void)blackhawks_win_market;
 
-// create the basic betting market, plus groups for the first, second, and third period results
+BOOST_FIXTURE_TEST_SUITE( betting_tests, database_fixture_for_betting_test )
-#define CREATE_EXTENDED_ICE_HOCKEY_BETTING_MARKET(never_in_play, delay_before_settling) \
-  CREATE_ICE_HOCKEY_BETTING_MARKET(never_in_play, delay_before_settling) \
-  create_betting_market_group({{"en", "First Period Result"}}, capitals_vs_blackhawks.id, betting_market_rules.id, asset_id_type(), never_in_play, delay_before_settling); \
-  generate_blocks(1); \
-  const betting_market_group_object& first_period_result_betting_markets = *db.get_index_type<betting_market_group_object_index>().indices().get<by_id>().rbegin(); \
-  create_betting_market(first_period_result_betting_markets.id, {{"en", "Washington Capitals win"}}); \
-  generate_blocks(1); \
-  const betting_market_object& first_period_capitals_win_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
-  create_betting_market(first_period_result_betting_markets.id, {{"en", "Chicago Blackhawks win"}}); \
-  generate_blocks(1); \
-  const betting_market_object& first_period_blackhawks_win_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
-  (void)first_period_capitals_win_market; (void)first_period_blackhawks_win_market; \
-  \
-  create_betting_market_group({{"en", "Second Period Result"}}, capitals_vs_blackhawks.id, betting_market_rules.id, asset_id_type(), never_in_play, delay_before_settling); \
-  generate_blocks(1); \
-  const betting_market_group_object& second_period_result_betting_markets = *db.get_index_type<betting_market_group_object_index>().indices().get<by_id>().rbegin(); \
-  create_betting_market(second_period_result_betting_markets.id, {{"en", "Washington Capitals win"}}); \
-  generate_blocks(1); \
-  const betting_market_object& second_period_capitals_win_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
-  create_betting_market(second_period_result_betting_markets.id, {{"en", "Chicago Blackhawks win"}}); \
-  generate_blocks(1); \
-  const betting_market_object& second_period_blackhawks_win_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
-  (void)second_period_capitals_win_market; (void)second_period_blackhawks_win_market; \
-  \
-  create_betting_market_group({{"en", "Third Period Result"}}, capitals_vs_blackhawks.id, betting_market_rules.id, asset_id_type(), never_in_play, delay_before_settling); \
-  generate_blocks(1); \
-  const betting_market_group_object& third_period_result_betting_markets = *db.get_index_type<betting_market_group_object_index>().indices().get<by_id>().rbegin(); \
-  create_betting_market(third_period_result_betting_markets.id, {{"en", "Washington Capitals win"}}); \
-  generate_blocks(1); \
-  const betting_market_object& third_period_capitals_win_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
-  create_betting_market(third_period_result_betting_markets.id, {{"en", "Chicago Blackhawks win"}}); \
-  generate_blocks(1); \
-  const betting_market_object& third_period_blackhawks_win_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
-  (void)third_period_capitals_win_market; (void)third_period_blackhawks_win_market;
 
-#define CREATE_TENNIS_BETTING_MARKET() \
+//BOOST_AUTO_TEST_CASE(try_create_sport)
-  create_betting_market_rules({{"en", "Tennis Rules v1.0"}}, {{"en", "The winner is the player who wins the last ball in the match."}}); \
+//{
-  generate_blocks(1); \
+//   try
-  const betting_market_rules_object& tennis_rules = *db.get_index_type<betting_market_rules_object_index>().indices().get<by_id>().rbegin(); \
+//   {
-  create_sport({{"en", "Tennis"}}); \
+//      sport_create_operation sport_create_op;
-  generate_blocks(1); \
+//      sport_create_op.name = {{"en", "Ice Hockey"}, {"zh_Hans", "冰球"}, {"ja", "アイスホッケー"}};
-  const sport_object& tennis = *db.get_index_type<sport_object_index>().indices().get<by_id>().rbegin(); \
+//
-  create_event_group({{"en", "Wimbledon"}}, tennis.id); \
+//      proposal_id_type proposal_id = propose_operation(sport_create_op);
-  generate_blocks(1); \
+//
-  const event_group_object& wimbledon = *db.get_index_type<event_group_object_index>().indices().get<by_id>().rbegin(); \
+//      const auto& active_witnesses = db.get_global_properties().active_witnesses;
-  create_event({{"en", "R. Federer/T. Berdych"}}, {{"en", "2017"}}, wimbledon.id); \
+//      int voting_count = active_witnesses.size() / 2;
-  generate_blocks(1); \
+//
-  const event_object& berdych_vs_federer = *db.get_index_type<event_object_index>().indices().get<by_id>().rbegin(); \
+//      // 5 for
-  create_event({{"en", "M. Cilic/S. Querrye"}}, {{"en", "2017"}}, wimbledon.id); \
+//      std::vector<witness_id_type> witnesses;
-  generate_blocks(1); \
+//      for (const witness_id_type& witness_id : active_witnesses)
-  const event_object& cilic_vs_querrey = *db.get_index_type<event_object_index>().indices().get<by_id>().rbegin(); \
+//      {
-  create_betting_market_group({{"en", "Moneyline 1st sf"}}, berdych_vs_federer.id, tennis_rules.id, asset_id_type(), false, 0); \
+//         witnesses.push_back(witness_id);
-  generate_blocks(1); \
+//         if (--voting_count == 0)
-  const betting_market_group_object& moneyline_berdych_vs_federer = *db.get_index_type<betting_market_group_object_index>().indices().get<by_id>().rbegin(); \
+//            break;
-  create_betting_market_group({{"en", "Moneyline 2nd sf"}}, cilic_vs_querrey.id, tennis_rules.id, asset_id_type(), false, 0); \
+//      }
-  generate_blocks(1); \
+//      process_proposal_by_witnesses(witnesses, proposal_id);
-  const betting_market_group_object& moneyline_cilic_vs_querrey = *db.get_index_type<betting_market_group_object_index>().indices().get<by_id>().rbegin(); \
+//
-  create_betting_market(moneyline_berdych_vs_federer.id, {{"en", "T. Berdych defeats R. Federer"}}); \
+//      // 1st out
-  generate_blocks(1); \
+//      witnesses.clear();
-  const betting_market_object& berdych_wins_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
+//      auto itr = active_witnesses.begin();
-  create_betting_market(moneyline_berdych_vs_federer.id, {{"en", "R. Federer defeats T. Berdych"}}); \
+//      witnesses.push_back(*itr);
-  generate_blocks(1); \
+//      process_proposal_by_witnesses(witnesses, proposal_id, true);
-  const betting_market_object& federer_wins_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
+//
-  create_betting_market(moneyline_cilic_vs_querrey.id, {{"en", "M. Cilic defeats S. Querrey"}}); \
+//      const auto& sport_index = db.get_index_type<sport_object_index>().indices().get<by_id>();
-  generate_blocks(1); \
+//      // not yet approved
-  const betting_market_object& cilic_wins_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
+//      BOOST_REQUIRE(sport_index.rbegin() == sport_index.rend());
-  create_betting_market(moneyline_cilic_vs_querrey.id, {{"en", "S. Querrey defeats M. Cilic"}});\
+//
-  generate_blocks(1); \
+//      // 6th for
-  const betting_market_object& querrey_wins_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
+//      witnesses.clear();
-  create_event({{"en", "R. Federer/M. Cilic"}}, {{"en", "2017"}}, wimbledon.id); \
+//      itr += 5;
-  generate_blocks(1); \
+//      witnesses.push_back(*itr);
-  const event_object& cilic_vs_federer = *db.get_index_type<event_object_index>().indices().get<by_id>().rbegin(); \
+//      process_proposal_by_witnesses(witnesses, proposal_id);
-  create_betting_market_group({{"en", "Moneyline final"}}, cilic_vs_federer.id, tennis_rules.id, asset_id_type(), false, 0); \
+//
-  generate_blocks(1); \
+//      // not yet approved
-  const betting_market_group_object& moneyline_cilic_vs_federer = *db.get_index_type<betting_market_group_object_index>().indices().get<by_id>().rbegin(); \
+//      BOOST_REQUIRE(sport_index.rbegin() == sport_index.rend());
-  create_betting_market(moneyline_cilic_vs_federer.id, {{"en", "R. Federer defeats M. Cilic"}}); \
+//
-  generate_blocks(1); \
+//      // 7th for
-  const betting_market_object& federer_wins_final_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
+//      witnesses.clear();
-  create_betting_market(moneyline_cilic_vs_federer.id, {{"en", "M. Cilic defeats R. Federer"}}); \
+//      ++itr;
-  generate_blocks(1); \
+//      witnesses.push_back(*itr);
-  const betting_market_object& cilic_wins_final_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
+//      process_proposal_by_witnesses(witnesses, proposal_id);
-  (void)federer_wins_market;(void)cilic_wins_market;(void)federer_wins_final_market; (void)cilic_wins_final_market; (void)berdych_wins_market; (void)querrey_wins_market;
+//
+//      // done
+//      BOOST_REQUIRE(sport_index.rbegin() != sport_index.rend());
+//      sport_id_type sport_id = (*sport_index.rbegin()).id;
+//      BOOST_REQUIRE(sport_id == sport_id_type());
+//
+//   } FC_LOG_AND_RETHROW()
+//}
 
-BOOST_FIXTURE_TEST_SUITE( betting_tests, database_fixture )
+//BOOST_AUTO_TEST_CASE(simple_bet_win)
-
+//{
-BOOST_AUTO_TEST_CASE(try_create_sport)
+//   try
-{
+//   {
-   try
+//      ACTORS( (alice)(bob) );
-   {
+//      CREATE_ICE_HOCKEY_BETTING_MARKET(false, 0);
-      sport_create_operation sport_create_op;
+//
-      sport_create_op.name = {{"en", "Ice Hockey"}, {"zh_Hans", "冰球"}, {"ja", "アイスホッケー"}};
+//      // give alice and bob 10k each
-
+//      transfer(account_id_type(), alice_id, asset(10000));
-      proposal_id_type proposal_id = propose_operation(sport_create_op);
+//      transfer(account_id_type(), bob_id, asset(10000));
-
+//
-      const auto& active_witnesses = db.get_global_properties().active_witnesses;
+//      // place bets at 10:1
-      int voting_count = active_witnesses.size() / 2;
+//      place_bet(bob_id, capitals_win_market.id, bet_type::lay, asset(100, asset_id_type()), 11 * GRAPHENE_BETTING_ODDS_PRECISION);
-
+//      place_bet(alice_id, capitals_win_market.id, bet_type::back, asset(1000, asset_id_type()), 11 * GRAPHENE_BETTING_ODDS_PRECISION);
-      // 5 for
+//
-      std::vector<witness_id_type> witnesses;
+//      // reverse positions at 1:1
-      for (const witness_id_type& witness_id : active_witnesses)
+//      place_bet(bob_id, capitals_win_market.id, bet_type::back, asset(1100, asset_id_type()), 2 * GRAPHENE_BETTING_ODDS_PRECISION);
-      {
+//      place_bet(alice_id, capitals_win_market.id, bet_type::lay, asset(1100, asset_id_type()), 2 * GRAPHENE_BETTING_ODDS_PRECISION);
-         witnesses.push_back(witness_id);
+//   } FC_LOG_AND_RETHROW()
-         if (--voting_count == 0)
+//}
-            break;
-      }
-      process_proposal_by_witnesses(witnesses, proposal_id);
-
-      // 1st out
-      witnesses.clear();
-      auto itr = active_witnesses.begin();
-      witnesses.push_back(*itr);
-      process_proposal_by_witnesses(witnesses, proposal_id, true);
-
-      const auto& sport_index = db.get_index_type<sport_object_index>().indices().get<by_id>();
-      // not yet approved
-      BOOST_REQUIRE(sport_index.rbegin() == sport_index.rend());
-
-      // 6th for
-      witnesses.clear();
-      itr += 5;
-      witnesses.push_back(*itr);
-      process_proposal_by_witnesses(witnesses, proposal_id);
-
-      // not yet approved
-      BOOST_REQUIRE(sport_index.rbegin() == sport_index.rend());
-
-      // 7th for
-      witnesses.clear();
-      ++itr;
-      witnesses.push_back(*itr);
-      process_proposal_by_witnesses(witnesses, proposal_id);
-
-      // done
-      BOOST_REQUIRE(sport_index.rbegin() != sport_index.rend());
-      sport_id_type sport_id = (*sport_index.rbegin()).id;
-      BOOST_REQUIRE(sport_id == sport_id_type());
-
-   } FC_LOG_AND_RETHROW()
-}
-
-BOOST_AUTO_TEST_CASE(simple_bet_win)
-{
-   try
-   {
-      ACTORS( (alice)(bob) );
-      CREATE_ICE_HOCKEY_BETTING_MARKET(false, 0);
-
-      // give alice and bob 10k each
-      transfer(account_id_type(), alice_id, asset(10000));
-      transfer(account_id_type(), bob_id, asset(10000));
-
-      // place bets at 10:1
-      place_bet(bob_id, capitals_win_market.id, bet_type::lay, asset(100, asset_id_type()), 11 * GRAPHENE_BETTING_ODDS_PRECISION);
-      place_bet(alice_id, capitals_win_market.id, bet_type::back, asset(1000, asset_id_type()), 11 * GRAPHENE_BETTING_ODDS_PRECISION);
-
-      // reverse positions at 1:1
-      place_bet(bob_id, capitals_win_market.id, bet_type::back, asset(1100, asset_id_type()), 2 * GRAPHENE_BETTING_ODDS_PRECISION);
-      place_bet(alice_id, capitals_win_market.id, bet_type::lay, asset(1100, asset_id_type()), 2 * GRAPHENE_BETTING_ODDS_PRECISION);
-   } FC_LOG_AND_RETHROW()
-}
 
 BOOST_AUTO_TEST_CASE(binned_order_books)
 {
@@ -1372,6 +1269,40 @@ BOOST_AUTO_TEST_CASE( cancel_one_event_in_group )
 
 BOOST_AUTO_TEST_SUITE_END()
 
+// set up a fixture that places a series of two matched bets, we'll use this fixture to verify
+// the result in all three possible outcomes
+struct simple_bet_test_fixture : database_fixture {
+   betting_market_id_type capitals_win_betting_market_id;
+   betting_market_id_type blackhawks_win_betting_market_id;
+   betting_market_group_id_type moneyline_betting_markets_id;
+
+   simple_bet_test_fixture() : database_fixture(HARDFORK_1000_TIME.sec_since_epoch() + 2)
+   {
+      ACTORS( (alice)(bob) );
+      CREATE_ICE_HOCKEY_BETTING_MARKET(false, 0);
+
+      // give alice and bob 10k each
+      transfer(account_id_type(), alice_id, asset(10000));
+      transfer(account_id_type(), bob_id, asset(10000));
+
+      // place bets at 10:1
+      place_bet(alice_id, capitals_win_market.id, bet_type::back, asset(100, asset_id_type()), 11 * GRAPHENE_BETTING_ODDS_PRECISION);
+      place_bet(bob_id, capitals_win_market.id, bet_type::lay, asset(1000, asset_id_type()), 11 * GRAPHENE_BETTING_ODDS_PRECISION);
+
+      // reverse positions at 1:1
+      place_bet(alice_id, capitals_win_market.id, bet_type::lay, asset(1100, asset_id_type()), 2 * GRAPHENE_BETTING_ODDS_PRECISION);
+      place_bet(bob_id, capitals_win_market.id, bet_type::back, asset(1100, asset_id_type()), 2 * GRAPHENE_BETTING_ODDS_PRECISION);
+
+      capitals_win_betting_market_id = capitals_win_market.id;
+      blackhawks_win_betting_market_id = blackhawks_win_market.id;
+      moneyline_betting_markets_id = moneyline_betting_markets.id;
+
+      // close betting to prepare for the next operation which will be grading or cancel
+      update_betting_market_group(moneyline_betting_markets.id, graphene::chain::keywords::_status = betting_market_group_status::closed);
+      generate_blocks(1);
+   }
+};
+
 BOOST_FIXTURE_TEST_SUITE( simple_bet_tests, simple_bet_test_fixture )
 
 BOOST_AUTO_TEST_CASE( win )
@@ -1444,39 +1375,7 @@ BOOST_AUTO_TEST_CASE( cancel )
 
 BOOST_AUTO_TEST_SUITE_END()
 
-struct simple_bet_test_fixture_2 : database_fixture {
+BOOST_FIXTURE_TEST_SUITE( update_tests, database_fixture_for_betting_test )
-   betting_market_id_type capitals_win_betting_market_id;
-   simple_bet_test_fixture_2()
-   {
-      ACTORS( (alice)(bob) );
-      CREATE_ICE_HOCKEY_BETTING_MARKET(false, 0);
-
-      // give alice and bob 10k each
-      transfer(account_id_type(), alice_id, asset(10000));
-      transfer(account_id_type(), bob_id, asset(10000));
-
-      // alice backs 1000 at 1:1, matches
-      place_bet(alice_id, capitals_win_market.id, bet_type::back, asset(1000, asset_id_type()), 2 * GRAPHENE_BETTING_ODDS_PRECISION);
-      place_bet(bob_id, capitals_win_market.id, bet_type::lay, asset(1000, asset_id_type()), 2 * GRAPHENE_BETTING_ODDS_PRECISION);
-
-      // now alice lays at 2500 at 1:1.  This should require a deposit of 500, with the remaining 200 being funded from exposure
-      place_bet(alice_id, capitals_win_market.id, bet_type::lay, asset(2500, asset_id_type()), 2 * GRAPHENE_BETTING_ODDS_PRECISION);
-
-      // match the bet bit by bit. bob matches 500 of alice's 2500 bet.  This effectively cancels half of bob's lay position
-      // so he immediately gets 500 back.  It reduces alice's back position, but doesn't return any money to her (all 2000 of her exposure
-      // was already "promised" to her lay bet, so the 500 she would have received is placed in her refundable_unmatched_bets)
-      place_bet(bob_id, capitals_win_market.id, bet_type::back, asset(500, asset_id_type()), 2 * GRAPHENE_BETTING_ODDS_PRECISION);
-
-      // match another 500, which will fully cancel bob's lay position and return the other 500 he had locked up in his position.
-      // alice's back position is now canceled, 1500 remains of her unmatched lay bet, and the 500 from canceling her position has
-      // been moved to her refundable_unmatched_bets
-      place_bet(bob_id, capitals_win_market.id, bet_type::back, asset(500, asset_id_type()), 2 * GRAPHENE_BETTING_ODDS_PRECISION);
-
-      capitals_win_betting_market_id = capitals_win_market.id;
-   }
-};
-
-BOOST_FIXTURE_TEST_SUITE( update_tests, database_fixture )
 
 BOOST_AUTO_TEST_CASE(sport_update_test)
 {
@@ -2037,7 +1936,7 @@ BOOST_AUTO_TEST_CASE(betting_market_update_test)
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_FIXTURE_TEST_SUITE( event_status_tests, database_fixture )
+BOOST_FIXTURE_TEST_SUITE( event_status_tests, database_fixture_for_betting_test )
 
 // This tests a normal progression by setting the event state and
 // letting it trickle down:
@@ -2757,7 +2656,7 @@ BOOST_AUTO_TEST_SUITE(other_betting_tests)
    }                                                       \
 }
 
-BOOST_FIXTURE_TEST_CASE( another_event_group_update_test, database_fixture)
+BOOST_FIXTURE_TEST_CASE( another_event_group_update_test, database_fixture_for_betting_test)
 {
    try
    {
@@ -2820,7 +2719,7 @@ BOOST_FIXTURE_TEST_CASE( another_event_group_update_test, database_fixture)
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_FIXTURE_TEST_SUITE( tennis_bet_tests, database_fixture )
+BOOST_FIXTURE_TEST_SUITE( tennis_bet_tests, database_fixture_for_betting_test )
 
 BOOST_AUTO_TEST_CASE( wimbledon_2017_gentelmen_singles_sf_test )
 {
@@ -3000,21 +2899,3 @@ BOOST_AUTO_TEST_CASE( wimbledon_2017_gentelmen_singles_final_test )
 // }
 
 BOOST_AUTO_TEST_SUITE_END()
-
-
-
-//#define BOOST_TEST_MODULE "C++ Unit Tests for Graphene Blockchain Database"
-#include <cstdlib>
-#include <iostream>
-#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;
-
-    // betting operations don't take effect until HARDFORK 1000
-    GRAPHENE_TESTING_GENESIS_TIMESTAMP = HARDFORK_1000_TIME.sec_since_epoch() + 2;
-
-    return nullptr;
-}
-

tests/betting/init_tests.cpp

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2019 PBSA, 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.
+ */
+
+#define BOOST_TEST_MODULE "Betting Tests"
+#include <boost/test/unit_test.hpp>

tests/cli/init_tests.cpp

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2019 PBSA, 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.
+ */
+
+#define BOOST_TEST_MODULE CLI Tests
+#include <boost/test/unit_test.hpp>

tests/cli/main.cpp

@@ -27,8 +27,7 @@
 
 #include <graphene/utilities/tempdir.hpp>
 
-#define BOOST_TEST_MODULE Test Application
+#include <boost/test/unit_test.hpp>
-#include <boost/test/included/unit_test.hpp>
 
 ///////////////////////////////
 // Tests

tests/common/betting_test_markets.hpp

@@ -137,37 +137,3 @@ using namespace graphene::chain;
   generate_blocks(1); \
   const betting_market_object& cilic_wins_final_market = *db.get_index_type<betting_market_object_index>().indices().get<by_id>().rbegin(); \
   (void)federer_wins_market;(void)cilic_wins_market;(void)federer_wins_final_market; (void)cilic_wins_final_market; (void)berdych_wins_market; (void)querrey_wins_market;
-
-// set up a fixture that places a series of two matched bets, we'll use this fixture to verify
-// the result in all three possible outcomes
-struct simple_bet_test_fixture : database_fixture {
-   betting_market_id_type capitals_win_betting_market_id;
-   betting_market_id_type blackhawks_win_betting_market_id;
-   betting_market_group_id_type moneyline_betting_markets_id;
-
-   simple_bet_test_fixture()
-   {
-      ACTORS( (alice)(bob) );
-      CREATE_ICE_HOCKEY_BETTING_MARKET(false, 0);
-
-      // give alice and bob 10k each
-      transfer(account_id_type(), alice_id, asset(10000));
-      transfer(account_id_type(), bob_id, asset(10000));
-
-      // place bets at 10:1
-      place_bet(alice_id, capitals_win_market.id, bet_type::back, asset(100, asset_id_type()), 11 * GRAPHENE_BETTING_ODDS_PRECISION);
-      place_bet(bob_id, capitals_win_market.id, bet_type::lay, asset(1000, asset_id_type()), 11 * GRAPHENE_BETTING_ODDS_PRECISION);
-
-      // reverse positions at 1:1
-      place_bet(alice_id, capitals_win_market.id, bet_type::lay, asset(1100, asset_id_type()), 2 * GRAPHENE_BETTING_ODDS_PRECISION);
-      place_bet(bob_id, capitals_win_market.id, bet_type::back, asset(1100, asset_id_type()), 2 * GRAPHENE_BETTING_ODDS_PRECISION);
-
-      capitals_win_betting_market_id = capitals_win_market.id;
-      blackhawks_win_betting_market_id = blackhawks_win_market.id;
-      moneyline_betting_markets_id = moneyline_betting_markets.id;
-
-      // close betting to prepare for the next operation which will be grading or cancel
-      update_betting_market_group(moneyline_betting_markets.id, graphene::chain::keywords::_status = betting_market_group_status::closed);
-      generate_blocks(1);
-   }
-};

tests/common/database_fixture.cpp

@@ -64,7 +64,7 @@ namespace graphene { namespace chain {
 using std::cout;
 using std::cerr;
 
-database_fixture::database_fixture()
+database_fixture::database_fixture(uint32_t GrapheneTestingGenesisTimestamp)
    : app(), db( *app.chain_database() )
 {
    try {
@@ -87,7 +87,7 @@ database_fixture::database_fixture()
 
    boost::program_options::variables_map options;
 
-   genesis_state.initial_timestamp = time_point_sec( GRAPHENE_TESTING_GENESIS_TIMESTAMP );
+   genesis_state.initial_timestamp = time_point_sec( GrapheneTestingGenesisTimestamp );
    //int back_to_the_past = 0;
    //back_to_the_past = 7 * 24 * 60 * 60; // week
    //genesis_state.initial_timestamp = time_point_sec( (fc::time_point::now().sec_since_epoch() - back_to_the_past) / GRAPHENE_DEFAULT_BLOCK_INTERVAL * GRAPHENE_DEFAULT_BLOCK_INTERVAL );

tests/common/database_fixture.hpp

@@ -174,7 +174,7 @@ struct database_fixture {
    bool skip_key_index_test = false;
    uint32_t anon_acct_count;
 
-   database_fixture();
+   database_fixture(uint32_t GrapheneTestingGenesisTimestamp = GRAPHENE_TESTING_GENESIS_TIMESTAMP);
    ~database_fixture();
 
    static fc::ecc::private_key generate_private_key(string seed);

tests/elasticsearch/main.cpp

@@ -32,7 +32,7 @@
 #include "../common/database_fixture.hpp"
 
 #define BOOST_TEST_MODULE Elastic Search Database Tests
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 using namespace graphene::chain;
 using namespace graphene::chain::test;

tests/intense/main.cpp

@@ -23,7 +23,7 @@
  */
 #include <cstdlib>
 #include <iostream>
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
    std::srand(time(NULL));

tests/peerplays_sidechain/peerplays_sidechain_tests.cpp

@@ -1,17 +1,2 @@
-#include <boost/test/unit_test.hpp>
-
 #define BOOST_TEST_MODULE Peerplays SON Tests
-
+#include <boost/test/unit_test.hpp>
-BOOST_AUTO_TEST_CASE(peerplays_sidechain) {
-}
-
-#include <boost/test/included/unit_test.hpp>
-#include <cstdlib>
-#include <iostream>
-
-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;
-}

tests/performance/performance_tests.cpp

@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE( transfer_benchmark )
 //#define BOOST_TEST_MODULE "C++ Unit Tests for Graphene Blockchain Database"
 #include <cstdlib>
 #include <iostream>
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
    std::srand(time(NULL));

tests/random/random_tests.cpp

@@ -134,7 +134,7 @@ BOOST_AUTO_TEST_SUITE_END()
 //#define BOOST_TEST_MODULE "C++ Unit Tests for Graphene Blockchain Database"
 #include <cstdlib>
 #include <iostream>
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
     for (int i=1; i<argc; i++)

tests/tests/init_tests.cpp

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2019 PBSA, 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.
+ */
+
+#define BOOST_TEST_MODULE "Chain Tests"
+#include <boost/test/unit_test.hpp>

tests/tournament/tournament_tests.cpp

@@ -2260,7 +2260,7 @@ BOOST_AUTO_TEST_SUITE_END()
 //#define BOOST_TEST_MODULE "C++ Unit Tests for Graphene Blockchain Database"
 #include <cstdlib>
 #include <iostream>
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 boost::unit_test::test_suite* init_unit_test_suite(int argc, char* argv[]) {
     std::srand(time(NULL));