summaryrefslogtreecommitdiff
path: root/src/mongo/db/s
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/s')
-rw-r--r--src/mongo/db/s/config/initial_split_policy_test.cpp1
-rw-r--r--src/mongo/db/s/config/sharding_catalog_manager_enable_sharding_test.cpp2
-rw-r--r--src/mongo/db/s/config/sharding_catalog_manager_merge_chunks_test.cpp4
-rw-r--r--src/mongo/db/s/config/sharding_catalog_manager_split_chunk_test.cpp4
4 files changed, 5 insertions, 6 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 e5eb9cef1fa..45447ecd729 100644
--- a/src/mongo/db/s/config/initial_split_policy_test.cpp
+++ b/src/mongo/db/s/config/initial_split_policy_test.cpp
@@ -34,7 +34,6 @@
#include "mongo/db/s/config/initial_split_policy.h"
#include "mongo/s/catalog/type_shard.h"
#include "mongo/s/catalog/type_tags.h"
-#include "mongo/s/config_server_test_fixture.h"
#include "mongo/unittest/unittest.h"
#include "mongo/util/log.h"
diff --git a/src/mongo/db/s/config/sharding_catalog_manager_enable_sharding_test.cpp b/src/mongo/db/s/config/sharding_catalog_manager_enable_sharding_test.cpp
index 24fb6a641e6..2dbc596b801 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager_enable_sharding_test.cpp
+++ b/src/mongo/db/s/config/sharding_catalog_manager_enable_sharding_test.cpp
@@ -63,7 +63,7 @@ namespace {
using executor::RemoteCommandRequest;
using std::vector;
-class EnableShardingTest : public ConfigServerTestFixture {};
+using EnableShardingTest = ConfigServerTestFixture;
TEST_F(EnableShardingTest, noDBExists) {
ShardType shard;
diff --git a/src/mongo/db/s/config/sharding_catalog_manager_merge_chunks_test.cpp b/src/mongo/db/s/config/sharding_catalog_manager_merge_chunks_test.cpp
index 1970c263a60..b403eca6f7a 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager_merge_chunks_test.cpp
+++ b/src/mongo/db/s/config/sharding_catalog_manager_merge_chunks_test.cpp
@@ -39,10 +39,10 @@
namespace mongo {
namespace {
-using MergeChunkTest = ConfigServerTestFixture;
-
const NamespaceString kNamespace("TestDB.TestColl");
+using MergeChunkTest = ConfigServerTestFixture;
+
TEST_F(MergeChunkTest, MergeExistingChunksCorrectlyShouldSucceed) {
ChunkType chunk;
chunk.setNS(kNamespace);
diff --git a/src/mongo/db/s/config/sharding_catalog_manager_split_chunk_test.cpp b/src/mongo/db/s/config/sharding_catalog_manager_split_chunk_test.cpp
index 5d026d949dd..63095d20d45 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager_split_chunk_test.cpp
+++ b/src/mongo/db/s/config/sharding_catalog_manager_split_chunk_test.cpp
@@ -38,10 +38,10 @@
namespace mongo {
namespace {
-using SplitChunkTest = ConfigServerTestFixture;
-
const NamespaceString kNamespace("TestDB", "TestColl");
+using SplitChunkTest = ConfigServerTestFixture;
+
TEST_F(SplitChunkTest, SplitExistingChunkCorrectlyShouldSucceed) {
ChunkType chunk;
chunk.setNS(kNamespace);