diff --git a/tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj b/tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj index f10ae46d181..7f262a14faa 100644 --- a/tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj +++ b/tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj @@ -45,12 +45,6 @@ - - - - - - Always diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Helpers/MockClusterableServerFactory.cs b/tests/MongoDB.Driver.Core.TestHelpers/MockClusterableServerFactory.cs similarity index 99% rename from tests/MongoDB.Driver.Core.Tests/Core/Helpers/MockClusterableServerFactory.cs rename to tests/MongoDB.Driver.Core.TestHelpers/MockClusterableServerFactory.cs index 3c6f604a523..252251907cd 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Helpers/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.Tests/Core/Helpers/MockConnection.cs b/tests/MongoDB.Driver.Core.TestHelpers/MockConnection.cs similarity index 99% rename from tests/MongoDB.Driver.Core.Tests/Core/Helpers/MockConnection.cs rename to tests/MongoDB.Driver.Core.TestHelpers/MockConnection.cs index 895397da33a..b4d70359e4f 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Helpers/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 index f05a3e44af3..ff05c2d3e17 100644 --- 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 index be5015649ae..0f0c22cdd48 100644 --- 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 index 38d864cf737..3dbef36d372 100644 --- 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 index b124a5fd501..680c68ae38d 100644 --- 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 index ddc61b4ca5c..2615d08fa64 100644 --- 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 index c7f7a310d9a..32e0e2feaa4 100644 --- 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 index 60d4464870c..8a4768cfcca 100644 --- 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 index d190a4db1b8..8efb66633f9 100644 --- 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 index 8237819375c..f7480b74d29 100644 --- 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 index f95ca071cd1..2ab40463732 100644 --- 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 index 122b343e35d..81b7ed339f9 100644 --- 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 index 875fd313152..a7f051d67a6 100644 --- 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 index 7c337b286fd..e57a78f19e8 100644 --- 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 index 97beed2d159..3520a37b3d7 100644 --- 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 @@ - - - - - - - - - - - Always diff --git a/tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj b/tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj index 326a865a45f..6ec7987e80b 100644 --- a/tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj +++ b/tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj @@ -44,24 +44,7 @@ - - - - - - - - - - - - - - - - - - + diff --git a/tests/MongoDB.Bson.Tests/Specifications/bson-corpus/BsonCorpusTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/bson-corpus/BsonCorpusTestRunner.cs similarity index 98% rename from tests/MongoDB.Bson.Tests/Specifications/bson-corpus/BsonCorpusTestRunner.cs rename to tests/MongoDB.Driver.Tests/Specifications/bson-corpus/BsonCorpusTestRunner.cs index ae3e3efd8c0..b8f775d0636 100644 --- a/tests/MongoDB.Bson.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 CreateTestCases(BsonDocument document) diff --git a/tests/MongoDB.Bson.Tests/Specifications/bson-decimal128/TestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/bson-decimal128/TestRunner.cs similarity index 97% rename from tests/MongoDB.Bson.Tests/Specifications/bson-decimal128/TestRunner.cs rename to tests/MongoDB.Driver.Tests/Specifications/bson-decimal128/TestRunner.cs index 1baf847ab01..c637063f3c5 100644 --- a/tests/MongoDB.Bson.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 { public IEnumerator 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.Core.Tests/Specifications/connection-monitoring-and-pooling/ConnectionMonitoringAndPoolingTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/connection-monitoring-and-pooling/ConnectionMonitoringAndPoolingTestRunner.cs similarity index 99% rename from tests/MongoDB.Driver.Core.Tests/Specifications/connection-monitoring-and-pooling/ConnectionMonitoringAndPoolingTestRunner.cs rename to tests/MongoDB.Driver.Tests/Specifications/connection-monitoring-and-pooling/ConnectionMonitoringAndPoolingTestRunner.cs index 0a45a447b97..2ffa0181bb5 100644 --- a/tests/MongoDB.Driver.Core.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 "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 CreateTestCases(BsonDocument document) { diff --git a/tests/MongoDB.Driver.Core.Tests/Specifications/connection-string/ConnectionStringTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/connection-string/ConnectionStringTestRunner.cs similarity index 99% rename from tests/MongoDB.Driver.Core.Tests/Specifications/connection-string/ConnectionStringTestRunner.cs rename to tests/MongoDB.Driver.Tests/Specifications/connection-string/ConnectionStringTestRunner.cs index 90b8705d03d..d8b268ea095 100644 --- a/tests/MongoDB.Driver.Core.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 CreateTestCases(BsonDocument document) diff --git a/tests/MongoDB.Driver.Core.Tests/Specifications/initial-dns-seedlist-discovery/InitialDnsSeedlistDiscoveryTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/initial-dns-seedlist-discovery/InitialDnsSeedlistDiscoveryTestRunner.cs similarity index 97% rename from tests/MongoDB.Driver.Core.Tests/Specifications/initial-dns-seedlist-discovery/InitialDnsSeedlistDiscoveryTestRunner.cs rename to tests/MongoDB.Driver.Tests/Specifications/initial-dns-seedlist-discovery/InitialDnsSeedlistDiscoveryTestRunner.cs index 196bb7bcee9..13b03c6eb59 100644 --- a/tests/MongoDB.Driver.Core.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 { public IEnumerator 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.Core.Tests/Specifications/read-write-concern/ConnectionStringTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/read-write-concern/ConnectionStringTestRunner.cs similarity index 96% rename from tests/MongoDB.Driver.Core.Tests/Specifications/read-write-concern/ConnectionStringTestRunner.cs rename to tests/MongoDB.Driver.Tests/Specifications/read-write-concern/ConnectionStringTestRunner.cs index 22f5b6fdecd..84e7d93c95d 100644 --- a/tests/MongoDB.Driver.Core.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.Core.Tests/Specifications/read-write-concern/DocumentTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/read-write-concern/DocumentTestRunner.cs similarity index 97% rename from tests/MongoDB.Driver.Core.Tests/Specifications/read-write-concern/DocumentTestRunner.cs rename to tests/MongoDB.Driver.Tests/Specifications/read-write-concern/DocumentTestRunner.cs index 7b287e59df5..41ffaa01903 100644 --- a/tests/MongoDB.Driver.Core.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.Core.Tests/Specifications/server-discovery-and-monitoring/MonitoringTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/MonitoringTestRunner.cs similarity index 98% rename from tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/MonitoringTestRunner.cs rename to tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/MonitoringTestRunner.cs index ddd4c010f22..0ce668d3014 100644 --- a/tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/MonitoringTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/MonitoringTestRunner.cs @@ -27,14 +27,14 @@ using MongoDB.Driver.Core.Configuration; using MongoDB.Driver.Core.Connections; 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 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 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 index f54b6e571ba..eab2d3a3fad 100644 --- 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.Core.Tests/Specifications/server-discovery-and-monitoring/ServerDiscoveryAndMonitoringTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/ServerDiscoveryAndMonitoringTestRunner.cs similarity index 97% rename from tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/ServerDiscoveryAndMonitoringTestRunner.cs rename to tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/ServerDiscoveryAndMonitoringTestRunner.cs index 974ba5d1e84..e2978e23b50 100644 --- a/tests/MongoDB.Driver.Core.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; @@ -28,7 +27,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.Misc; using MongoDB.Driver.Core.Servers; using MongoDB.Driver.Core.TestHelpers; @@ -37,7 +35,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 +600,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 CreateTestCases(BsonDocument document) { @@ -653,6 +651,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.Core.Tests/Specifications/server-selection/InWindowTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/server-selection/InWindowTestRunner.cs similarity index 97% rename from tests/MongoDB.Driver.Core.Tests/Specifications/server-selection/InWindowTestRunner.cs rename to tests/MongoDB.Driver.Tests/Specifications/server-selection/InWindowTestRunner.cs index 0b40c9815b0..1d8c9aa581b 100644 --- a/tests/MongoDB.Driver.Core.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 CreateTestCases(BsonDocument document) diff --git a/tests/MongoDB.Driver.Core.Tests/Specifications/server-selection/RttTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/server-selection/RttTestRunner.cs similarity index 95% rename from tests/MongoDB.Driver.Core.Tests/Specifications/server-selection/RttTestRunner.cs rename to tests/MongoDB.Driver.Tests/Specifications/server-selection/RttTestRunner.cs index c05dd8bc693..574bf4bd60e 100644 --- a/tests/MongoDB.Driver.Core.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 { public IEnumerator 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.Core.Tests/Specifications/server-selection/ServerSelectionTestHelpers.cs b/tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestHelpers.cs similarity index 99% rename from tests/MongoDB.Driver.Core.Tests/Specifications/server-selection/ServerSelectionTestHelpers.cs rename to tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestHelpers.cs index 4fc6a7b6b02..e619b322779 100644 --- a/tests/MongoDB.Driver.Core.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.Core.Tests/Specifications/server-selection/ServerSelectionTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestRunner.cs similarity index 96% rename from tests/MongoDB.Driver.Core.Tests/Specifications/server-selection/ServerSelectionTestRunner.cs rename to tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestRunner.cs index 572c70ab015..4e1e1904c80 100644 --- a/tests/MongoDB.Driver.Core.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 CreateTestCases(BsonDocument document) diff --git a/tests/MongoDB.Bson.Tests/Specifications/uuid/prose-tests/ExplicitDecodingTests.cs b/tests/MongoDB.Driver.Tests/Specifications/uuid/prose-tests/ExplicitDecodingTests.cs similarity index 98% rename from tests/MongoDB.Bson.Tests/Specifications/uuid/prose-tests/ExplicitDecodingTests.cs rename to tests/MongoDB.Driver.Tests/Specifications/uuid/prose-tests/ExplicitDecodingTests.cs index c5f93e4bfec..0f36dbb40d0 100644 --- a/tests/MongoDB.Bson.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.Bson.Tests/Specifications/uuid/prose-tests/ExplicitEncodingTests.cs b/tests/MongoDB.Driver.Tests/Specifications/uuid/prose-tests/ExplicitEncodingTests.cs similarity index 97% rename from tests/MongoDB.Bson.Tests/Specifications/uuid/prose-tests/ExplicitEncodingTests.cs rename to tests/MongoDB.Driver.Tests/Specifications/uuid/prose-tests/ExplicitEncodingTests.cs index 47eb443e4cc..ac3785d3cfc 100644 --- a/tests/MongoDB.Bson.Tests/Specifications/uuid/prose-tests/ExplicitEncodingTests.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/uuid/prose-tests/ExplicitEncodingTests.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 ExplicitEncodingTests {