diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2020-03-30 10:46:04 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-03-30 10:46:04 +0200 |
| commit | eea2cb29dba9c3214eedb64381f665ae5174b04d (patch) | |
| tree | cd4fd9f1a145da006221827b5a53b75caf01116b /storage | |
| parent | 463b515efa427bb031e6b83047050084f94008a4 (diff) | |
Reduce code duplication in test code.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/tests/distributor/btree_bucket_database_test.cpp | 9 | ||||
| -rw-r--r-- | storage/src/tests/distributor/mapbucketdatabasetest.cpp | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/storage/src/tests/distributor/btree_bucket_database_test.cpp b/storage/src/tests/distributor/btree_bucket_database_test.cpp index fedea4d7acb..a2518272a7f 100644 --- a/storage/src/tests/distributor/btree_bucket_database_test.cpp +++ b/storage/src/tests/distributor/btree_bucket_database_test.cpp @@ -9,13 +9,8 @@ using namespace ::testing; namespace storage::distributor { -#ifdef INSTANTIATE_TEST_SUITE_P -INSTANTIATE_TEST_SUITE_P(BTreeDatabase, BucketDatabaseTest, - ::testing::Values(std::make_shared<BTreeBucketDatabase>())); -#else -INSTANTIATE_TEST_CASE_P(BTreeDatabase, BucketDatabaseTest, - ::testing::Values(std::make_shared<BTreeBucketDatabase>())); -#endif +VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(BTreeDatabase, BucketDatabaseTest, + ::testing::Values(std::make_shared<BTreeBucketDatabase>())); using document::BucketId; diff --git a/storage/src/tests/distributor/mapbucketdatabasetest.cpp b/storage/src/tests/distributor/mapbucketdatabasetest.cpp index 609db4de696..2c000f6b5db 100644 --- a/storage/src/tests/distributor/mapbucketdatabasetest.cpp +++ b/storage/src/tests/distributor/mapbucketdatabasetest.cpp @@ -5,12 +5,7 @@ namespace storage::distributor { -#ifdef INSTANTIATE_TEST_SUITE_P -INSTANTIATE_TEST_SUITE_P(MapDatabase, BucketDatabaseTest, - ::testing::Values(std::make_shared<MapBucketDatabase>())); -#else -INSTANTIATE_TEST_CASE_P(MapDatabase, BucketDatabaseTest, - ::testing::Values(std::make_shared<MapBucketDatabase>())); -#endif +VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(MapDatabase, BucketDatabaseTest, + ::testing::Values(std::make_shared<MapBucketDatabase>())); } |