Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Fix tests better

Browse source 
The solution being used for initializing the boost test modules is
now deprecated, so update it to use the global test fixture instead
This commit is contained in:
Nathan Hourt 2021-03-05 12:05:11 -06:00 committed by Michel Santos
parent 8a6bae6006
commit 906ffa6351
7 changed files with 75 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
tests/betting/betting_tests.cpp
View file

@ -2860,21 +2860,14 @@ BOOST_AUTO_TEST_CASE( wimbledon_2017_gentelmen_singles_final_test )
BOOST_AUTO_TEST_SUITE_END()
struct GlobalInitializationFixture {
GlobalInitializationFixture() {
std::srand(time(NULL));
std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
//#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() + 15) / GRAPHENE_DEFAULT_BLOCK_INTERVAL * GRAPHENE_DEFAULT_BLOCK_INTERVAL;
return nullptr;
}
// betting operations don't take effect until HARDFORK 1000
GRAPHENE_TESTING_GENESIS_TIMESTAMP = HARDFORK_1000_TIME.sec_since_epoch() + 2;
}
};
BOOST_TEST_GLOBAL_FIXTURE(GlobalInitializationFixture);

22
tests/intense/main.cpp
View file

@ -21,12 +21,18 @@
* 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>
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;
}
#define BOOST_TEST_MODULE Intense Tests
#include <boost/test/unit_test.hpp>
#include <cstdlib>
struct GlobalInitializationFixture {
GlobalInitializationFixture() {
std::srand(time(NULL));
std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
}
};
BOOST_TEST_GLOBAL_FIXTURE(GlobalInitializationFixture);

16
tests/peerplays_sidechain/peerplays_sidechain_tests.cpp
View file

@ -5,13 +5,11 @@
BOOST_AUTO_TEST_CASE(peerplays_sidechain) {
}
#include <boost/test/included/unit_test.hpp>
#include <cstdlib>
#include <iostream>
struct GlobalInitializationFixture {
GlobalInitializationFixture() {
std::srand(time(NULL));
std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
}
};
BOOST_TEST_GLOBAL_FIXTURE(GlobalInitializationFixture);
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;
}

16
tests/performance/performance_tests.cpp
View file

@ -74,13 +74,11 @@ BOOST_AUTO_TEST_CASE( transfer_benchmark )
//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>
struct GlobalInitializationFixture {
GlobalInitializationFixture() {
std::srand(time(NULL));
std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
}
};
BOOST_TEST_GLOBAL_FIXTURE(GlobalInitializationFixture);
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;
}

40
tests/random/random_tests.cpp
View file

@ -134,24 +134,24 @@ BOOST_FIXTURE_TEST_CASE( basic, database_fixture )
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[]) {
for (int i=1; i<argc; i++)
{
const std::string arg = argv[i];
std::cout << "#" << i << " " << arg << std::endl;
if(arg == "-R")
test_standard_rand = true;
else if(arg == "-A")
all_tests = true;
struct GlobalInitializationFixture {
GlobalInitializationFixture() {
auto argc = boost::unit_test::framework::master_test_suite().argc;
auto argv = boost::unit_test::framework::master_test_suite().argv;
for (int i=1; i<argc; i++)
{
const std::string arg = argv[i];
std::cout << "#" << i << " " << arg << std::endl;
if(arg == "-R")
test_standard_rand = true;
else if(arg == "-A")
all_tests = true;
}
std::srand(time(NULL));
std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
if (signal(SIGPIPE, sig_handler) == SIG_ERR)
std::cout << "Can't catch SIGPIPE signal!" << std::endl;
}
std::srand(time(NULL));
std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
if (signal(SIGPIPE, sig_handler) == SIG_ERR)
std::cout << "Can't catch SIGPIPE signal!" << std::endl;
return nullptr;
}
};
BOOST_TEST_GLOBAL_FIXTURE(GlobalInitializationFixture);

22
tests/tests/main.cpp
View file

@ -21,20 +21,20 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#define BOOST_TEST_MODULE Tests
#include <cstdlib>
#include <iostream>
#include <boost/test/included/unit_test.hpp>
extern uint32_t GRAPHENE_TESTING_GENESIS_TIMESTAMP;
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;
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;
}
struct GlobalInitializationFixture {
GlobalInitializationFixture() {
std::srand(time(NULL));
std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
}
};
BOOST_TEST_GLOBAL_FIXTURE(GlobalInitializationFixture);

16
tests/tournament/tournament_tests.cpp
View file

@ -2259,13 +2259,11 @@ BOOST_FIXTURE_TEST_CASE( massive, database_fixture )
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>
struct GlobalInitializationFixture {
GlobalInitializationFixture() {
std::srand(time(NULL));
std::cout << "Random number generator seeded to " << time(NULL) << std::endl;
}
};
BOOST_TEST_GLOBAL_FIXTURE(GlobalInitializationFixture);
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;
}