Skip to content

Commit af44b44

Browse files
BorisDogBorisDog
committed
- Merge
1 parent 1b34bfe commit af44b44

File tree

7 files changed

+26
-28
lines changed

7 files changed

+26
-28
lines changed

‎tests/BuildProps/Tests.Build.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@
4545
<PackageReference Include="FluentAssertions" Version="4.12.0" />
4646
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
4747
<PackageReference Include="Moq" Version="4.9.0" />
48-
<PackageReference Include="xunit" Version="2.4.0" />
49-
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
48+
<PackageReference Include="xunit" Version="2.4.2" />
5049
<PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
5150
</ItemGroup>
5251
</Project>

‎tests/MongoDB.Driver.Tests/Communication/Security/AwsAuthenticationTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace MongoDB.Driver.Tests.Communication.Security
3838
[Trait("Category", "AwsMechanism")]
3939
public class AwsAuthenticationTests
4040
{
41-
[SkippableFact]
41+
[Fact]
4242
public void Aws_authentication_should_should_have_expected_result()
4343
{
4444
RequireEnvironment.Check().EnvironmentVariable("AWS_TESTS_ENABLED");
@@ -65,7 +65,7 @@ public void Ecs_should_fill_AWS_CONTAINER_CREDENTIALS_RELATIVE_URI()
6565
(awsContainerUri != null).Should().Be(isEcs);
6666
}
6767

68-
[SkippableFact]
68+
[Fact]
6969
public void AwsSdk_should_support_all_required_handlers()
7070
{
7171
var credentialsGeneratorsDelegatesEnumerator = FallbackCredentialsFactory.CredentialsGenerators.GetEnumerator();

‎tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2471Tests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace MongoDB.Driver.Tests.Linq.Linq3ImplementationTests.Jira
2626
{
2727
public class CSharp2471Tests : Linq3IntegrationTest
2828
{
29-
[SkippableTheory]
29+
[Theory]
3030
[InlineData("$acos", 1.0, 0.0)]
3131
#if NETCOREAPP3_1_OR_GREATER
3232
[InlineData("$acosh", 1.0, 0.0)]
@@ -88,7 +88,7 @@ public void Trig_method_should_work(string trigOperator, double x, double expect
8888
result.Should().Be(expectedResult);
8989
}
9090

91-
[SkippableFact]
91+
[Fact]
9292
public void Atan2_should_work()
9393
{
9494
RequireServer.Check().Supports(Feature.TrigOperators);

‎tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2472Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace MongoDB.Driver.Tests.Linq.Linq3ImplementationTests.Jira
2525
{
2626
public class CSharp2472Tests : Linq3IntegrationTest
2727
{
28-
[SkippableFact]
28+
[Fact]
2929
public void Numeric_casts_should_work()
3030
{
3131
RequireServer.Check().Supports(Feature.ToConversionOperators);

‎tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2727Tests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace MongoDB.Driver.Tests.Linq.Linq3ImplementationTests.Jira
2727
{
2828
public class CSharp2727Tests : Linq3IntegrationTest
2929
{
30-
[SkippableFact]
30+
[Fact]
3131
public void Find_with_predicate_on_Body_should_work()
3232
{
3333
RequireServer.Check().Supports(Feature.AggregateToString);
@@ -64,7 +64,7 @@ public void Find_with_predicate_on_Caption_should_work()
6464
results.Select(x => x.Id).Should().Equal(1, 2);
6565
}
6666

67-
[SkippableFact]
67+
[Fact]
6868
public void Where_with_predicate_on_Body_should_work()
6969
{
7070
RequireServer.Check().Supports(Feature.AggregateToString);

‎tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
using Xunit.Abstractions;
4949
using Xunit.Sdk;
5050
using Reflector = MongoDB.Bson.TestHelpers.Reflector;
51-
using SkipException = Xunit.SkipException;
5251

5352
namespace MongoDB.Driver.Tests.Specifications.client_side_encryption.prose_tests
5453
{
@@ -86,7 +85,7 @@ public ClientEncryptionProseTests(ITestOutputHelper testOutputHelper)
8685
}
8786

8887
// public methods
89-
[SkippableTheory]
88+
[Theory]
9089
[ParameterAttributeData]
9190
public void BsonSizeLimitAndBatchSizeSplittingTest(
9291
[Values(false, true)] bool async)
@@ -251,7 +250,7 @@ public void BsonSizeLimitAndBatchSizeSplittingTest(
251250
}
252251
}
253252

254-
[SkippableTheory]
253+
[Theory]
255254
[ParameterAttributeData]
256255
public void BypassMongocryptdClientWhenSharedLibraryTest(
257256
[Values(false, true)] bool async)
@@ -320,7 +319,7 @@ void ThreadStart(object param)
320319
}
321320
}
322321

323-
[SkippableTheory]
322+
[Theory]
324323
[ParameterAttributeData]
325324
public void BypassSpawningMongocryptdViaMongocryptdBypassSpawnTest(
326325
[Values(false, true)] bool async)
@@ -355,7 +354,7 @@ public enum BypassSpawningMongocryptd
355354
SharedLibrary
356355
}
357356

358-
[SkippableTheory]
357+
[Theory]
359358
[ParameterAttributeData]
360359
public void BypassSpawningMongocryptdTest(
361360
[Values(BypassSpawningMongocryptd.BypassQueryAnalysis, BypassSpawningMongocryptd.BypassAutoEncryption, BypassSpawningMongocryptd.SharedLibrary)] BypassSpawningMongocryptd bypassSpawning,
@@ -412,7 +411,7 @@ DisposableMongoClient EnsureEnvironmentAndConfigureTestClientEncrypted()
412411
}
413412
}
414413

415-
[SkippableTheory]
414+
[Theory]
416415
[ParameterAttributeData]
417416
public void CorpusTest(
418417
[Values(false, true)] bool useLocalSchema,
@@ -582,7 +581,7 @@ EncryptOptions CreateEncryptOptions(string algorithm, string identifier, string
582581
};
583582
}
584583

585-
[SkippableTheory]
584+
[Theory]
586585
[ParameterAttributeData]
587586
public void CreateDataKeyAndDoubleEncryptionTest(
588587
[Values("local", "aws", "azure", "gcp", "kmip")] string kmsProvider,
@@ -658,7 +657,7 @@ public void CreateDataKeyAndDoubleEncryptionTest(
658657
}
659658
}
660659

661-
[SkippableTheory]
660+
[Theory]
662661
// aws
663662
[InlineData("aws", null, null, null)]
664663
[InlineData("aws", "kms.us-east-1.amazonaws.com", null, null)]
@@ -820,7 +819,7 @@ void TestCase(ClientEncryption testCaseClientEncription, BsonDocument masterKey,
820819
}
821820
}
822821

823-
[SkippableTheory]
822+
[Theory]
824823
[MemberData(nameof(DeadlockTest_MemberData))]
825824
public void DeadlockTest(
826825
string _,
@@ -1023,7 +1022,7 @@ IEnumerable<object[]> CasesWithAsync(
10231022
}
10241023
}
10251024

1026-
[SkippableTheory]
1025+
[Theory]
10271026
[ParameterAttributeData]
10281027
public void DecryptionEvents(
10291028
[Range(1, 4)] int testCase,
@@ -1136,7 +1135,7 @@ BsonDocument Aggregate(IMongoCollection<BsonDocument> collection, bool async)
11361135
}
11371136
}
11381137

1139-
[SkippableTheory]
1138+
[Theory]
11401139
[ParameterAttributeData]
11411140
public void ExplicitEncryptionTest(
11421141
[Range(1, 5)] int testCase,
@@ -1265,7 +1264,7 @@ void RunTestCase(IMongoCollection<BsonDocument> explicitCollectionFromEncryptedC
12651264
}
12661265
}
12671266

1268-
[SkippableTheory]
1267+
[Theory]
12691268
[ParameterAttributeData]
12701269
public void ExternalKeyVaultTest(
12711270
[Values(false, true)] bool withExternalKeyVault,
@@ -1316,7 +1315,7 @@ public void ExternalKeyVaultTest(
13161315
}
13171316
}
13181317

1319-
[SkippableTheory]
1318+
[Theory]
13201319
[ParameterAttributeData]
13211320
public void KmsTlsOptionsTest(
13221321
[Values("aws", "azure", "gcp", "kmip")] string kmsProvider,
@@ -1633,7 +1632,7 @@ void KmsProviderEndpointConfigurator(string kmsProviderName, Dictionary<string,
16331632

16341633
[Trait("Category", "CsfleAZUREKMS")]
16351634
[Trait("Category", "CsfleGCPKMS")]
1636-
[SkippableTheory]
1635+
[Theory]
16371636
[ParameterAttributeData]
16381637
public void OnDemandCredentialsTest(
16391638
[Values("aws", "azure", "gcp")] string kmsProvider,
@@ -1787,7 +1786,7 @@ void EnsureEnvironmentConfigured(out BsonDocument customMasterKey)
17871786
}
17881787
}
17891788

1790-
[SkippableTheory]
1789+
[Theory]
17911790
[ParameterAttributeData]
17921791
public async Task OnDemandAzureIMDSCredentialsUnitTest(
17931792
[Range(1, 6)] int testCase,
@@ -1920,7 +1919,7 @@ public void RewrapTest(
19201919
}
19211920
}
19221921

1923-
[SkippableTheory]
1922+
[Theory]
19241923
[ParameterAttributeData]
19251924
public void ViewAreProhibitedTest([Values(false, true)] bool async)
19261925
{
@@ -1948,7 +1947,7 @@ public void ViewAreProhibitedTest([Values(false, true)] bool async)
19481947
}
19491948
}
19501949

1951-
[SkippableTheory]
1950+
[Theory]
19521951
[ParameterAttributeData]
19531952
public void UniqueIndexOnKeyAltNames(
19541953
[Range(1, 2)] int testCase,
@@ -2017,7 +2016,7 @@ void RunTestCase(ClientEncryption clientEncryption, Guid existingKey, int testCa
20172016
}
20182017

20192018
// NOTE: this test is not presented in the prose tests
2020-
[SkippableTheory]
2019+
[Theory]
20212020
[ParameterAttributeData]
20222021
public void UnsupportedPlatformsTests(
20232022
[Values("gcp")] string kmsProvider, // the rest kms providers are supported on all supported TFs

‎tests/MongoDB.Driver.Tests/Specifications/connection-monitoring-and-pooling/CmapUnifiedTestRunner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public CmapUnifiedTestRunner(ITestOutputHelper testOutputHelper)
5757
{
5858
}
5959

60-
[SkippableTheory]
60+
[Theory]
6161
[ClassData(typeof(TestCaseFactory))]
6262
public void Run(JsonDrivenTestCase testCase)
6363
{

0 commit comments

Comments
 (0)