CSHARP-4421: Unify all spec tests in single test project

BorisDog · BorisDog · commit 9866f18c8e99 · 2022-11-25T15:09:03.000-08:00
diff --git a/tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj b/tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj
@@ -72,12 +72,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
diff --git a/tests/MongoDB.Driver.Core.TestHelpers/MockConnection.cs b/tests/MongoDB.Driver.Core.TestHelpers/MockConnection.cs
diff --git a/tests/MongoDB.Driver.Core.TestHelpers/MongoDB.Driver.Core.TestHelpers.csproj b/tests/MongoDB.Driver.Core.TestHelpers/MongoDB.Driver.Core.TestHelpers.csproj
@@ -52,6 +52,7 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="4.12.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
+    <PackageReference Include="Moq" Version="4.9.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
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/MongoDB.Driver.Core.Tests.csproj b/tests/MongoDB.Driver.Core.Tests/MongoDB.Driver.Core.Tests.csproj
@@ -54,7 +54,6 @@
     <PackageReference Include="FluentAssertions" Version="4.12.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="Moq" Version="4.9.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
     <PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
@@ -67,17 +66,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
@@ -71,24 +71,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
@@ -42,7 +42,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 +810,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
@@ -34,7 +34,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace MongoDB.Driver.Specifications.sdam_monitoring
+namespace MongoDB.Driver.Tests.Specifications.server_discovery_and_monitoring
 {
     public class MonitoringTestRunner : LoggableTestClass
     {
@@ -365,7 +365,7 @@ private ICluster BuildCluster(BsonDocument definition)
         // nested types
         private class TestCaseFactory : JsonDrivenTestCaseFactory
         {
-            protected override string PathPrefix => "MongoDB.Driver.Core.Tests.Specifications.server_discovery_and_monitoring.tests.monitoring.";
+            protected override string PathPrefix => "MongoDB.Driver.Tests.Specifications.server_discovery_and_monitoring.tests.monitoring.";
 
             protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)
             {
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
@@ -249,14 +249,6 @@ private DisposableMongoClient CreateClient(MongoClientSettings mongoClientSettin
         }
     }
 
-    internal static class ServerReflector
-    {
-        public static IServerMonitor _monitor(this IServer server)
-        {
-            return (IServerMonitor)Reflector.GetFieldValue(server, nameof(_monitor));
-        }
-    }
-
     internal static class ServerMonitorReflector
     {
         public static IRoundTripTimeMonitor _roundTripTimeMonitor(this IServerMonitor serverMonitor)
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
@@ -15,7 +15,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading;
 using FluentAssertions;
@@ -37,7 +36,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace MongoDB.Driver.Specifications.server_discovery_and_monitoring
+namespace MongoDB.Driver.Tests.Specifications.server_discovery_and_monitoring
 {
     public class ServerDiscoveryAndMonitoringTestRunner : LoggableTestClass
     {
@@ -602,14 +601,14 @@ private class TestCaseFactory : JsonDrivenTestCaseFactory
             // private constants
             private readonly string[] MonitoringPrefixes =
             {
-                "MongoDB.Driver.Core.Tests.Specifications.server_discovery_and_monitoring.tests.monitoring.",
-                "MongoDB.Driver.Core.Tests.Specifications.server_discovery_and_monitoring.tests.legacy_hello.monitoring."
+                "MongoDB.Driver.Tests.Specifications.server_discovery_and_monitoring.tests.monitoring.",
+                "MongoDB.Driver.Tests.Specifications.server_discovery_and_monitoring.tests.legacy_hello.monitoring."
             };
 
             // Integration tests are run by ServerDiscoveryAndMonitoringIntegrationTestRunner in MongoDB.Driver.Tests
-            private const string IntegrationTestPrefix = "MongoDB.Driver.Core.Tests.Specifications.server_discovery_and_monitoring.tests.integration.";
+            private const string IntegrationTestPrefix = "MongoDB.Driver.Tests.Specifications.server_discovery_and_monitoring.tests.integration.";
 
-            protected override string PathPrefix => "MongoDB.Driver.Core.Tests.Specifications.server_discovery_and_monitoring.tests.";
+            protected override string PathPrefix => "MongoDB.Driver.Tests.Specifications.server_discovery_and_monitoring.tests.";
 
             protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)
             {
@@ -653,6 +652,11 @@ public static IConnectionPool _connectionPool(this Server server)
             return (IConnectionPool)Reflector.GetFieldValue(server, nameof(_connectionPool));
         }
 
+        public static IServerMonitor _monitor(this IServer server)
+        {
+            return (IServerMonitor)Reflector.GetFieldValue(server, nameof(_monitor));
+        }
+
         public static void HandleBeforeHandshakeCompletesException(this Server server, Exception ex)
         {
             Reflector.Invoke(server, nameof(HandleBeforeHandshakeCompletesException), ex);
diff --git a/tests/MongoDB.Driver.Tests/Specifications/server-selection/InWindowTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/server-selection/InWindowTestRunner.cs
@@ -31,7 +31,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace MongoDB.Driver.Specifications.server_selection
+namespace MongoDB.Driver.Tests.Specifications.server_selection
 {
     public sealed class InWindowTestRunner : LoggableTestClass
     {
@@ -137,7 +137,7 @@ private class TestCaseFactory : JsonDrivenTestCaseFactory
         {
             protected override string[] PathPrefixes => new[]
             {
-                "MongoDB.Driver.Core.Tests.Specifications.server_selection.tests.in_window.",
+                "MongoDB.Driver.Tests.Specifications.server_selection.tests.in_window.",
             };
 
             protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)
diff --git a/tests/MongoDB.Driver.Tests/Specifications/server-selection/RttTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/server-selection/RttTestRunner.cs
@@ -24,7 +24,7 @@
 using MongoDB.Driver.Core.Misc;
 using Xunit;
 
-namespace MongoDB.Driver.Specifications.server_selection
+namespace MongoDB.Driver.Tests.Specifications.server_selection
 {
     public class RttTestRunner
     {
@@ -51,7 +51,7 @@ private class TestCaseFactory : IEnumerable<object[]>
         {
             public IEnumerator<object[]> GetEnumerator()
             {
-                const string prefix = "MongoDB.Driver.Core.Tests.Specifications.server_selection.tests.rtt.";
+                const string prefix = "MongoDB.Driver.Tests.Specifications.server_selection.tests.rtt.";
                 var executingAssembly = typeof(TestCaseFactory).GetTypeInfo().Assembly;
                 var enumerable = executingAssembly
                     .GetManifestResourceNames()
diff --git a/tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestHelpers.cs b/tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestHelpers.cs
@@ -22,7 +22,7 @@
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.Servers;
 
-namespace MongoDB.Driver.Specifications.server_selection
+namespace MongoDB.Driver.Tests.Specifications.server_selection
 {
     internal static class ServerSelectionTestHelper
     {
diff --git a/tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestRunner.cs
@@ -25,7 +25,7 @@
 using MongoDB.Driver.Core.Servers;
 using Xunit;
 
-namespace MongoDB.Driver.Specifications.server_selection
+namespace MongoDB.Driver.Tests.Specifications.server_selection
 {
     public class ServerSelectionTestRunner
     {
@@ -150,8 +150,8 @@ private class TestCaseFactory : JsonDrivenTestCaseFactory
         {
             protected override string[] PathPrefixes => new[]
             {
-                "MongoDB.Driver.Core.Tests.Specifications.server_selection.tests.server_selection.",
-                "MongoDB.Driver.Core.Tests.Specifications.max_staleness.tests."
+                "MongoDB.Driver.Tests.Specifications.server_selection.tests.server_selection.",
+                "MongoDB.Driver.Tests.Specifications.max_staleness.tests."
             };
 
             protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)
diff --git a/tests/MongoDB.Driver.Tests/Specifications/uuid/prose-tests/ExplicitDecodingTests.cs b/tests/MongoDB.Driver.Tests/Specifications/uuid/prose-tests/ExplicitDecodingTests.cs
@@ -15,10 +15,11 @@
 
 using System;
 using FluentAssertions;
+using MongoDB.Bson;
 using MongoDB.Bson.TestHelpers;
 using Xunit;
 
-namespace MongoDB.Bson.Tests.Specifications.uuid.prose_tests
+namespace MongoDB.Driver.Tests.Specifications.uuid.prose_tests
 {
     public class ExplicitDecodingTests
     {
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
`@@ -19,12 +19,13 @@`
`19`	`19`	`using System.Linq;`
`20`	`20`	`using System.Reflection;`
`21`	`21`	`using FluentAssertions;`
	`22`	`+using MongoDB.Bson;`
`22`	`23`	`using MongoDB.Bson.IO;`
`23`	`24`	`using MongoDB.Bson.Serialization;`
`24`	`25`	`using MongoDB.Bson.Serialization.Serializers;`
`25`	`26`	`using Xunit;`
`26`	`27`
`27`		`-namespace MongoDB.Bson.Specifications.bson_decimal128`
	`28`	`+namespace MongoDB.Driver.Tests.Specifications.bson_decimal128`
`28`	`29`	`{`
`29`	`30`	`public class TestRunner`
`30`	`31`	`{`
`@@ -158,7 +159,7 @@ private class TestCaseFactory : IEnumerable<object[]>`
`158`	`159`	`{`
`159`	`160`	`public IEnumerator<object[]> GetEnumerator()`
`160`	`161`	`{`
`161`		`- const string prefix = "MongoDB.Bson.Tests.Specifications.bson_decimal128.tests.";`
	`162`	`+ const string prefix = "MongoDB.Driver.Tests.Specifications.bson_decimal128.tests.";`
`162`	`163`	`var executingAssembly = typeof(TestCaseFactory).GetTypeInfo().Assembly;`
`163`	`164`	`var enumerable = executingAssembly`
`164`	`165`	`.GetManifestResourceNames()`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`using Moq;`
`43`	`43`	`using Xunit;`
`44`	`44`
`45`		`-namespace MongoDB.Driver.Specifications.connection_monitoring_and_pooling`
	`45`	`+namespace MongoDB.Driver.Tests.Specifications.connection_monitoring_and_pooling`
`46`	`46`	`{`
`47`	`47`	`[Trait("Category", "Pool")]`
`48`	`48`	`public class ConnectionMonitoringAndPoolingTestRunner`
`@@ -810,7 +810,7 @@ private void WaitForThread(BsonDocument operation, ConcurrentDictionary<string,`
`810`	`810`	`// nested types`
`811`	`811`	`private class TestCaseFactory : JsonDrivenTestCaseFactory`
`812`	`812`	`{`
`813`		`- protected override string PathPrefix => "MongoDB.Driver.Core.Tests.Specifications.connection_monitoring_and_pooling.tests.cmap_format.";`
	`813`	`+ protected override string PathPrefix => "MongoDB.Driver.Tests.Specifications.connection_monitoring_and_pooling.tests.cmap_format.";`
`814`	`814`
`815`	`815`	`protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)`
`816`	`816`	`{`