diff options
Diffstat (limited to 'src/mongo/db/s/config/initial_split_policy_test.cpp')
| -rw-r--r-- | src/mongo/db/s/config/initial_split_policy_test.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/mongo/db/s/config/initial_split_policy_test.cpp b/src/mongo/db/s/config/initial_split_policy_test.cpp index 2b0c9198eee..85cb8643ec8 100644 --- a/src/mongo/db/s/config/initial_split_policy_test.cpp +++ b/src/mongo/db/s/config/initial_split_policy_test.cpp @@ -42,6 +42,8 @@ namespace mongo { namespace { +using unittest::assertGet; + /** * Asserts that the given vectors of BSON objects are equal */ @@ -301,9 +303,7 @@ public: tagDocBuilder.append(TagsType::min(), range.getMin()); tagDocBuilder.append(TagsType::max(), range.getMax()); tagDocBuilder.append(TagsType::tag(), zoneName); - const auto parseStatus = TagsType::fromBSON(tagDocBuilder.obj()); - uassertStatusOK(parseStatus); - return parseStatus.getValue(); + return assertGet(TagsType::fromBSON(tagDocBuilder.obj())); } /** @@ -431,11 +431,13 @@ TEST_F(GenerateShardCollectionInitialZonedChunksTest, EmptyTagsShouldFail) { } TEST_F(GenerateShardCollectionInitialZonedChunksTest, ZoneNotAssociatedWithAnyShardShouldFail) { - const std::vector<TagsType> tags = { - makeTag(ChunkRange(keyPattern().globalMin(), BSON(shardKey() << 0)), zoneName("0")), - makeTag(ChunkRange(BSON(shardKey() << 0), keyPattern().globalMax()), zoneName("1"))}; - StringMap<std::vector<ShardId>> tagToShards = {{zoneName("0"), {ShardId("Shard0")}}, - {zoneName("1"), {}}}; + const auto zone1 = zoneName("0"); + const auto zone2 = zoneName("1"); + + const std::vector<TagsType> tags{ + makeTag(ChunkRange(keyPattern().globalMin(), BSON(shardKey() << 0)), zone1), + makeTag(ChunkRange(BSON(shardKey() << 0), keyPattern().globalMax()), zone2)}; + const StringMap<std::vector<ShardId>> tagToShards{{zone1, {ShardId("Shard0")}}, {zone2, {}}}; ASSERT_THROWS_CODE( InitialSplitPolicy::generateShardCollectionInitialZonedChunks( |