CSHARP-4421: Unify all spec tests in single test project (#977)

BorisDog · web-flow · commit baffee03fd9f · 2022-12-08T11:14:09.000-08:00
diff --git a/tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj b/tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj
@@ -45,12 +45,6 @@
     <ProjectReference Include="..\MongoDB.Bson.TestHelpers\MongoDB.Bson.TestHelpers.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource LinkBase="Specifications\bson-corpus" Include="..\..\specifications\bson-corpus\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\bson-decimal128" Include="..\..\specifications\bson-decimal128\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\uuid" Include="..\..\specifications\uuid\**\*.json" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="xunit.runner.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/tests/MongoDB.Driver.Core.TestHelpers/MockClusterableServerFactory.cs b/tests/MongoDB.Driver.Core.TestHelpers/MockClusterableServerFactory.cs
@@ -29,7 +29,7 @@
 using MongoDB.Driver.Core.Servers;
 using Moq;
 
-namespace MongoDB.Driver.Core.Helpers
+namespace MongoDB.Driver.Core.TestHelpers
 {
     public class MockClusterableServerFactory : IClusterableServerFactory
     {
diff --git a/tests/MongoDB.Driver.Core.TestHelpers/MockConnection.cs b/tests/MongoDB.Driver.Core.TestHelpers/MockConnection.cs
@@ -27,7 +27,7 @@
 using MongoDB.Driver.Core.WireProtocol.Messages;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
 
-namespace MongoDB.Driver.Core.Helpers
+namespace MongoDB.Driver.Core.TestHelpers
 {
     public class MockConnection : IConnection
     {
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoAWSAuthenticatorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoAWSAuthenticatorTests.cs
@@ -27,6 +27,7 @@
 using MongoDB.Driver.Core.Helpers;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.Servers;
+using MongoDB.Driver.Core.TestHelpers;
 using Moq;
 using Xunit;
 
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoDBCRAuthenticatorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoDBCRAuthenticatorTests.cs
@@ -18,14 +18,15 @@
 using System.Threading;
 using FluentAssertions;
 using MongoDB.Bson;
+using MongoDB.Bson.TestHelpers.XunitExtensions;
 using MongoDB.Driver.Core.Clusters;
-using MongoDB.Driver.Core.Servers;
+using MongoDB.Driver.Core.Connections;
 using MongoDB.Driver.Core.Helpers;
+using MongoDB.Driver.Core.Misc;
+using MongoDB.Driver.Core.Servers;
+using MongoDB.Driver.Core.TestHelpers;
 using MongoDB.Driver.Core.WireProtocol.Messages;
 using Xunit;
-using MongoDB.Driver.Core.Connections;
-using MongoDB.Bson.TestHelpers.XunitExtensions;
-using MongoDB.Driver.Core.Misc;
 
 namespace MongoDB.Driver.Core.Authentication
 {
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoDBX509AuthenticatorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoDBX509AuthenticatorTests.cs
@@ -18,14 +18,15 @@
 using System.Threading;
 using FluentAssertions;
 using MongoDB.Bson;
+using MongoDB.Bson.TestHelpers.XunitExtensions;
 using MongoDB.Driver.Core.Clusters;
-using MongoDB.Driver.Core.Servers;
-using MongoDB.Driver.Core.Helpers;
-using Xunit;
 using MongoDB.Driver.Core.Connections;
-using MongoDB.Bson.TestHelpers.XunitExtensions;
+using MongoDB.Driver.Core.Helpers;
 using MongoDB.Driver.Core.Misc;
+using MongoDB.Driver.Core.Servers;
+using MongoDB.Driver.Core.TestHelpers;
 using MongoDB.Driver.Core.WireProtocol.Messages;
+using Xunit;
 
 namespace MongoDB.Driver.Core.Authentication
 {
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/PlainAuthenticatorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/PlainAuthenticatorTests.cs
@@ -18,14 +18,15 @@
 using System.Threading;
 using FluentAssertions;
 using MongoDB.Bson;
+using MongoDB.Bson.TestHelpers.XunitExtensions;
 using MongoDB.Driver.Core.Clusters;
-using MongoDB.Driver.Core.Servers;
+using MongoDB.Driver.Core.Connections;
 using MongoDB.Driver.Core.Helpers;
+using MongoDB.Driver.Core.Misc;
+using MongoDB.Driver.Core.Servers;
+using MongoDB.Driver.Core.TestHelpers;
 using MongoDB.Driver.Core.WireProtocol.Messages;
 using Xunit;
-using MongoDB.Driver.Core.Connections;
-using MongoDB.Bson.TestHelpers.XunitExtensions;
-using MongoDB.Driver.Core.Misc;
 
 namespace MongoDB.Driver.Core.Authentication
 {
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/LoadBalancedClusterTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/LoadBalancedClusterTests.cs
@@ -24,9 +24,9 @@
 using MongoDB.Driver.Core.Clusters.ServerSelectors;
 using MongoDB.Driver.Core.Configuration;
 using MongoDB.Driver.Core.Events;
-using MongoDB.Driver.Core.Helpers;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.Servers;
+using MongoDB.Driver.Core.TestHelpers;
 using MongoDB.Driver.Core.TestHelpers.Logging;
 using Moq;
 using Xunit;
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/MultiServerClusterTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/MultiServerClusterTests.cs
@@ -24,9 +24,9 @@
 using MongoDB.Bson.TestHelpers;
 using MongoDB.Driver.Core.Configuration;
 using MongoDB.Driver.Core.Events;
-using MongoDB.Driver.Core.Helpers;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.Servers;
+using MongoDB.Driver.Core.TestHelpers;
 using MongoDB.Driver.Core.TestHelpers.Logging;
 using MongoDB.Driver.Core.Tests.Core.Clusters;
 using Moq;
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/SingleServerClusterTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/SingleServerClusterTests.cs
@@ -20,8 +20,8 @@
 using MongoDB.Bson.TestHelpers.XunitExtensions;
 using MongoDB.Driver.Core.Configuration;
 using MongoDB.Driver.Core.Events;
-using MongoDB.Driver.Core.Helpers;
 using MongoDB.Driver.Core.Servers;
+using MongoDB.Driver.Core.TestHelpers;
 using MongoDB.Driver.Core.TestHelpers.Logging;
 using Moq;
 using Xunit;
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/ConnectionPools/ExclusiveConnectionPoolTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/ConnectionPools/ExclusiveConnectionPoolTests.cs
@@ -27,10 +27,10 @@
 using MongoDB.Driver.Core.Configuration;
 using MongoDB.Driver.Core.Connections;
 using MongoDB.Driver.Core.Events;
-using MongoDB.Driver.Core.Helpers;
 using MongoDB.Driver.Core.Logging;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.Servers;
+using MongoDB.Driver.Core.TestHelpers;
 using MongoDB.Driver.Core.TestHelpers.Logging;
 using Moq;
 using Xunit;
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/ConnectionPools/MaintenanceHelperTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/ConnectionPools/MaintenanceHelperTests.cs
@@ -29,6 +29,7 @@
 using MongoDB.Driver.Core.Helpers;
 using MongoDB.Driver.Core.Logging;
 using MongoDB.Driver.Core.Servers;
+using MongoDB.Driver.Core.TestHelpers;
 using Moq;
 using Xunit;
 
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Connections/ConnectionInitializerTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Connections/ConnectionInitializerTests.cs
@@ -20,17 +20,18 @@
 using FluentAssertions;
 using MongoDB.Bson;
 using MongoDB.Bson.TestHelpers;
-using MongoDB.Driver.Core.Clusters;
-using MongoDB.Driver.Core.Misc;
-using MongoDB.Driver.Core.Servers;
-using MongoDB.Driver.Core.Helpers;
-using Xunit;
 using MongoDB.Bson.TestHelpers.XunitExtensions;
 using MongoDB.Driver.Core.Authentication;
+using MongoDB.Driver.Core.Clusters;
 using MongoDB.Driver.Core.Compression;
 using MongoDB.Driver.Core.Configuration;
+using MongoDB.Driver.Core.Helpers;
+using MongoDB.Driver.Core.Misc;
+using MongoDB.Driver.Core.Servers;
+using MongoDB.Driver.Core.TestHelpers;
 using MongoDB.Driver.Core.WireProtocol.Messages;
 using Moq;
+using Xunit;
 
 namespace MongoDB.Driver.Core.Connections
 {
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Servers/LoadBalancedServerTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Servers/LoadBalancedServerTests.cs
@@ -32,7 +32,6 @@
 using MongoDB.Driver.Core.Logging;
 using MongoDB.Driver.Core.TestHelpers;
 using MongoDB.Driver.Core.TestHelpers.Logging;
-using MongoDB.Driver.Specifications.connection_monitoring_and_pooling;
 using Moq;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Servers/RoundTripTimeMonitorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Servers/RoundTripTimeMonitorTests.cs
@@ -27,6 +27,7 @@
 using MongoDB.Driver.Core.Helpers;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.Servers;
+using MongoDB.Driver.Core.TestHelpers;
 using MongoDB.Driver.Core.WireProtocol.Messages;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
 using Moq;
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/CommandWriteProtocolTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/CommandWriteProtocolTests.cs
@@ -31,6 +31,7 @@
 using MongoDB.Driver.Core.Helpers;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.Servers;
+using MongoDB.Driver.Core.TestHelpers;
 using MongoDB.Driver.Core.WireProtocol.Messages;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
 using Moq;
diff --git a/tests/MongoDB.Driver.Core.Tests/MongoDB.Driver.Core.Tests.csproj b/tests/MongoDB.Driver.Core.Tests/MongoDB.Driver.Core.Tests.csproj
@@ -40,17 +40,6 @@
     <ProjectReference Include="..\MongoDB.Driver.Core.TestHelpers\MongoDB.Driver.Core.TestHelpers.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource LinkBase="Specifications\connection-monitoring-and-pooling\tests\cmap-format" Include="..\..\specifications\connection-monitoring-and-pooling\tests\cmap-format\*.json" />
-    <EmbeddedResource LinkBase="Specifications\connection-string" Include="..\..\specifications\connection-string\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\initial-dns-seedlist-discovery" Include="..\..\specifications\initial-dns-seedlist-discovery\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\max-staleness" Include="..\..\specifications\max-staleness\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\read-write-concern" Include="..\..\specifications\read-write-concern\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\server-discovery-and-monitoring" Include="..\..\specifications\server-discovery-and-monitoring\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\server-selection" Include="..\..\specifications\server-selection\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\uri-options" Include="..\..\specifications\uri-options\**\*.json" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="xunit.runner.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj b/tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj
@@ -44,24 +44,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource LinkBase="Specifications\atlas-data-lake-testing" Include="..\..\specifications\atlas-data-lake-testing\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\auth" Include="..\..\specifications\auth\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\change-streams" Include="..\..\specifications\change-streams\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\client-side-encryption" Include="..\..\specifications\client-side-encryption\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\collection-management" Include="..\..\specifications\collection-management\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\command-logging-and-monitoring" Include="..\..\specifications\command-logging-and-monitoring\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\connection-monitoring-and-pooling\tests\logging" Include="..\..\specifications\connection-monitoring-and-pooling\tests\logging\*.json" />
-    <EmbeddedResource LinkBase="Specifications\crud" Include="..\..\specifications\crud\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\load-balancers" Include="..\..\specifications\load-balancers\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\read-write-concern" Include="..\..\specifications\read-write-concern\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\retryable-reads" Include="..\..\specifications\retryable-reads\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\retryable-writes" Include="..\..\specifications\retryable-writes\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\server-discovery-and-monitoring" Include="..\..\specifications\server-discovery-and-monitoring\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\sessions" Include="..\..\specifications\sessions\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\transactions" Include="..\..\specifications\transactions\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\transactions-convenient-api" Include="..\..\specifications\transactions-convenient-api\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\unified-test-format" Include="..\..\specifications\unified-test-format\**\*.json" />
-    <EmbeddedResource LinkBase="Specifications\versioned-api" Include="..\..\specifications\versioned-api\**\*.json" />
+    <EmbeddedResource LinkBase="Specifications\" Include="..\..\specifications\**\*.json" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/MongoDB.Driver.Tests/Specifications/bson-corpus/BsonCorpusTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/bson-corpus/BsonCorpusTestRunner.cs
@@ -19,13 +19,14 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using FluentAssertions;
+using MongoDB.Bson;
 using MongoDB.Bson.IO;
 using MongoDB.Bson.Serialization;
 using MongoDB.Bson.Serialization.Serializers;
 using MongoDB.Bson.TestHelpers.JsonDrivenTests;
 using Xunit;
 
-namespace MongoDB.Bson.Tests.Specifications.bson_corpus
+namespace MongoDB.Driver.Tests.Specifications.bson_corpus
 {
     public class BsonCorpusTestRunner
     {
@@ -300,7 +301,7 @@ private class TestCaseFactory : JsonDrivenTestCaseFactory
             #endregion
 
             // protected properties
-            protected override string PathPrefix => "MongoDB.Bson.Tests.Specifications.bson_corpus.tests.";
+            protected override string PathPrefix => "MongoDB.Driver.Tests.Specifications.bson_corpus.tests.";
 
             // protected methods
             protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)
diff --git a/tests/MongoDB.Driver.Tests/Specifications/bson-decimal128/TestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/bson-decimal128/TestRunner.cs
@@ -19,12 +19,13 @@
 using System.Linq;
 using System.Reflection;
 using FluentAssertions;
+using MongoDB.Bson;
 using MongoDB.Bson.IO;
 using MongoDB.Bson.Serialization;
 using MongoDB.Bson.Serialization.Serializers;
 using Xunit;
 
-namespace MongoDB.Bson.Specifications.bson_decimal128
+namespace MongoDB.Driver.Tests.Specifications.bson_decimal128
 {
     public class TestRunner
     {
@@ -158,7 +159,7 @@ private class TestCaseFactory : IEnumerable<object[]>
         {
             public IEnumerator<object[]> GetEnumerator()
             {
-                const string prefix = "MongoDB.Bson.Tests.Specifications.bson_decimal128.tests.";
+                const string prefix = "MongoDB.Driver.Tests.Specifications.bson_decimal128.tests.";
                 var executingAssembly = typeof(TestCaseFactory).GetTypeInfo().Assembly;
                 var enumerable = executingAssembly
                     .GetManifestResourceNames()
diff --git a/tests/MongoDB.Driver.Tests/Specifications/connection-monitoring-and-pooling/ConnectionMonitoringAndPoolingTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/connection-monitoring-and-pooling/ConnectionMonitoringAndPoolingTestRunner.cs
@@ -33,7 +33,6 @@
 using MongoDB.Driver.Core.ConnectionPools;
 using MongoDB.Driver.Core.Connections;
 using MongoDB.Driver.Core.Events;
-using MongoDB.Driver.Core.Helpers;
 using MongoDB.Driver.Core.Logging;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.Servers;
@@ -42,7 +41,7 @@
 using Moq;
 using Xunit;
 
-namespace MongoDB.Driver.Specifications.connection_monitoring_and_pooling
+namespace MongoDB.Driver.Tests.Specifications.connection_monitoring_and_pooling
 {
     [Trait("Category", "Pool")]
     public class ConnectionMonitoringAndPoolingTestRunner
@@ -810,7 +809,7 @@ private void WaitForThread(BsonDocument operation, ConcurrentDictionary<string,
         // nested types
         private class TestCaseFactory : JsonDrivenTestCaseFactory
         {
-            protected override string PathPrefix => "MongoDB.Driver.Core.Tests.Specifications.connection_monitoring_and_pooling.tests.cmap_format.";
+            protected override string PathPrefix => "MongoDB.Driver.Tests.Specifications.connection_monitoring_and_pooling.tests.cmap_format.";
 
             protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)
             {
diff --git a/tests/MongoDB.Driver.Tests/Specifications/connection-string/ConnectionStringTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/connection-string/ConnectionStringTestRunner.cs
@@ -28,7 +28,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace MongoDB.Driver.Specifications.connection_string
+namespace MongoDB.Driver.Tests.Specifications.connection_string
 {
     public class ConnectionStringTestRunner : LoggableTestClass
     {
@@ -411,8 +411,8 @@ private class TestCaseFactory : JsonDrivenTestCaseFactory
             protected override string[] PathPrefixes =>
                 new[]
                 {
-                    "MongoDB.Driver.Core.Tests.Specifications.connection_string.tests.",
-                    "MongoDB.Driver.Core.Tests.Specifications.uri_options.tests."
+                    "MongoDB.Driver.Tests.Specifications.connection_string.tests.",
+                    "MongoDB.Driver.Tests.Specifications.uri_options.tests."
                 };
 
             protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)
diff --git a/tests/MongoDB.Driver.Tests/Specifications/initial-dns-seedlist-discovery/InitialDnsSeedlistDiscoveryTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/initial-dns-seedlist-discovery/InitialDnsSeedlistDiscoveryTestRunner.cs
@@ -28,7 +28,7 @@
 using System.Threading.Tasks;
 using Xunit.Abstractions;
 
-namespace MongoDB.Driver.Specifications.initial_dns_seedlist_discovery
+namespace MongoDB.Driver.Tests.Specifications.initial_dns_seedlist_discovery
 {
     [Trait("Category", "ConnectionString")]
     [Trait("Category", "SupportLoadBalancing")]
@@ -166,7 +166,7 @@ private class TestCaseFactory : IEnumerable<object[]>
         {
             public IEnumerator<object[]> GetEnumerator()
             {
-                const string prefix = "MongoDB.Driver.Core.Tests.Specifications.initial_dns_seedlist_discovery.tests.";
+                const string prefix = "MongoDB.Driver.Tests.Specifications.initial_dns_seedlist_discovery.tests.";
                 var executingAssembly = typeof(TestCaseFactory).GetTypeInfo().Assembly;
                 return executingAssembly
                     .GetManifestResourceNames()
diff --git a/tests/MongoDB.Driver.Tests/Specifications/read-write-concern/ConnectionStringTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/read-write-concern/ConnectionStringTestRunner.cs
@@ -16,12 +16,12 @@
 using System;
 using FluentAssertions;
 using MongoDB.Bson;
+using MongoDB.Bson.TestHelpers.JsonDrivenTests;
+using MongoDB.Bson.TestHelpers.XunitExtensions;
 using MongoDB.Driver.Core.Configuration;
 using Xunit;
-using MongoDB.Bson.TestHelpers.XunitExtensions;
-using MongoDB.Bson.TestHelpers.JsonDrivenTests;
 
-namespace MongoDB.Driver.Specifications.read_write_concern.tests
+namespace MongoDB.Driver.Tests.Specifications.read_write_concern.tests
 {
     public class ConnectionStringTestRunner
     {
@@ -109,7 +109,7 @@ private BsonDocument MassageWriteConcernDocument(BsonDocument writeConcern)
 
         private class TestCaseFactory : JsonDrivenTestCaseFactory
         {
-            protected override string PathPrefix => "MongoDB.Driver.Core.Tests.Specifications.read_write_concern.tests.connection_string.";
+            protected override string PathPrefix => "MongoDB.Driver.Tests.Specifications.read_write_concern.tests.connection_string.";
         }
     }
 }
diff --git a/tests/MongoDB.Driver.Tests/Specifications/read-write-concern/DocumentTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/read-write-concern/DocumentTestRunner.cs
@@ -20,7 +20,7 @@
 using MongoDB.Bson.TestHelpers.XunitExtensions;
 using MongoDB.Bson.TestHelpers.JsonDrivenTests;
 
-namespace MongoDB.Driver.Specifications.read_write_concern.tests
+namespace MongoDB.Driver.Tests.Specifications.read_write_concern.tests
 {
     public class DocumentTestRunner
     {
@@ -135,7 +135,7 @@ private BsonDocument MassageWriteConcernDocument(BsonDocument writeConcern)
 
         private class TestCaseFactory : JsonDrivenTestCaseFactory
         {
-            protected override string PathPrefix => "MongoDB.Driver.Core.Tests.Specifications.read_write_concern.tests.document.";
+            protected override string PathPrefix => "MongoDB.Driver.Tests.Specifications.read_write_concern.tests.document.";
         }
     }
 }
diff --git a/tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/MonitoringTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/MonitoringTestRunner.cs
diff --git a/tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/ServerDiscoveryAndMonitoringProseTests.cs b/tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/ServerDiscoveryAndMonitoringProseTests.cs
diff --git a/tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/ServerDiscoveryAndMonitoringTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/ServerDiscoveryAndMonitoringTestRunner.cs
diff --git a/tests/MongoDB.Driver.Tests/Specifications/server-selection/InWindowTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/server-selection/InWindowTestRunner.cs
diff --git a/tests/MongoDB.Driver.Tests/Specifications/server-selection/RttTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/server-selection/RttTestRunner.cs
diff --git a/tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestHelpers.cs b/tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestHelpers.cs
diff --git a/tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestRunner.cs
diff --git a/tests/MongoDB.Driver.Tests/Specifications/uuid/prose-tests/ExplicitDecodingTests.cs b/tests/MongoDB.Driver.Tests/Specifications/uuid/prose-tests/ExplicitDecodingTests.cs
diff --git a/tests/MongoDB.Driver.Tests/Specifications/uuid/prose-tests/ExplicitEncodingTests.cs b/tests/MongoDB.Driver.Tests/Specifications/uuid/prose-tests/ExplicitEncodingTests.cs

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`using MongoDB.Driver.Core.Servers;`
`30`	`30`	`using Moq;`
`31`	`31`
`32`		`-namespace MongoDB.Driver.Core.Helpers`
	`32`	`+namespace MongoDB.Driver.Core.TestHelpers`
`33`	`33`	`{`
`34`	`34`	`public class MockClusterableServerFactory : IClusterableServerFactory`
`35`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`using MongoDB.Driver.Core.WireProtocol.Messages;`
`28`	`28`	`using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;`
`29`	`29`
`30`		`-namespace MongoDB.Driver.Core.Helpers`
	`30`	`+namespace MongoDB.Driver.Core.TestHelpers`
`31`	`31`	`{`
`32`	`32`	`public class MockConnection : IConnection`
`33`	`33`	`{`