Skip to content

Commit 9866f18

Browse files
BorisDogBorisDog
committed
CSHARP-4421: Unify all spec tests in single test project
1 parent e201525 commit 9866f18

23 files changed

+45
-80
lines changed

‎tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@
7272
<ProjectReference Include="..\MongoDB.Bson.TestHelpers\MongoDB.Bson.TestHelpers.csproj" />
7373
</ItemGroup>
7474

75-
<ItemGroup>
76-
<EmbeddedResource LinkBase="Specifications\bson-corpus" Include="..\..\specifications\bson-corpus\**\*.json" />
77-
<EmbeddedResource LinkBase="Specifications\bson-decimal128" Include="..\..\specifications\bson-decimal128\**\*.json" />
78-
<EmbeddedResource LinkBase="Specifications\uuid" Include="..\..\specifications\uuid\**\*.json" />
79-
</ItemGroup>
80-
8175
<ItemGroup>
8276
<None Update="xunit.runner.json">
8377
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

‎tests/MongoDB.Driver.Core.Tests/Core/Helpers/MockClusterableServerFactory.cs renamed to ‎tests/MongoDB.Driver.Core.TestHelpers/MockClusterableServerFactory.cs

File renamed without changes.

‎tests/MongoDB.Driver.Core.Tests/Core/Helpers/MockConnection.cs renamed to ‎tests/MongoDB.Driver.Core.TestHelpers/MockConnection.cs

File renamed without changes.

‎tests/MongoDB.Driver.Core.TestHelpers/MongoDB.Driver.Core.TestHelpers.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<ItemGroup>
5353
<PackageReference Include="FluentAssertions" Version="4.12.0" />
5454
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
55+
<PackageReference Include="Moq" Version="4.9.0" />
5556
<PackageReference Include="xunit" Version="2.4.0" />
5657
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
5758
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />

‎tests/MongoDB.Driver.Core.Tests/Core/Servers/LoadBalancedServerTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
using MongoDB.Driver.Core.Logging;
3333
using MongoDB.Driver.Core.TestHelpers;
3434
using MongoDB.Driver.Core.TestHelpers.Logging;
35-
using MongoDB.Driver.Specifications.connection_monitoring_and_pooling;
3635
using Moq;
3736
using Xunit;
3837
using Xunit.Abstractions;

‎tests/MongoDB.Driver.Core.Tests/MongoDB.Driver.Core.Tests.csproj

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
<PackageReference Include="FluentAssertions" Version="4.12.0" />
5555
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
5656
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
57-
<PackageReference Include="Moq" Version="4.9.0" />
5857
<PackageReference Include="xunit" Version="2.4.0" />
5958
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
6059
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
@@ -67,17 +66,6 @@
6766
<ProjectReference Include="..\MongoDB.Driver.Core.TestHelpers\MongoDB.Driver.Core.TestHelpers.csproj" />
6867
</ItemGroup>
6968

70-
<ItemGroup>
71-
<EmbeddedResource LinkBase="Specifications\connection-monitoring-and-pooling\tests\cmap-format" Include="..\..\specifications\connection-monitoring-and-pooling\tests\cmap-format\*.json" />
72-
<EmbeddedResource LinkBase="Specifications\connection-string" Include="..\..\specifications\connection-string\**\*.json" />
73-
<EmbeddedResource LinkBase="Specifications\initial-dns-seedlist-discovery" Include="..\..\specifications\initial-dns-seedlist-discovery\**\*.json" />
74-
<EmbeddedResource LinkBase="Specifications\max-staleness" Include="..\..\specifications\max-staleness\**\*.json" />
75-
<EmbeddedResource LinkBase="Specifications\read-write-concern" Include="..\..\specifications\read-write-concern\**\*.json" />
76-
<EmbeddedResource LinkBase="Specifications\server-discovery-and-monitoring" Include="..\..\specifications\server-discovery-and-monitoring\**\*.json" />
77-
<EmbeddedResource LinkBase="Specifications\server-selection" Include="..\..\specifications\server-selection\**\*.json" />
78-
<EmbeddedResource LinkBase="Specifications\uri-options" Include="..\..\specifications\uri-options\**\*.json" />
79-
</ItemGroup>
80-
8169
<ItemGroup>
8270
<None Update="xunit.runner.json">
8371
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

