Skip to content

Commit 69daf38

Browse files
BorisDogdnickless
authored andcommitted
CSHARP-4421: Unify all spec tests in single test project (mongodb#977)
1 parent 9af7357 commit 69daf38

34 files changed

+76
-105
lines changed

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

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

48-
<ItemGroup>
49-
<EmbeddedResource LinkBase="Specifications\bson-corpus" Include="..\..\specifications\bson-corpus\**\*.json" />
50-
<EmbeddedResource LinkBase="Specifications\bson-decimal128" Include="..\..\specifications\bson-decimal128\**\*.json" />
51-
<EmbeddedResource LinkBase="Specifications\uuid" Include="..\..\specifications\uuid\**\*.json" />
52-
</ItemGroup>
53-
5448
<ItemGroup>
5549
<None Update="xunit.runner.json">
5650
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
using MongoDB.Driver.Core.Servers;
3030
using Moq;
3131

32-
namespace MongoDB.Driver.Core.Helpers
32+
namespace MongoDB.Driver.Core.TestHelpers
3333
{
3434
public class MockClusterableServerFactory : IClusterableServerFactory
3535
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
using MongoDB.Driver.Core.WireProtocol.Messages;
2828
using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
2929

30-
namespace MongoDB.Driver.Core.Helpers
30+
namespace MongoDB.Driver.Core.TestHelpers
3131
{
3232
public class MockConnection : IConnection
3333
{

tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoAWSAuthenticatorTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
using MongoDB.Driver.Core.Helpers;
2828
using MongoDB.Driver.Core.Misc;
2929
using MongoDB.Driver.Core.Servers;
30+
using MongoDB.Driver.Core.TestHelpers;
3031
using Moq;
3132
using Xunit;
3233

tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoDBCRAuthenticatorTests.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818
using System.Threading;
1919
using FluentAssertions;
2020
using MongoDB.Bson;
21+
using MongoDB.Bson.TestHelpers.XunitExtensions;
2122
using MongoDB.Driver.Core.Clusters;
22-
using MongoDB.Driver.Core.Servers;
23+
using MongoDB.Driver.Core.Connections;
2324
using MongoDB.Driver.Core.Helpers;
25+
using MongoDB.Driver.Core.Misc;
26+
using MongoDB.Driver.Core.Servers;
27+
using MongoDB.Driver.Core.TestHelpers;
2428
using MongoDB.Driver.Core.WireProtocol.Messages;
2529
using Xunit;
26-
using MongoDB.Driver.Core.Connections;
27-
using MongoDB.Bson.TestHelpers.XunitExtensions;
28-
using MongoDB.Driver.Core.Misc;
2930

3031
namespace MongoDB.Driver.Core.Authentication
3132
{

tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoDBX509AuthenticatorTests.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818
using System.Threading;
1919
using FluentAssertions;
2020
using MongoDB.Bson;
21+
using MongoDB.Bson.TestHelpers.XunitExtensions;
2122
using MongoDB.Driver.Core.Clusters;
22-
using MongoDB.Driver.Core.Servers;
23-
using MongoDB.Driver.Core.Helpers;
24-
using Xunit;
2523
using MongoDB.Driver.Core.Connections;
26-
using MongoDB.Bson.TestHelpers.XunitExtensions;
24+
using MongoDB.Driver.Core.Helpers;
2725
using MongoDB.Driver.Core.Misc;
26+
using MongoDB.Driver.Core.Servers;
27+
using MongoDB.Driver.Core.TestHelpers;
2828
using MongoDB.Driver.Core.WireProtocol.Messages;
29+
using Xunit;
2930

3031
namespace MongoDB.Driver.Core.Authentication
3132
{

tests/MongoDB.Driver.Core.Tests/Core/Authentication/PlainAuthenticatorTests.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818
using System.Threading;
1919
using FluentAssertions;
2020
using MongoDB.Bson;
21+
using MongoDB.Bson.TestHelpers.XunitExtensions;
2122
using MongoDB.Driver.Core.Clusters;
22-
using MongoDB.Driver.Core.Servers;
23+
using MongoDB.Driver.Core.Connections;
2324
using MongoDB.Driver.Core.Helpers;
25+
using MongoDB.Driver.Core.Misc;
26+
using MongoDB.Driver.Core.Servers;
27+
using MongoDB.Driver.Core.TestHelpers;
2428
using MongoDB.Driver.Core.WireProtocol.Messages;
2529
using Xunit;
26-
using MongoDB.Driver.Core.Connections;
27-
using MongoDB.Bson.TestHelpers.XunitExtensions;
28-
using MongoDB.Driver.Core.Misc;
2930

3031
namespace MongoDB.Driver.Core.Authentication
3132
{

tests/MongoDB.Driver.Core.Tests/Core/Clusters/LoadBalancedClusterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
using MongoDB.Driver.Core.Clusters.ServerSelectors;
2525
using MongoDB.Driver.Core.Configuration;
2626
using MongoDB.Driver.Core.Events;
27-
using MongoDB.Driver.Core.Helpers;
2827
using MongoDB.Driver.Core.Misc;
2928
using MongoDB.Driver.Core.Servers;
29+
using MongoDB.Driver.Core.TestHelpers;
3030
using MongoDB.Driver.Core.TestHelpers.Logging;
3131
using Moq;
3232
using Xunit;

tests/MongoDB.Driver.Core.Tests/Core/Clusters/MultiServerClusterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
using MongoDB.Bson.TestHelpers;
2525
using MongoDB.Driver.Core.Configuration;
2626
using MongoDB.Driver.Core.Events;
27-
using MongoDB.Driver.Core.Helpers;
2827
using MongoDB.Driver.Core.Misc;
2928
using MongoDB.Driver.Core.Servers;
29+
using MongoDB.Driver.Core.TestHelpers;
3030
using MongoDB.Driver.Core.TestHelpers.Logging;
3131
using MongoDB.Driver.Core.Tests.Core.Clusters;
3232
using Moq;

tests/MongoDB.Driver.Core.Tests/Core/Clusters/SingleServerClusterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
using MongoDB.Bson.TestHelpers.XunitExtensions;
2121
using MongoDB.Driver.Core.Configuration;
2222
using MongoDB.Driver.Core.Events;
23-
using MongoDB.Driver.Core.Helpers;
2423
using MongoDB.Driver.Core.Servers;
24+
using MongoDB.Driver.Core.TestHelpers;
2525
using MongoDB.Driver.Core.TestHelpers.Logging;
2626
using Moq;
2727
using Xunit;

tests/MongoDB.Driver.Core.Tests/Core/ConnectionPools/ExclusiveConnectionPoolTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
using MongoDB.Driver.Core.Configuration;
2828
using MongoDB.Driver.Core.Connections;
2929
using MongoDB.Driver.Core.Events;
30-
using MongoDB.Driver.Core.Helpers;
3130
using MongoDB.Driver.Core.Logging;
3231
using MongoDB.Driver.Core.Misc;
3332
using MongoDB.Driver.Core.Servers;
33+
using MongoDB.Driver.Core.TestHelpers;
3434
using MongoDB.Driver.Core.TestHelpers.Logging;
3535
using Moq;
3636
using Xunit;

tests/MongoDB.Driver.Core.Tests/Core/ConnectionPools/MaintenanceHelperTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
using MongoDB.Driver.Core.Helpers;
3030
using MongoDB.Driver.Core.Logging;
3131
using MongoDB.Driver.Core.Servers;
32+
using MongoDB.Driver.Core.TestHelpers;
3233
using Moq;
3334
using Xunit;
3435

tests/MongoDB.Driver.Core.Tests/Core/Connections/ConnectionInitializerTests.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,18 @@
2020
using FluentAssertions;
2121
using MongoDB.Bson;
2222
using MongoDB.Bson.TestHelpers;
23-
using MongoDB.Driver.Core.Clusters;
24-
using MongoDB.Driver.Core.Misc;
25-
using MongoDB.Driver.Core.Servers;
26-
using MongoDB.Driver.Core.Helpers;
27-
using Xunit;
2823
using MongoDB.Bson.TestHelpers.XunitExtensions;
2924
using MongoDB.Driver.Core.Authentication;
25+
using MongoDB.Driver.Core.Clusters;
3026
using MongoDB.Driver.Core.Compression;
3127
using MongoDB.Driver.Core.Configuration;
28+
using MongoDB.Driver.Core.Helpers;
29+
using MongoDB.Driver.Core.Misc;
30+
using MongoDB.Driver.Core.Servers;
31+
using MongoDB.Driver.Core.TestHelpers;
3232
using MongoDB.Driver.Core.WireProtocol.Messages;
3333
using Moq;
34+
using Xunit;
3435

3536
namespace MongoDB.Driver.Core.Connections
3637
{

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/Core/Servers/RoundTripTimeMonitorTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
using MongoDB.Driver.Core.Helpers;
2828
using MongoDB.Driver.Core.Misc;
2929
using MongoDB.Driver.Core.Servers;
30+
using MongoDB.Driver.Core.TestHelpers;
3031
using MongoDB.Driver.Core.WireProtocol.Messages;
3132
using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
3233
using Moq;

tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/CommandWriteProtocolTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
using MongoDB.Driver.Core.Helpers;
3232
using MongoDB.Driver.Core.Misc;
3333
using MongoDB.Driver.Core.Servers;
34+
using MongoDB.Driver.Core.TestHelpers;
3435
using MongoDB.Driver.Core.WireProtocol.Messages;
3536
using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
3637
using Moq;

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,6 @@
4040
<ProjectReference Include="..\MongoDB.Driver.Core.TestHelpers\MongoDB.Driver.Core.TestHelpers.csproj" />
4141
</ItemGroup>
4242

43-
<ItemGroup>
44-
<EmbeddedResource LinkBase="Specifications\connection-monitoring-and-pooling\tests\cmap-format" Include="..\..\specifications\connection-monitoring-and-pooling\tests\cmap-format\*.json" />
45-
<EmbeddedResource LinkBase="Specifications\connection-string" Include="..\..\specifications\connection-string\**\*.json" />
46-
<EmbeddedResource LinkBase="Specifications\initial-dns-seedlist-discovery" Include="..\..\specifications\initial-dns-seedlist-discovery\**\*.json" />
47-
<EmbeddedResource LinkBase="Specifications\max-staleness" Include="..\..\specifications\max-staleness\**\*.json" />
48-
<EmbeddedResource LinkBase="Specifications\read-write-concern" Include="..\..\specifications\read-write-concern\**\*.json" />
49-
<EmbeddedResource LinkBase="Specifications\server-discovery-and-monitoring" Include="..\..\specifications\server-discovery-and-monitoring\**\*.json" />
50-
<EmbeddedResource LinkBase="Specifications\server-selection" Include="..\..\specifications\server-selection\**\*.json" />
51-
<EmbeddedResource LinkBase="Specifications\uri-options" Include="..\..\specifications\uri-options\**\*.json" />
52-
</ItemGroup>
53-
5443
<ItemGroup>
5544
<None Update="xunit.runner.json">
5645
<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
@@ -44,24 +44,7 @@
4444
</ItemGroup>
4545

4646
<ItemGroup>
47-
<EmbeddedResource LinkBase="Specifications\atlas-data-lake-testing" Include="..\..\specifications\atlas-data-lake-testing\**\*.json" />
48-
<EmbeddedResource LinkBase="Specifications\auth" Include="..\..\specifications\auth\**\*.json" />
49-
<EmbeddedResource LinkBase="Specifications\change-streams" Include="..\..\specifications\change-streams\**\*.json" />
50-
<EmbeddedResource LinkBase="Specifications\client-side-encryption" Include="..\..\specifications\client-side-encryption\**\*.json" />
51-
<EmbeddedResource LinkBase="Specifications\collection-management" Include="..\..\specifications\collection-management\**\*.json" />
52-
<EmbeddedResource LinkBase="Specifications\command-logging-and-monitoring" Include="..\..\specifications\command-logging-and-monitoring\**\*.json" />
53-
<EmbeddedResource LinkBase="Specifications\connection-monitoring-and-pooling\tests\logging" Include="..\..\specifications\connection-monitoring-and-pooling\tests\logging\*.json" />
54-
<EmbeddedResource LinkBase="Specifications\crud" Include="..\..\specifications\crud\**\*.json" />
55-
<EmbeddedResource LinkBase="Specifications\load-balancers" Include="..\..\specifications\load-balancers\**\*.json" />
56-
<EmbeddedResource LinkBase="Specifications\read-write-concern" Include="..\..\specifications\read-write-concern\**\*.json" />
57-
<EmbeddedResource LinkBase="Specifications\retryable-reads" Include="..\..\specifications\retryable-reads\**\*.json" />
58-
<EmbeddedResource LinkBase="Specifications\retryable-writes" Include="..\..\specifications\retryable-writes\**\*.json" />
59-
<EmbeddedResource LinkBase="Specifications\server-discovery-and-monitoring" Include="..\..\specifications\server-discovery-and-monitoring\**\*.json" />
60-
<EmbeddedResource LinkBase="Specifications\sessions" Include="..\..\specifications\sessions\**\*.json" />
61-
<EmbeddedResource LinkBase="Specifications\transactions" Include="..\..\specifications\transactions\**\*.json" />
62-
<EmbeddedResource LinkBase="Specifications\transactions-convenient-api" Include="..\..\specifications\transactions-convenient-api\**\*.json" />
63-
<EmbeddedResource LinkBase="Specifications\unified-test-format" Include="..\..\specifications\unified-test-format\**\*.json" />
64-
<EmbeddedResource LinkBase="Specifications\versioned-api" Include="..\..\specifications\versioned-api\**\*.json" />
47+
<EmbeddedResource LinkBase="Specifications\" Include="..\..\specifications\**\*.json" />
6548
</ItemGroup>
6649

6750
<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()
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
using MongoDB.Driver.Core.ConnectionPools;
3434
using MongoDB.Driver.Core.Connections;
3535
using MongoDB.Driver.Core.Events;
36-
using MongoDB.Driver.Core.Helpers;
3736
using MongoDB.Driver.Core.Logging;
3837
using MongoDB.Driver.Core.Misc;
3938
using MongoDB.Driver.Core.Servers;
@@ -42,7 +41,7 @@
4241
using Moq;
4342
using Xunit;
4443

45-
namespace MongoDB.Driver.Specifications.connection_monitoring_and_pooling
44+
namespace MongoDB.Driver.Tests.Specifications.connection_monitoring_and_pooling
4645
{
4746
[Trait("Category", "Pool")]
4847
public class ConnectionMonitoringAndPoolingTestRunner
@@ -810,7 +809,7 @@ private void WaitForThread(BsonDocument operation, ConcurrentDictionary<string,
810809
// nested types
811810
private class TestCaseFactory : JsonDrivenTestCaseFactory
812811
{
813-
protected override string PathPrefix => "MongoDB.Driver.Core.Tests.Specifications.connection_monitoring_and_pooling.tests.cmap_format.";
812+
protected override string PathPrefix => "MongoDB.Driver.Tests.Specifications.connection_monitoring_and_pooling.tests.cmap_format.";
814813

815814
protected override IEnumerable<JsonDrivenTestCase> CreateTestCases(BsonDocument document)
816815
{

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)
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()
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
}

0 commit comments

Comments
 (0)