diff options
author | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2019-06-21 14:32:05 +0000 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2019-06-25 11:08:43 +0000 |
commit | 0ec1dddb0e75c235edfc68d72f4471ad186c3399 (patch) | |
tree | 254cdda75b06c8453a207933a8d556c1db90b997 /storage/src/tests/distributor/nodemaintenancestatstrackertest.cpp | |
parent | a0d854b6a3fab6fe44b1164c071fc994b331c3bc (diff) |
Convert remaining CppUnit tests to GTest
Move base message sender stub out to common test module to
avoid artificial dependency from persistence tests to the
distributor tests.
Diffstat (limited to 'storage/src/tests/distributor/nodemaintenancestatstrackertest.cpp')
-rw-r--r-- | storage/src/tests/distributor/nodemaintenancestatstrackertest.cpp | 77 |
1 files changed, 26 insertions, 51 deletions
diff --git a/storage/src/tests/distributor/nodemaintenancestatstrackertest.cpp b/storage/src/tests/distributor/nodemaintenancestatstrackertest.cpp index ae0d0bc4478..58593799fc4 100644 --- a/storage/src/tests/distributor/nodemaintenancestatstrackertest.cpp +++ b/storage/src/tests/distributor/nodemaintenancestatstrackertest.cpp @@ -1,100 +1,77 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/document/test/make_bucket_space.h> -#include <vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.h> -#include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/document/bucket/fixed_bucket_spaces.h> +#include <vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.h> +#include <vespa/vespalib/gtest/gtest.h> namespace storage::distributor { using document::test::makeBucketSpace; using document::BucketSpace; +using namespace ::testing; -class NodeMaintenanceStatsTrackerTest : public CppUnit::TestFixture -{ - CPPUNIT_TEST_SUITE(NodeMaintenanceStatsTrackerTest); - CPPUNIT_TEST(emptyStatsInstancesAreEqual); - CPPUNIT_TEST(statsFieldsAffectEqualityComparison); - CPPUNIT_TEST(requestingNonExistingNodeGivesEmptyStats); - CPPUNIT_TEST(statsAreTrackedPerNode); - CPPUNIT_TEST(statsAreTrackedPerBucketSpace); - CPPUNIT_TEST_SUITE_END(); - - void emptyStatsInstancesAreEqual(); - void statsFieldsAffectEqualityComparison(); - void requestingNonExistingNodeGivesEmptyStats(); - void statsAreTrackedPerNode(); - void statsAreTrackedPerBucketSpace(); +struct NodeMaintenanceStatsTrackerTest : Test { void assertEmptyBucketStats(BucketSpace bucketSpace, const NodeMaintenanceStatsTracker& tracker); void assertBucketStats(uint64_t expMovingOut, uint64_t expSyncing, uint64_t expCopyingIn, uint64_t expCopyingOut, uint64_t expTotal, BucketSpace bucketSpace, const NodeMaintenanceStatsTracker& tracker); }; -CPPUNIT_TEST_SUITE_REGISTRATION(NodeMaintenanceStatsTrackerTest); - -void -NodeMaintenanceStatsTrackerTest::emptyStatsInstancesAreEqual() -{ +TEST_F(NodeMaintenanceStatsTrackerTest, empty_stats_instances_are_equal) { NodeMaintenanceStats a; NodeMaintenanceStats b; - CPPUNIT_ASSERT_EQUAL(a, b); + EXPECT_EQ(a, b); } -void -NodeMaintenanceStatsTrackerTest::statsFieldsAffectEqualityComparison() -{ +TEST_F(NodeMaintenanceStatsTrackerTest, stats_fields_affect_equality_comparison) { NodeMaintenanceStats a; NodeMaintenanceStats b; a.movingOut = 1; - CPPUNIT_ASSERT(!(a == b)); + EXPECT_NE(a, b); b.movingOut = 1; - CPPUNIT_ASSERT(a == b); + EXPECT_EQ(a, b); a.syncing = 1; - CPPUNIT_ASSERT(!(a == b)); + EXPECT_NE(a, b); b.syncing = 1; - CPPUNIT_ASSERT(a == b); + EXPECT_EQ(a, b); a.copyingIn = 1; - CPPUNIT_ASSERT(!(a == b)); + EXPECT_NE(a, b); b.copyingIn = 1; - CPPUNIT_ASSERT(a == b); + EXPECT_EQ(a, b); a.copyingOut = 1; - CPPUNIT_ASSERT(!(a == b)); + EXPECT_NE(a, b); b.copyingOut = 1; - CPPUNIT_ASSERT(a == b); + EXPECT_EQ(a, b); } -void -NodeMaintenanceStatsTrackerTest::requestingNonExistingNodeGivesEmptyStats() -{ +TEST_F(NodeMaintenanceStatsTrackerTest, requesting_non_existing_node_gives_empty_stats) { NodeMaintenanceStatsTracker tracker; NodeMaintenanceStats wanted; - CPPUNIT_ASSERT_EQUAL(wanted, tracker.forNode(0, makeBucketSpace())); + EXPECT_EQ(wanted, tracker.forNode(0, makeBucketSpace())); } -void -NodeMaintenanceStatsTrackerTest::statsAreTrackedPerNode() -{ +TEST_F(NodeMaintenanceStatsTrackerTest, stats_are_tracked_per_node){ NodeMaintenanceStatsTracker tracker; NodeMaintenanceStats wanted; BucketSpace space(1); tracker.incMovingOut(0, space); wanted.movingOut = 1; - CPPUNIT_ASSERT_EQUAL(wanted, tracker.forNode(0, space)); + EXPECT_EQ(wanted, tracker.forNode(0, space)); wanted.movingOut = 0; - CPPUNIT_ASSERT_EQUAL(wanted, tracker.forNode(1, space)); + EXPECT_EQ(wanted, tracker.forNode(1, space)); tracker.incMovingOut(0, space); wanted.movingOut = 2; - CPPUNIT_ASSERT_EQUAL(wanted, tracker.forNode(0, space)); + EXPECT_EQ(wanted, tracker.forNode(0, space)); tracker.incMovingOut(1, space); wanted.movingOut = 1; - CPPUNIT_ASSERT_EQUAL(wanted, tracker.forNode(1, space)); + EXPECT_EQ(wanted, tracker.forNode(1, space)); tracker.incSyncing(1, space); tracker.incCopyingIn(1, space); @@ -102,12 +79,10 @@ NodeMaintenanceStatsTrackerTest::statsAreTrackedPerNode() wanted.syncing = 1; wanted.copyingIn = 1; wanted.copyingOut = 1; - CPPUNIT_ASSERT_EQUAL(wanted, tracker.forNode(1, space)); + EXPECT_EQ(wanted, tracker.forNode(1, space)); } -void -NodeMaintenanceStatsTrackerTest::statsAreTrackedPerBucketSpace() -{ +TEST_F(NodeMaintenanceStatsTrackerTest, statsAreTrackedPerBucketSpace) { NodeMaintenanceStatsTracker tracker; BucketSpace fooSpace(3); BucketSpace barSpace(5); @@ -143,7 +118,7 @@ NodeMaintenanceStatsTrackerTest::assertEmptyBucketStats(BucketSpace bucketSpace, const NodeMaintenanceStatsTracker& tracker) { NodeMaintenanceStats expStats; - CPPUNIT_ASSERT_EQUAL(expStats, tracker.forNode(0, bucketSpace)); + EXPECT_EQ(expStats, tracker.forNode(0, bucketSpace)); } void @@ -156,7 +131,7 @@ NodeMaintenanceStatsTrackerTest::assertBucketStats(uint64_t expMovingOut, const NodeMaintenanceStatsTracker& tracker) { NodeMaintenanceStats expStats(expMovingOut, expSyncing, expCopyingIn, expCopyingOut, expTotal); - CPPUNIT_ASSERT_EQUAL(expStats, tracker.forNode(0, bucketSpace)); + EXPECT_EQ(expStats, tracker.forNode(0, bucketSpace)); } } |