‎tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,24 +71,7 @@
7171
</ItemGroup>
7272

7373
<ItemGroup>
74-
<EmbeddedResource LinkBase="Specifications\atlas-data-lake-testing" Include="..\..\specifications\atlas-data-lake-testing\**\*.json" />
75-
<EmbeddedResource LinkBase="Specifications\auth" Include="..\..\specifications\auth\**\*.json" />
76-
<EmbeddedResource LinkBase="Specifications\change-streams" Include="..\..\specifications\change-streams\**\*.json" />
77-
<EmbeddedResource LinkBase="Specifications\client-side-encryption" Include="..\..\specifications\client-side-encryption\**\*.json" />
78-
<EmbeddedResource LinkBase="Specifications\collection-management" Include="..\..\specifications\collection-management\**\*.json" />
79-
<EmbeddedResource LinkBase="Specifications\command-logging-and-monitoring" Include="..\..\specifications\command-logging-and-monitoring\**\*.json" />
80-
<EmbeddedResource LinkBase="Specifications\connection-monitoring-and-pooling\tests\logging" Include="..\..\specifications\connection-monitoring-and-pooling\tests\logging\*.json" />
81-
<EmbeddedResource LinkBase="Specifications\crud" Include="..\..\specifications\crud\**\*.json" />
82-
<EmbeddedResource LinkBase="Specifications\load-balancers" Include="..\..\specifications\load-balancers\**\*.json" />
83-
<EmbeddedResource LinkBase="Specifications\read-write-concern" Include="..\..\specifications\read-write-concern\**\*.json" />
84-
<EmbeddedResource LinkBase="Specifications\retryable-reads" Include="..\..\specifications\retryable-reads\**\*.json" />
85-
<EmbeddedResource LinkBase="Specifications\retryable-writes" Include="..\..\specifications\retryable-writes\**\*.json" />
86-
<EmbeddedResource LinkBase="Specifications\server-discovery-and-monitoring" Include="..\..\specifications\server-discovery-and-monitoring\**\*.json" />
87-
<EmbeddedResource LinkBase="Specifications\sessions" Include="..\..\specifications\sessions\**\*.json" />
88-
<EmbeddedResource LinkBase="Specifications\transactions" Include="..\..\specifications\transactions\**\*.json" />
89-
<EmbeddedResource LinkBase="Specifications\transactions-convenient-api" Include="..\..\specifications\transactions-convenient-api\**\*.json" />
90-
<EmbeddedResource LinkBase="Specifications\unified-test-format" Include="..\..\specifications\unified-test-format\**\*.json" />
91-
<EmbeddedResource LinkBase="Specifications\versioned-api" Include="..\..\specifications\versioned-api\**\*.json" />
74+
<EmbeddedResource LinkBase="Specifications\" Include="..\..\specifications\**\*.json" />
9275
</ItemGroup>
9376

9477
<ItemGroup>

‎tests/MongoDB.Bson.Tests/Specifications/bson-corpus/BsonCorpusTestRunner.cs renamed to ‎tests/MongoDB.Driver.Tests/Specifications/bson-corpus/BsonCorpusTestRunner.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@
1919
using System.Linq;
2020
using System.Text.RegularExpressions;
2121
using FluentAssertions;
22+
using MongoDB.Bson;
2223
using MongoDB.Bson.IO;
2324
using MongoDB.Bson.Serialization;
2425
using MongoDB.Bson.Serialization.Serializers;
2526
using MongoDB.Bson.TestHelpers.JsonDrivenTests;
2627
using Xunit;
2728

