diff options
| author | Jennifer Peshansky <jennifer.peshansky@mongodb.com> | 2022-11-03 16:13:20 +0000 |
|---|---|---|
| committer | Jennifer Peshansky <jennifer.peshansky@mongodb.com> | 2022-11-03 16:13:20 +0000 |
| commit | e74d2910bbe76790ad131d53fee277829cd95982 (patch) | |
| tree | cabe148764529c9623652374fbc36323a550cd44 /src/mongo/db/catalog/create_collection_test.cpp | |
| parent | 280145e9940729480bb8a35453d4056afac87641 (diff) | |
| parent | ba467f46cc1bc49965e1d72b541eff0cf1d7b22e (diff) | |
| download | mongo-e74d2910bbe76790ad131d53fee277829cd95982.tar.gz | |
Merge branch 'master' into jenniferpeshansky/SERVER-70854jenniferpeshansky/SERVER-70854
Diffstat (limited to 'src/mongo/db/catalog/create_collection_test.cpp')
| -rw-r--r-- | src/mongo/db/catalog/create_collection_test.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mongo/db/catalog/create_collection_test.cpp b/src/mongo/db/catalog/create_collection_test.cpp index 73c724585f3..97d1384f40f 100644 --- a/src/mongo/db/catalog/create_collection_test.cpp +++ b/src/mongo/db/catalog/create_collection_test.cpp @@ -324,10 +324,8 @@ TEST_F(CreateCollectionTest, ValidationDisabledForTemporaryReshardingCollection) ASSERT_OK(status); } -static const std::string kValidUrl1 = - ExternalDataSourceMetadata::kDefaultFileUrlPrefix + "named_pipe1"; -static const std::string kValidUrl2 = - ExternalDataSourceMetadata::kDefaultFileUrlPrefix + "named_pipe2"; +const auto kValidUrl1 = ExternalDataSourceMetadata::kUrlProtocolFile + "named_pipe1"s; +const auto kValidUrl2 = ExternalDataSourceMetadata::kUrlProtocolFile + "named_pipe2"s; TEST_F(CreateVirtualCollectionTest, VirtualCollectionOptionsWithOneSource) { NamespaceString vcollNss("myDb", "vcoll.name"); @@ -344,8 +342,7 @@ TEST_F(CreateVirtualCollectionTest, VirtualCollectionOptionsWithOneSource) { auto vcollOpts = getVirtualCollectionOptions(opCtx.get(), vcollNss); ASSERT_EQ(vcollOpts.dataSources.size(), 1); - ASSERT_EQ(ExternalDataSourceMetadata::kUrlProtocolFile + vcollOpts.dataSources[0].url, - kValidUrl1); + ASSERT_EQ(vcollOpts.dataSources[0].url, kValidUrl1); ASSERT_EQ(stdx::to_underlying(vcollOpts.dataSources[0].storageType), stdx::to_underlying(StorageTypeEnum::pipe)); ASSERT_EQ(stdx::to_underlying(vcollOpts.dataSources[0].fileType), @@ -389,7 +386,7 @@ TEST_F(CreateVirtualCollectionTest, InvalidVirtualCollectionOptions) { { bool exceptionOccurred = false; VirtualCollectionOptions reqVcollOpts; - constexpr auto kInvalidUrl = "file:///abc/named_pipe"; + constexpr auto kInvalidUrl = "fff://abc/named_pipe"_sd; try { reqVcollOpts.dataSources.emplace_back( kInvalidUrl, StorageTypeEnum::pipe, FileTypeEnum::bson); |