28-
namespace MongoDB.Bson.Tests.Specifications.bson_corpus
29+
namespace MongoDB.Driver.Tests.Specifications.bson_corpus
2930
{
3031
public class BsonCorpusTestRunner
3132
{
@@ -300,7 +301,7 @@ private class TestCaseFactory : JsonDrivenTestCaseFactory
300301
#endregion
301302

302303
// protected properties
303-
protected override string PathPrefix => "MongoDB.Bson.Tests.Specifications.bson_corpus.tests.";
304+
protected override string PathPrefix => "MongoDB.Driver.Tests.Specifications.bson_corpus.tests.";
304305

305306
// protected methods
306307
protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)

‎tests/MongoDB.Bson.Tests/Specifications/bson-decimal128/TestRunner.cs renamed to ‎tests/MongoDB.Driver.Tests/Specifications/bson-decimal128/TestRunner.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
using System.Linq;
2020
using System.Reflection;
2121
using FluentAssertions;
22+
using MongoDB.Bson;
2223
using MongoDB.Bson.IO;
2324
using MongoDB.Bson.Serialization;
2425
using MongoDB.Bson.Serialization.Serializers;
2526
using Xunit;
2627

27-
namespace MongoDB.Bson.Specifications.bson_decimal128
28+
namespace MongoDB.Driver.Tests.Specifications.bson_decimal128
2829
{
2930
public class TestRunner
3031
{
@@ -158,7 +159,7 @@ private class TestCaseFactory : IEnumerable<object[]>
158159
{
159160
public IEnumerator<object[]> GetEnumerator()
160161
{
161-
const string prefix = "MongoDB.Bson.Tests.Specifications.bson_decimal128.tests.";
162+
const string prefix = "MongoDB.Driver.Tests.Specifications.bson_decimal128.tests.";
162163
var executingAssembly = typeof(TestCaseFactory).GetTypeInfo().Assembly;
163164
var enumerable = executingAssembly
164165
.GetManifestResourceNames()

‎tests/MongoDB.Driver.Core.Tests/Specifications/connection-monitoring-and-pooling/ConnectionMonitoringAndPoolingTestRunner.cs renamed to ‎tests/MongoDB.Driver.Tests/Specifications/connection-monitoring-and-pooling/ConnectionMonitoringAndPoolingTestRunner.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
using Moq;
4343
using Xunit;
4444

45-
namespace MongoDB.Driver.Specifications.connection_monitoring_and_pooling
45+
namespace MongoDB.Driver.Tests.Specifications.connection_monitoring_and_pooling
4646
{
4747
[Trait("Category", "Pool")]
4848
public class ConnectionMonitoringAndPoolingTestRunner
@@ -810,7 +810,7 @@ private void WaitForThread(BsonDocument operation, ConcurrentDictionary<string,
810810
// nested types
811811
private class TestCaseFactory : JsonDrivenTestCaseFactory
812812
{
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.";
814814

815815
protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)
816816
{

‎tests/MongoDB.Driver.Core.Tests/Specifications/connection-string/ConnectionStringTestRunner.cs renamed to ‎tests/MongoDB.Driver.Tests/Specifications/connection-string/ConnectionStringTestRunner.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
using Xunit;
2929
using Xunit.Abstractions;
3030

31-
namespace MongoDB.Driver.Specifications.connection_string
31+
namespace MongoDB.Driver.Tests.Specifications.connection_string
3232
{
3333
public class ConnectionStringTestRunner : LoggableTestClass
3434
{
@@ -411,8 +411,8 @@ private class TestCaseFactory : JsonDrivenTestCaseFactory
411411
protected override string[] PathPrefixes =>
412412
new[]
413413
{
414-
"MongoDB.Driver.Core.Tests.Specifications.connection_string.tests.",
415-
"MongoDB.Driver.Core.Tests.Specifications.uri_options.tests."
414+
"MongoDB.Driver.Tests.Specifications.connection_string.tests.",
415+
"MongoDB.Driver.Tests.Specifications.uri_options.tests."
416416
};
417417

418418
protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)

‎tests/MongoDB.Driver.Core.Tests/Specifications/initial-dns-seedlist-discovery/InitialDnsSeedlistDiscoveryTestRunner.cs renamed to ‎tests/MongoDB.Driver.Tests/Specifications/initial-dns-seedlist-discovery/InitialDnsSeedlistDiscoveryTestRunner.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
using System.Threading.Tasks;
2929
using Xunit.Abstractions;
3030

31-
namespace MongoDB.Driver.Specifications.initial_dns_seedlist_discovery
31+
namespace MongoDB.Driver.Tests.Specifications.initial_dns_seedlist_discovery
3232
{
3333
[Trait("Category", "ConnectionString")]
3434
[Trait("Category", "SupportLoadBalancing")]
@@ -166,7 +166,7 @@ private class TestCaseFactory : IEnumerable<object[]>
166166
{
167167
public IEnumerator<object[]> GetEnumerator()
168168
{
169-
const string prefix = "MongoDB.Driver.Core.Tests.Specifications.initial_dns_seedlist_discovery.tests.";
169+
const string prefix = "MongoDB.Driver.Tests.Specifications.initial_dns_seedlist_discovery.tests.";
170170
var executingAssembly = typeof(TestCaseFactory).GetTypeInfo().Assembly;
171171
return executingAssembly
172172
.GetManifestResourceNames()

‎tests/MongoDB.Driver.Core.Tests/Specifications/read-write-concern/ConnectionStringTestRunner.cs renamed to ‎tests/MongoDB.Driver.Tests/Specifications/read-write-concern/ConnectionStringTestRunner.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
using System;
1717
using FluentAssertions;
1818
using MongoDB.Bson;
19+
using MongoDB.Bson.TestHelpers.JsonDrivenTests;
20+
using MongoDB.Bson.TestHelpers.XunitExtensions;
1921
using MongoDB.Driver.Core.Configuration;
2022
using Xunit;
21-
using MongoDB.Bson.TestHelpers.XunitExtensions;
22-
using MongoDB.Bson.TestHelpers.JsonDrivenTests;
2323

24-
namespace MongoDB.Driver.Specifications.read_write_concern.tests
24+
namespace MongoDB.Driver.Tests.Specifications.read_write_concern.tests
2525
{
2626
public class ConnectionStringTestRunner
2727
{
@@ -109,7 +109,7 @@ private BsonDocument MassageWriteConcernDocument(BsonDocument writeConcern)
109109

110110
private class TestCaseFactory : JsonDrivenTestCaseFactory
111111
{
112-
protected override string PathPrefix => "MongoDB.Driver.Core.Tests.Specifications.read_write_concern.tests.connection_string.";
112+
protected override string PathPrefix => "MongoDB.Driver.Tests.Specifications.read_write_concern.tests.connection_string.";
113113
}
114114
}
115115
}

‎tests/MongoDB.Driver.Core.Tests/Specifications/read-write-concern/DocumentTestRunner.cs renamed to ‎tests/MongoDB.Driver.Tests/Specifications/read-write-concern/DocumentTestRunner.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
using MongoDB.Bson.TestHelpers.XunitExtensions;
2121
using MongoDB.Bson.TestHelpers.JsonDrivenTests;
2222

23-
namespace MongoDB.Driver.Specifications.read_write_concern.tests
23+
namespace MongoDB.Driver.Tests.Specifications.read_write_concern.tests
2424
{
2525
public class DocumentTestRunner
2626
{
@@ -135,7 +135,7 @@ private BsonDocument MassageWriteConcernDocument(BsonDocument writeConcern)
135135

136136
private class TestCaseFactory : JsonDrivenTestCaseFactory
137137
{
138-
protected override string PathPrefix => "MongoDB.Driver.Core.Tests.Specifications.read_write_concern.tests.document.";
138+
protected override string PathPrefix => "MongoDB.Driver.Tests.Specifications.read_write_concern.tests.document.";
139139
}
140140
}
141141
}

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/MonitoringTestRunner.cs renamed to ‎tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/MonitoringTestRunner.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
using Xunit;
3535
using Xunit.Abstractions;
3636

37-
namespace MongoDB.Driver.Specifications.sdam_monitoring
37+
namespace MongoDB.Driver.Tests.Specifications.server_discovery_and_monitoring
3838
{
3939
public class MonitoringTestRunner : LoggableTestClass
4040
{
@@ -365,7 +365,7 @@ private ICluster BuildCluster(BsonDocument definition)
365365
// nested types
366366
private class TestCaseFactory : JsonDrivenTestCaseFactory
367367
{
368-
protected override string PathPrefix => "MongoDB.Driver.Core.Tests.Specifications.server_discovery_and_monitoring.tests.monitoring.";
368+
protected override string PathPrefix => "MongoDB.Driver.Tests.Specifications.server_discovery_and_monitoring.tests.monitoring.";
369369

370370
protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)
371371
{

‎tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/ServerDiscoveryAndMonitoringProseTests.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -249,14 +249,6 @@ private DisposableMongoClient CreateClient(MongoClientSettings mongoClientSettin
249249
}
250250
}
251251

252-
internal static class ServerReflector
253-
{
254-
public static IServerMonitor _monitor(this IServer server)
255-
{
256-
return (IServerMonitor)Reflector.GetFieldValue(server, nameof(_monitor));
257-
}
258-
}
259-
260252
internal static class ServerMonitorReflector
261253
{
262254
public static IRoundTripTimeMonitor _roundTripTimeMonitor(this IServerMonitor serverMonitor)

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-discovery-and-monitoring/ServerDiscoveryAndMonitoringTestRunner.cs renamed to ‎tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/ServerDiscoveryAndMonitoringTestRunner.cs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
using System;
1717
using System.Collections.Generic;
18-
using System.IO;
1918
using System.Linq;
2019
using System.Threading;
2120
using FluentAssertions;
@@ -37,7 +36,7 @@
3736
using Xunit;
3837
using Xunit.Abstractions;
3938

40-
namespace MongoDB.Driver.Specifications.server_discovery_and_monitoring
39+
namespace MongoDB.Driver.Tests.Specifications.server_discovery_and_monitoring
4140
{
4241
public class ServerDiscoveryAndMonitoringTestRunner : LoggableTestClass
4342
{
@@ -602,14 +601,14 @@ private class TestCaseFactory : JsonDrivenTestCaseFactory
602601
// private constants
603602
private readonly string[] MonitoringPrefixes =
604603
{
605-
"MongoDB.Driver.Core.Tests.Specifications.server_discovery_and_monitoring.tests.monitoring.",
606-
"MongoDB.Driver.Core.Tests.Specifications.server_discovery_and_monitoring.tests.legacy_hello.monitoring."
604+
"MongoDB.Driver.Tests.Specifications.server_discovery_and_monitoring.tests.monitoring.",
605+
"MongoDB.Driver.Tests.Specifications.server_discovery_and_monitoring.tests.legacy_hello.monitoring."
607606
};
608607

609608
// Integration tests are run by ServerDiscoveryAndMonitoringIntegrationTestRunner in MongoDB.Driver.Tests
610-
private const string IntegrationTestPrefix = "MongoDB.Driver.Core.Tests.Specifications.server_discovery_and_monitoring.tests.integration.";
609+
private const string IntegrationTestPrefix = "MongoDB.Driver.Tests.Specifications.server_discovery_and_monitoring.tests.integration.";
611610

612-
protected override string PathPrefix => "MongoDB.Driver.Core.Tests.Specifications.server_discovery_and_monitoring.tests.";
611+
protected override string PathPrefix => "MongoDB.Driver.Tests.Specifications.server_discovery_and_monitoring.tests.";
613612

614613
protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)
615614
{
@@ -653,6 +652,11 @@ public static IConnectionPool _connectionPool(this Server server)
653652
return (IConnectionPool)Reflector.GetFieldValue(server, nameof(_connectionPool));
654653
}
655654

655+
public static IServerMonitor _monitor(this IServer server)
656+
{
657+
return (IServerMonitor)Reflector.GetFieldValue(server, nameof(_monitor));
658+
}
659+
656660
public static void HandleBeforeHandshakeCompletesException(this Server server, Exception ex)
657661
{
658662
Reflector.Invoke(server, nameof(HandleBeforeHandshakeCompletesException), ex);

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-selection/InWindowTestRunner.cs renamed to ‎tests/MongoDB.Driver.Tests/Specifications/server-selection/InWindowTestRunner.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
using Xunit;
3232
using Xunit.Abstractions;
3333

34-
namespace MongoDB.Driver.Specifications.server_selection
34+
namespace MongoDB.Driver.Tests.Specifications.server_selection
3535
{
3636
public sealed class InWindowTestRunner : LoggableTestClass
3737
{
@@ -137,7 +137,7 @@ private class TestCaseFactory : JsonDrivenTestCaseFactory
137137
{
138138
protected override string[] PathPrefixes => new[]
139139
{
140-
"MongoDB.Driver.Core.Tests.Specifications.server_selection.tests.in_window.",
140+
"MongoDB.Driver.Tests.Specifications.server_selection.tests.in_window.",
141141
};
142142

143143
protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-selection/RttTestRunner.cs renamed to ‎tests/MongoDB.Driver.Tests/Specifications/server-selection/RttTestRunner.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
using MongoDB.Driver.Core.Misc;
2525
using Xunit;
2626

27-
namespace MongoDB.Driver.Specifications.server_selection
27+
namespace MongoDB.Driver.Tests.Specifications.server_selection
2828
{
2929
public class RttTestRunner
3030
{
@@ -51,7 +51,7 @@ private class TestCaseFactory : IEnumerable<object[]>
5151
{
5252
public IEnumerator<object[]> GetEnumerator()
5353
{
54-
const string prefix = "MongoDB.Driver.Core.Tests.Specifications.server_selection.tests.rtt.";
54+
const string prefix = "MongoDB.Driver.Tests.Specifications.server_selection.tests.rtt.";
5555
var executingAssembly = typeof(TestCaseFactory).GetTypeInfo().Assembly;
5656
var enumerable = executingAssembly
5757
.GetManifestResourceNames()

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-selection/ServerSelectionTestHelpers.cs renamed to ‎tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
using MongoDB.Driver.Core.Misc;
2323
using MongoDB.Driver.Core.Servers;
2424

25-
namespace MongoDB.Driver.Specifications.server_selection
25+
namespace MongoDB.Driver.Tests.Specifications.server_selection
2626
{
2727
internal static class ServerSelectionTestHelper
2828
{

‎tests/MongoDB.Driver.Core.Tests/Specifications/server-selection/ServerSelectionTestRunner.cs renamed to ‎tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestRunner.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
using MongoDB.Driver.Core.Servers;
2626
using Xunit;
2727

28-
namespace MongoDB.Driver.Specifications.server_selection
28+
namespace MongoDB.Driver.Tests.Specifications.server_selection
2929
{
3030
public class ServerSelectionTestRunner
3131
{
@@ -150,8 +150,8 @@ private class TestCaseFactory : JsonDrivenTestCaseFactory
150150
{
151151
protected override string[] PathPrefixes => new[]
152152
{
153-
"MongoDB.Driver.Core.Tests.Specifications.server_selection.tests.server_selection.",
154-
"MongoDB.Driver.Core.Tests.Specifications.max_staleness.tests."
153+
"MongoDB.Driver.Tests.Specifications.server_selection.tests.server_selection.",
154+
"MongoDB.Driver.Tests.Specifications.max_staleness.tests."
155155
};
156156

157157
protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)

‎tests/MongoDB.Bson.Tests/Specifications/uuid/prose-tests/ExplicitDecodingTests.cs renamed to ‎tests/MongoDB.Driver.Tests/Specifications/uuid/prose-tests/ExplicitDecodingTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515

1616
using System;
1717
using FluentAssertions;
18+
using MongoDB.Bson;
1819
using MongoDB.Bson.TestHelpers;
1920
using Xunit;
2021

21-
namespace MongoDB.Bson.Tests.Specifications.uuid.prose_tests
22+
namespace MongoDB.Driver.Tests.Specifications.uuid.prose_tests
2223
{
2324
public class ExplicitDecodingTests
2425
{

0 commit comments

Comments
 (0)