diff --git a/CSharpDriver.sln b/CSharpDriver.sln index 7f3ad59846c..e3d1b1323cf 100644 --- a/CSharpDriver.sln +++ b/CSharpDriver.sln @@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D2012971-32B EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E472BDF5-61F1-461D-872B-9F53BB3ACA80}" ProjectSection(SolutionItems) = preProject - tests\Directory.Build.props = tests\Directory.Build.props + tests\BuildProps\Tests.Build.props = tests\BuildProps\Tests.Build.props EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Bson", "src\MongoDB.Bson\MongoDB.Bson.csproj", "{9FCB42A5-3BC6-492B-8EA0-53EF32E9F8CD}" @@ -54,8 +54,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution MongoDBTest.ruleset = MongoDBTest.ruleset EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkippableTests", "tests\SkippableTests\SkippableTests.csproj", "{D198833A-6AC3-4327-8B02-5095455192D0}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.TestConsoleApplication", "tests\MongoDB.Driver.TestConsoleApplication\MongoDB.Driver.TestConsoleApplication.csproj", "{2E5780D2-29A5-483C-9CA2-844F45A66D0C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AstrolabeWorkloadExecutor", "tests\AstrolabeWorkloadExecutor\AstrolabeWorkloadExecutor.csproj", "{B90F025F-89D3-436A-AD78-6AA304A6E240}" @@ -64,6 +62,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.SmokeTests.S EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SmokeTests", "SmokeTests", "{F64BF86A-1EF1-4596-84A6-6B4AB766CD77}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.TestHelpers", "tests\MongoDB.TestHelpers\MongoDB.TestHelpers.csproj", "{DF888021-744F-4A8B-9324-831DEFC48AB8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -134,10 +134,6 @@ Global {7A015030-6329-4FAD-B6E3-CED5ED53019C}.Debug|Any CPU.Build.0 = Debug|Any CPU {7A015030-6329-4FAD-B6E3-CED5ED53019C}.Release|Any CPU.ActiveCfg = Release|Any CPU {7A015030-6329-4FAD-B6E3-CED5ED53019C}.Release|Any CPU.Build.0 = Release|Any CPU - {D198833A-6AC3-4327-8B02-5095455192D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D198833A-6AC3-4327-8B02-5095455192D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D198833A-6AC3-4327-8B02-5095455192D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D198833A-6AC3-4327-8B02-5095455192D0}.Release|Any CPU.Build.0 = Release|Any CPU {2E5780D2-29A5-483C-9CA2-844F45A66D0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2E5780D2-29A5-483C-9CA2-844F45A66D0C}.Debug|Any CPU.Build.0 = Debug|Any CPU {2E5780D2-29A5-483C-9CA2-844F45A66D0C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -150,6 +146,10 @@ Global {B711A69F-A337-452C-95E1-A6B15C727CBA}.Debug|Any CPU.Build.0 = Debug|Any CPU {B711A69F-A337-452C-95E1-A6B15C727CBA}.Release|Any CPU.ActiveCfg = Release|Any CPU {B711A69F-A337-452C-95E1-A6B15C727CBA}.Release|Any CPU.Build.0 = Release|Any CPU + {DF888021-744F-4A8B-9324-831DEFC48AB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DF888021-744F-4A8B-9324-831DEFC48AB8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DF888021-744F-4A8B-9324-831DEFC48AB8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DF888021-744F-4A8B-9324-831DEFC48AB8}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -171,11 +171,11 @@ Global {C50D554C-2771-4CC1-9B2C-BB17FB27F935} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80} {DAB8DFFD-0020-43B3-9C08-7723F5D68E90} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80} {7A015030-6329-4FAD-B6E3-CED5ED53019C} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80} - {D198833A-6AC3-4327-8B02-5095455192D0} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80} {2E5780D2-29A5-483C-9CA2-844F45A66D0C} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80} {B90F025F-89D3-436A-AD78-6AA304A6E240} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80} {B711A69F-A337-452C-95E1-A6B15C727CBA} = {F64BF86A-1EF1-4596-84A6-6B4AB766CD77} {F64BF86A-1EF1-4596-84A6-6B4AB766CD77} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80} + {DF888021-744F-4A8B-9324-831DEFC48AB8} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {24BEC44B-92B0-43AA-9B15-163459D0C098} diff --git a/tests/BuildProps/Tests.Build.props b/tests/BuildProps/Tests.Build.props index e1e65742b58..ca5a8480127 100644 --- a/tests/BuildProps/Tests.Build.props +++ b/tests/BuildProps/Tests.Build.props @@ -12,7 +12,7 @@ $(StandardTargetFrameworks);net472 false - + 10 true @@ -40,13 +40,11 @@ $(DefineConstants);MACOS - - - + diff --git a/tests/MongoDB.Bson.TestHelpers/GuidModeValues.cs b/tests/MongoDB.Bson.TestHelpers/GuidModeValues.cs index 1dd17246ef2..78692150aee 100644 --- a/tests/MongoDB.Bson.TestHelpers/GuidModeValues.cs +++ b/tests/MongoDB.Bson.TestHelpers/GuidModeValues.cs @@ -13,8 +13,8 @@ * limitations under the License. */ -using MongoDB.Bson.TestHelpers.XunitExtensions; using System.Linq; +using MongoDB.TestHelpers.XunitExtensions; namespace MongoDB.Bson.TestHelpers { diff --git a/tests/MongoDB.Bson.TestHelpers/MongoDB.Bson.TestHelpers.csproj b/tests/MongoDB.Bson.TestHelpers/MongoDB.Bson.TestHelpers.csproj index c7e737d0b8b..868cf275e19 100644 --- a/tests/MongoDB.Bson.TestHelpers/MongoDB.Bson.TestHelpers.csproj +++ b/tests/MongoDB.Bson.TestHelpers/MongoDB.Bson.TestHelpers.csproj @@ -18,6 +18,7 @@ + diff --git a/tests/MongoDB.Bson.Tests/IO/ArrayElementNameAcceleratorTests.cs b/tests/MongoDB.Bson.Tests/IO/ArrayElementNameAcceleratorTests.cs index d3e3fb15652..90458f44a1f 100644 --- a/tests/MongoDB.Bson.Tests/IO/ArrayElementNameAcceleratorTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/ArrayElementNameAcceleratorTests.cs @@ -15,7 +15,7 @@ using System; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.IO diff --git a/tests/MongoDB.Bson.Tests/IO/BsonBinaryReaderTests.cs b/tests/MongoDB.Bson.Tests/IO/BsonBinaryReaderTests.cs index 4adc967349e..1dcec7b925c 100644 --- a/tests/MongoDB.Bson.Tests/IO/BsonBinaryReaderTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/BsonBinaryReaderTests.cs @@ -21,14 +21,14 @@ using MongoDB.Bson.IO; using MongoDB.Bson.Serialization; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.IO { public class BsonBinaryReaderTests { - [SkippableFact] + [Fact] public void BsonBinaryReader_should_support_reading_more_than_2GB() { RequireEnvironment.Check().EnvironmentVariable("EXPLICIT"); diff --git a/tests/MongoDB.Bson.Tests/IO/BsonBinaryWriterTests.cs b/tests/MongoDB.Bson.Tests/IO/BsonBinaryWriterTests.cs index ed569cc5d45..82203c21fde 100644 --- a/tests/MongoDB.Bson.Tests/IO/BsonBinaryWriterTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/BsonBinaryWriterTests.cs @@ -18,9 +18,8 @@ using System.Linq; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers; using MongoDB.Bson.TestHelpers.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.IO @@ -53,7 +52,7 @@ public void BsonBinaryWriter_should_support_writing_multiple_documents( } } - [SkippableFact] + [Fact] public void BsonBinaryWriter_should_support_writing_more_than_2GB() { RequireProcess.Check().Bits(64); @@ -78,7 +77,7 @@ public void BsonBinaryWriter_should_support_writing_more_than_2GB() } } - [SkippableFact] + [Fact] public void BackpatchSize_should_throw_when_size_is_larger_than_2GB() { RequireProcess.Check().Bits(64); diff --git a/tests/MongoDB.Bson.Tests/IO/BsonChunkPoolTests.cs b/tests/MongoDB.Bson.Tests/IO/BsonChunkPoolTests.cs index 2defe775b33..bfe39a7d557 100644 --- a/tests/MongoDB.Bson.Tests/IO/BsonChunkPoolTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/BsonChunkPoolTests.cs @@ -21,7 +21,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.IO diff --git a/tests/MongoDB.Bson.Tests/IO/BsonDocumentReaderTests.cs b/tests/MongoDB.Bson.Tests/IO/BsonDocumentReaderTests.cs index 07bef0a3fbf..7dca4f29c63 100644 --- a/tests/MongoDB.Bson.Tests/IO/BsonDocumentReaderTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/BsonDocumentReaderTests.cs @@ -19,7 +19,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.IO diff --git a/tests/MongoDB.Bson.Tests/IO/BsonStreamAdapterTests.cs b/tests/MongoDB.Bson.Tests/IO/BsonStreamAdapterTests.cs index 34dcfeabfb2..0f752c6f5b6 100644 --- a/tests/MongoDB.Bson.Tests/IO/BsonStreamAdapterTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/BsonStreamAdapterTests.cs @@ -21,7 +21,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Bson.Tests/IO/BsonStreamExtensionsTests.cs b/tests/MongoDB.Bson.Tests/IO/BsonStreamExtensionsTests.cs index dcf6d272f4f..1a17564d5c2 100644 --- a/tests/MongoDB.Bson.Tests/IO/BsonStreamExtensionsTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/BsonStreamExtensionsTests.cs @@ -19,7 +19,7 @@ using System.Reflection; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Bson.Tests/IO/BsonWriterTests.cs b/tests/MongoDB.Bson.Tests/IO/BsonWriterTests.cs index 3f2f149394f..643f7321f6b 100644 --- a/tests/MongoDB.Bson.Tests/IO/BsonWriterTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/BsonWriterTests.cs @@ -18,7 +18,7 @@ using System.Linq; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Bson.Tests/IO/ByteArrayBufferTests.cs b/tests/MongoDB.Bson.Tests/IO/ByteArrayBufferTests.cs index bc81535a860..af5208910e4 100644 --- a/tests/MongoDB.Bson.Tests/IO/ByteArrayBufferTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/ByteArrayBufferTests.cs @@ -18,7 +18,7 @@ using System.Reflection; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.IO diff --git a/tests/MongoDB.Bson.Tests/IO/ByteArrayChunkTests.cs b/tests/MongoDB.Bson.Tests/IO/ByteArrayChunkTests.cs index 9160aa48120..4e45b31c18e 100644 --- a/tests/MongoDB.Bson.Tests/IO/ByteArrayChunkTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/ByteArrayChunkTests.cs @@ -17,7 +17,7 @@ using System.Reflection; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.IO diff --git a/tests/MongoDB.Bson.Tests/IO/ByteBufferFactoryTests.cs b/tests/MongoDB.Bson.Tests/IO/ByteBufferFactoryTests.cs index dca061b1663..7af07ae9267 100644 --- a/tests/MongoDB.Bson.Tests/IO/ByteBufferFactoryTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/ByteBufferFactoryTests.cs @@ -20,7 +20,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Bson.Tests/IO/ByteBufferSliceTests.cs b/tests/MongoDB.Bson.Tests/IO/ByteBufferSliceTests.cs index 308ae40d1af..d0d42b6c608 100644 --- a/tests/MongoDB.Bson.Tests/IO/ByteBufferSliceTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/ByteBufferSliceTests.cs @@ -21,7 +21,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Bson.Tests/IO/ByteBufferStreamTests.cs b/tests/MongoDB.Bson.Tests/IO/ByteBufferStreamTests.cs index 4acadc1173f..b9d2e1d61b0 100644 --- a/tests/MongoDB.Bson.Tests/IO/ByteBufferStreamTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/ByteBufferStreamTests.cs @@ -20,7 +20,7 @@ using System.Reflection; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; @@ -272,7 +272,7 @@ public void Position_set_should_throw_when_subject_is_disposed() action.ShouldThrow().And.ObjectName.Should().Be("ByteBufferStream"); } - [SkippableFact] + [Fact] public void PrepareToWrite_should_throw_when_stream_would_exceed_2GB() { RequireProcess.Check().Bits(64); diff --git a/tests/MongoDB.Bson.Tests/IO/CStringUtf8EncodingTests.cs b/tests/MongoDB.Bson.Tests/IO/CStringUtf8EncodingTests.cs index 1c984cb3a8b..c0c95d9046b 100644 --- a/tests/MongoDB.Bson.Tests/IO/CStringUtf8EncodingTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/CStringUtf8EncodingTests.cs @@ -18,7 +18,7 @@ using FluentAssertions; using MongoDB.Bson.IO; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.IO diff --git a/tests/MongoDB.Bson.Tests/IO/EncodingHelperTests.cs b/tests/MongoDB.Bson.Tests/IO/EncodingHelperTests.cs index 93996067d63..45eb62034c8 100644 --- a/tests/MongoDB.Bson.Tests/IO/EncodingHelperTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/EncodingHelperTests.cs @@ -19,7 +19,7 @@ using FluentAssertions; using MongoDB.Bson.IO; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.IO diff --git a/tests/MongoDB.Bson.Tests/IO/InputBufferChunkSourceTests.cs b/tests/MongoDB.Bson.Tests/IO/InputBufferChunkSourceTests.cs index fd1e1d4362a..1d9db95f058 100644 --- a/tests/MongoDB.Bson.Tests/IO/InputBufferChunkSourceTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/InputBufferChunkSourceTests.cs @@ -17,7 +17,7 @@ using System.Reflection; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Bson.Tests/IO/JsonReaderTests.cs b/tests/MongoDB.Bson.Tests/IO/JsonReaderTests.cs index 50ec4fbf87a..76c31fa01cd 100644 --- a/tests/MongoDB.Bson.Tests/IO/JsonReaderTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/JsonReaderTests.cs @@ -22,7 +22,7 @@ using MongoDB.Bson.IO; using MongoDB.Bson.Serialization; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.IO diff --git a/tests/MongoDB.Bson.Tests/IO/JsonWriterTests.cs b/tests/MongoDB.Bson.Tests/IO/JsonWriterTests.cs index e0b5337f8bd..b40c21b84b2 100644 --- a/tests/MongoDB.Bson.Tests/IO/JsonWriterTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/JsonWriterTests.cs @@ -22,7 +22,7 @@ using MongoDB.Bson.IO; using MongoDB.Bson.Serialization; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.IO @@ -213,7 +213,7 @@ public void TestDouble() } } - [SkippableFact] + [Fact] public void TestDoubleRoundTripOn64BitProcess() { RequireProcess.Check().Bits(64); diff --git a/tests/MongoDB.Bson.Tests/IO/MultiChunkBufferTests.cs b/tests/MongoDB.Bson.Tests/IO/MultiChunkBufferTests.cs index 0f1e0569f73..e28e95acf32 100644 --- a/tests/MongoDB.Bson.Tests/IO/MultiChunkBufferTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/MultiChunkBufferTests.cs @@ -20,7 +20,7 @@ using FluentAssertions; using MongoDB.Bson.IO; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; @@ -432,7 +432,7 @@ public void EnsureCapacity_should_throw_when_subject_is_read_only() action.ShouldThrow(); } - [SkippableFact] + [Fact] public void ExpandCapacity_should_throw_when_expanded_capacity_exceeds_2GB() { RequireProcess.Check().Bits(64); diff --git a/tests/MongoDB.Bson.Tests/IO/OutputBufferChunkSourceTests.cs b/tests/MongoDB.Bson.Tests/IO/OutputBufferChunkSourceTests.cs index f96e1df5fde..843f7ec6201 100644 --- a/tests/MongoDB.Bson.Tests/IO/OutputBufferChunkSourceTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/OutputBufferChunkSourceTests.cs @@ -21,7 +21,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Bson.Tests/IO/SingleChunkBufferTests.cs b/tests/MongoDB.Bson.Tests/IO/SingleChunkBufferTests.cs index 322feb46fff..5c9ef93fd0a 100644 --- a/tests/MongoDB.Bson.Tests/IO/SingleChunkBufferTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/SingleChunkBufferTests.cs @@ -21,7 +21,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Bson.Tests/IO/ThreadStaticBufferTests.cs b/tests/MongoDB.Bson.Tests/IO/ThreadStaticBufferTests.cs index 1d16372e099..38f6bd2dbf7 100644 --- a/tests/MongoDB.Bson.Tests/IO/ThreadStaticBufferTests.cs +++ b/tests/MongoDB.Bson.Tests/IO/ThreadStaticBufferTests.cs @@ -20,7 +20,7 @@ using FluentAssertions; using MongoDB.Bson.IO; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.IO diff --git a/tests/MongoDB.Bson.Tests/Jira/CSharp147Tests.cs b/tests/MongoDB.Bson.Tests/Jira/CSharp147Tests.cs index 690dd80cb71..87274e4bdbb 100644 --- a/tests/MongoDB.Bson.Tests/Jira/CSharp147Tests.cs +++ b/tests/MongoDB.Bson.Tests/Jira/CSharp147Tests.cs @@ -18,7 +18,7 @@ using MongoDB.Bson.IO; using MongoDB.Bson.Serialization; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Jira.CSharp147 diff --git a/tests/MongoDB.Bson.Tests/Jira/CSharp275Tests.cs b/tests/MongoDB.Bson.Tests/Jira/CSharp275Tests.cs index 1b371e85314..64566845177 100644 --- a/tests/MongoDB.Bson.Tests/Jira/CSharp275Tests.cs +++ b/tests/MongoDB.Bson.Tests/Jira/CSharp275Tests.cs @@ -15,7 +15,7 @@ using System; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Jira diff --git a/tests/MongoDB.Bson.Tests/ObjectModel/BsonArrayTests.cs b/tests/MongoDB.Bson.Tests/ObjectModel/BsonArrayTests.cs index 73e3aaab53f..206687cb210 100644 --- a/tests/MongoDB.Bson.Tests/ObjectModel/BsonArrayTests.cs +++ b/tests/MongoDB.Bson.Tests/ObjectModel/BsonArrayTests.cs @@ -17,6 +17,7 @@ using System.Linq; using MongoDB.Bson; using Xunit; +using Xunit.Sdk; namespace MongoDB.Bson.Tests { diff --git a/tests/MongoDB.Bson.Tests/ObjectModel/BsonBinaryDataTests.cs b/tests/MongoDB.Bson.Tests/ObjectModel/BsonBinaryDataTests.cs index 62f28d71991..8e73f9c1039 100644 --- a/tests/MongoDB.Bson.Tests/ObjectModel/BsonBinaryDataTests.cs +++ b/tests/MongoDB.Bson.Tests/ObjectModel/BsonBinaryDataTests.cs @@ -17,7 +17,7 @@ using System.Linq; using FluentAssertions; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests diff --git a/tests/MongoDB.Bson.Tests/ObjectModel/BsonBooleanTests.cs b/tests/MongoDB.Bson.Tests/ObjectModel/BsonBooleanTests.cs index a760bdd1036..c7bf1a680c1 100644 --- a/tests/MongoDB.Bson.Tests/ObjectModel/BsonBooleanTests.cs +++ b/tests/MongoDB.Bson.Tests/ObjectModel/BsonBooleanTests.cs @@ -19,7 +19,7 @@ using System.Text; using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.ObjectModel diff --git a/tests/MongoDB.Bson.Tests/ObjectModel/BsonDocumentTests.cs b/tests/MongoDB.Bson.Tests/ObjectModel/BsonDocumentTests.cs index 5469025d738..9489c93a7e6 100644 --- a/tests/MongoDB.Bson.Tests/ObjectModel/BsonDocumentTests.cs +++ b/tests/MongoDB.Bson.Tests/ObjectModel/BsonDocumentTests.cs @@ -25,7 +25,7 @@ using MongoDB.Bson.Serialization.IdGenerators; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests diff --git a/tests/MongoDB.Bson.Tests/ObjectModel/BsonDoubleTests.cs b/tests/MongoDB.Bson.Tests/ObjectModel/BsonDoubleTests.cs index 067468a8364..da4f828f528 100644 --- a/tests/MongoDB.Bson.Tests/ObjectModel/BsonDoubleTests.cs +++ b/tests/MongoDB.Bson.Tests/ObjectModel/BsonDoubleTests.cs @@ -14,12 +14,8 @@ */ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.ObjectModel diff --git a/tests/MongoDB.Bson.Tests/ObjectModel/BsonInt32Tests.cs b/tests/MongoDB.Bson.Tests/ObjectModel/BsonInt32Tests.cs index cc2c7f17c5a..269daef31f3 100644 --- a/tests/MongoDB.Bson.Tests/ObjectModel/BsonInt32Tests.cs +++ b/tests/MongoDB.Bson.Tests/ObjectModel/BsonInt32Tests.cs @@ -14,12 +14,8 @@ */ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.ObjectModel diff --git a/tests/MongoDB.Bson.Tests/ObjectModel/BsonInt64Tests.cs b/tests/MongoDB.Bson.Tests/ObjectModel/BsonInt64Tests.cs index c7ad86422c9..5f13a6294af 100644 --- a/tests/MongoDB.Bson.Tests/ObjectModel/BsonInt64Tests.cs +++ b/tests/MongoDB.Bson.Tests/ObjectModel/BsonInt64Tests.cs @@ -14,12 +14,8 @@ */ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.ObjectModel diff --git a/tests/MongoDB.Bson.Tests/ObjectModel/BsonStringTests.cs b/tests/MongoDB.Bson.Tests/ObjectModel/BsonStringTests.cs index 5fc230732bf..c21faa2de10 100644 --- a/tests/MongoDB.Bson.Tests/ObjectModel/BsonStringTests.cs +++ b/tests/MongoDB.Bson.Tests/ObjectModel/BsonStringTests.cs @@ -19,7 +19,7 @@ using System.Text; using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.ObjectModel diff --git a/tests/MongoDB.Bson.Tests/ObjectModel/BsonTypeMapperTests.cs b/tests/MongoDB.Bson.Tests/ObjectModel/BsonTypeMapperTests.cs index f6d9d66a081..bc9d3711efe 100644 --- a/tests/MongoDB.Bson.Tests/ObjectModel/BsonTypeMapperTests.cs +++ b/tests/MongoDB.Bson.Tests/ObjectModel/BsonTypeMapperTests.cs @@ -18,7 +18,7 @@ using System.Text.RegularExpressions; using FluentAssertions; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests diff --git a/tests/MongoDB.Bson.Tests/ObjectModel/BsonValueTests.cs b/tests/MongoDB.Bson.Tests/ObjectModel/BsonValueTests.cs index eb7b347a093..43788b12a7e 100644 --- a/tests/MongoDB.Bson.Tests/ObjectModel/BsonValueTests.cs +++ b/tests/MongoDB.Bson.Tests/ObjectModel/BsonValueTests.cs @@ -18,7 +18,7 @@ using System.Text.RegularExpressions; using FluentAssertions; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests diff --git a/tests/MongoDB.Bson.Tests/ObjectModel/LazyBsonDocumentTests.cs b/tests/MongoDB.Bson.Tests/ObjectModel/LazyBsonDocumentTests.cs index 97a2b08b257..9d81840ae3b 100644 --- a/tests/MongoDB.Bson.Tests/ObjectModel/LazyBsonDocumentTests.cs +++ b/tests/MongoDB.Bson.Tests/ObjectModel/LazyBsonDocumentTests.cs @@ -19,7 +19,7 @@ using System.Linq; using MongoDB.Bson; using MongoDB.Bson.Serialization; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests @@ -853,7 +853,7 @@ public void TestValues() } } - [SkippableFact] + [Fact] public void TestLargeDocumentDeserialization() { RequireProcess.Check().Bits(64); diff --git a/tests/MongoDB.Bson.Tests/ObjectModel/RawBsonArrayTests.cs b/tests/MongoDB.Bson.Tests/ObjectModel/RawBsonArrayTests.cs index 67b5714b7c2..b748bd57cf5 100644 --- a/tests/MongoDB.Bson.Tests/ObjectModel/RawBsonArrayTests.cs +++ b/tests/MongoDB.Bson.Tests/ObjectModel/RawBsonArrayTests.cs @@ -19,7 +19,7 @@ using MongoDB.Bson; using MongoDB.Bson.IO; using MongoDB.Bson.Serialization; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests diff --git a/tests/MongoDB.Bson.Tests/PowerOf2Tests.cs b/tests/MongoDB.Bson.Tests/PowerOf2Tests.cs index 55992fbec77..1c8fa00a027 100644 --- a/tests/MongoDB.Bson.Tests/PowerOf2Tests.cs +++ b/tests/MongoDB.Bson.Tests/PowerOf2Tests.cs @@ -19,7 +19,7 @@ using System.Text; using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests diff --git a/tests/MongoDB.Bson.Tests/Properties/AssemblyInfo.cs b/tests/MongoDB.Bson.Tests/Properties/AssemblyInfo.cs index cc39fd111c9..de81526bc77 100644 --- a/tests/MongoDB.Bson.Tests/Properties/AssemblyInfo.cs +++ b/tests/MongoDB.Bson.Tests/Properties/AssemblyInfo.cs @@ -14,5 +14,9 @@ */ using System.Runtime.InteropServices; +using MongoDB.TestHelpers.XunitExtensions; +using Xunit; [assembly: ComVisible(false)] + +[assembly: TestFramework(XunitExtensionsConstants.TimeoutEnforcingXunitFramework, XunitExtensionsConstants.TimeoutEnforcingFrameworkAssembly)] diff --git a/tests/MongoDB.Bson.Tests/Serialization/Conventions/ConventionRunnerTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Conventions/ConventionRunnerTests.cs index 913b74e2555..f86afe3836a 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Conventions/ConventionRunnerTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Conventions/ConventionRunnerTests.cs @@ -18,7 +18,7 @@ using System.Threading; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Conventions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Serialization.Conventions diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/BsonBinaryDataSerializerTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/BsonBinaryDataSerializerTests.cs index 1bc319213ba..e970e7e3c33 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/BsonBinaryDataSerializerTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/BsonBinaryDataSerializerTests.cs @@ -18,7 +18,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/BsonPrimitiveSerializerTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/BsonPrimitiveSerializerTests.cs index c2a6ff4a22f..75c18bfbf9d 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/BsonPrimitiveSerializerTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/BsonPrimitiveSerializerTests.cs @@ -21,7 +21,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Serialization.Serializers diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/BsonValueSerializerTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/BsonValueSerializerTests.cs index 3e8fafcd97a..1278d851aa6 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/BsonValueSerializerTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/BsonValueSerializerTests.cs @@ -23,7 +23,7 @@ using MongoDB.Bson.Serialization.IdGenerators; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Serialization diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/CollectionSerializerGenericTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/CollectionSerializerGenericTests.cs index 42d1cacc9f0..ff17df7b79f 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/CollectionSerializerGenericTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/CollectionSerializerGenericTests.cs @@ -21,7 +21,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Serialization.CollectionSerializersGeneric diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/CollectionSerializerTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/CollectionSerializerTests.cs index 4e0dd270cc1..ab5a2a99954 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/CollectionSerializerTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/CollectionSerializerTests.cs @@ -21,7 +21,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Serialization.CollectionSerializers diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/DateTimeOffsetSerializerTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/DateTimeOffsetSerializerTests.cs index 5da703412a8..ac91c84c25b 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/DateTimeOffsetSerializerTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/DateTimeOffsetSerializerTests.cs @@ -19,7 +19,7 @@ using MongoDB.Bson.IO; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Serialization.Serializers diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/DictionaryGenericSerializerTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/DictionaryGenericSerializerTests.cs index 191fa8484a3..e7646e5a181 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/DictionaryGenericSerializerTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/DictionaryGenericSerializerTests.cs @@ -23,7 +23,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Serialization.DictionaryGenericSerializers diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/DictionarySerializerTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/DictionarySerializerTests.cs index 877d14fbed6..5f8a493abc4 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/DictionarySerializerTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/DictionarySerializerTests.cs @@ -24,7 +24,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Serialization.DictionarySerializers diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/ElementAppendingSerializerTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/ElementAppendingSerializerTests.cs index 7314e09713f..d99e1422699 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/ElementAppendingSerializerTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/ElementAppendingSerializerTests.cs @@ -22,8 +22,8 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; using MongoDB.Bson.Tests.IO; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/EnumSerializerTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/EnumSerializerTests.cs index 870837ad841..e18902601bf 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/EnumSerializerTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/EnumSerializerTests.cs @@ -20,7 +20,7 @@ using MongoDB.Bson.IO; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Serialization.Serializers diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/ExtraElementsTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/ExtraElementsTests.cs index 4dccbae5319..2b299ba3ae2 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/ExtraElementsTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/ExtraElementsTests.cs @@ -20,7 +20,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Serialization diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/ExtraElementsWithImmutableClassTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/ExtraElementsWithImmutableClassTests.cs index 5ba59182f00..6b039feb85c 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/ExtraElementsWithImmutableClassTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/ExtraElementsWithImmutableClassTests.cs @@ -20,7 +20,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Serialization diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/ExtraElementsWithPartiallyImmutableClassTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/ExtraElementsWithPartiallyImmutableClassTests.cs index eb85b68e6d3..bf24e6df7e4 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/ExtraElementsWithPartiallyImmutableClassTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/ExtraElementsWithPartiallyImmutableClassTests.cs @@ -20,7 +20,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Serialization diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/GuidSerializerTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/GuidSerializerTests.cs index 6fe7536bc53..c90a0ab3ddb 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/GuidSerializerTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/GuidSerializerTests.cs @@ -21,7 +21,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Serialization.Serializers diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/NullableTypeSerializerTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/NullableTypeSerializerTests.cs index 3ee1b8c4d26..5e6317fc67e 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/NullableTypeSerializerTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/NullableTypeSerializerTests.cs @@ -21,7 +21,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Bson.Tests.Serialization diff --git a/tests/MongoDB.Bson.Tests/Serialization/Serializers/ObjectSerializerTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Serializers/ObjectSerializerTests.cs index 4dbd44412db..a7da6c543fd 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Serializers/ObjectSerializerTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Serializers/ObjectSerializerTests.cs @@ -23,9 +23,11 @@ using MongoDB.Bson.Serialization.Conventions; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; +using Xunit.Sdk; +using Reflector = MongoDB.Bson.TestHelpers.Reflector; namespace MongoDB.Bson.Tests.Serialization { @@ -320,7 +322,7 @@ public void constructor_with_discriminator_convention_and_guid_representation_sh e.ParamName.Should().Be("discriminatorConvention"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] [ResetGuidModeAfterTest] public void Deserialize_binary_data_should_return_expected_result_when_guid_representation_is_unspecified_and_mode_is_v2( @@ -462,7 +464,7 @@ public void Deserialize_binary_data_should_throw_when_guid_representation_is_spe #pragma warning restore 618 } - [SkippableTheory] + [Theory] [ParameterAttributeData] [ResetGuidModeAfterTest] public void Serialize_guid_should_have_expected_result_when_guid_representation_is_unspecified_and_mode_is_v2( diff --git a/tests/MongoDB.Driver.Core.TestHelpers/Logging/LoggableTestClass.cs b/tests/MongoDB.Driver.Core.TestHelpers/Logging/LoggableTestClass.cs index 7a8067e9b3b..56ba6b4e1ee 100644 --- a/tests/MongoDB.Driver.Core.TestHelpers/Logging/LoggableTestClass.cs +++ b/tests/MongoDB.Driver.Core.TestHelpers/Logging/LoggableTestClass.cs @@ -18,6 +18,7 @@ using System.Linq; using Microsoft.Diagnostics.Runtime; using Microsoft.Extensions.Logging; +using MongoDB.TestHelpers.XunitExtensions.TimeoutEnforcing; using MongoDB.Driver.Core.Configuration; using MongoDB.Driver.Core.Events; using MongoDB.Driver.Core.Logging; @@ -28,7 +29,7 @@ namespace MongoDB.Driver.Core.TestHelpers.Logging { [DebuggerStepThrough] - public abstract class LoggableTestClass : IDisposable, ILoggingService + public abstract class LoggableTestClass : IDisposable, ILoggingService, ITestExceptionHandler { public LoggableTestClass(ITestOutputHelper output, bool includeAllCategories = false) { @@ -63,28 +64,6 @@ private protected EventLogger CreateEventLogger(IEventSubs protected virtual void DisposeInternal() { } - public void OnException(Exception ex) - { - TestOutput.WriteLine("Formatted exception: {0}", FormatException(ex)); - - if (ex is TestTimeoutException) - { - try - { - LogStackTrace(); - } - catch - { - // fail silently - } - } - - if (MinLogLevel > LogLevel.Debug) - { - MinLogLevel = LogLevel.Debug; - } - } - public void Dispose() { DisposeInternal(); @@ -124,6 +103,28 @@ private string FormatException(Exception exception) return result; } + public void HandleException(Exception ex) + { + TestOutput.WriteLine("Formatted exception: {0}", FormatException(ex)); + + if (ex is TestTimeoutException) + { + try + { + LogStackTrace(); + } + catch + { + // fail silently + } + } + + if (MinLogLevel > LogLevel.Debug) + { + MinLogLevel = LogLevel.Debug; + } + } + private void LogStackTrace() { var pid = Process.GetCurrentProcess().Id; diff --git a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/RequirePlatform.cs b/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/RequirePlatform.cs index 12b93101a89..a9cd9082e5f 100644 --- a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/RequirePlatform.cs +++ b/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/RequirePlatform.cs @@ -16,6 +16,7 @@ using System; using System.Linq; using Xunit; +using Xunit.Sdk; namespace MongoDB.Driver.TestHelpers { diff --git a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/RequireServer.cs b/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/RequireServer.cs index 86298bcd651..b90c4c25f18 100644 --- a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/RequireServer.cs +++ b/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/RequireServer.cs @@ -19,6 +19,7 @@ using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using Xunit; +using Xunit.Sdk; namespace MongoDB.Driver.Core.TestHelpers.XunitExtensions { diff --git a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/XunitExtensionsConsts.cs b/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/XunitExtensionsConsts.cs deleted file mode 100644 index 518dd19a459..00000000000 --- a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/XunitExtensionsConsts.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace MongoDB.Driver.Core.TestHelpers.XunitExtensions -{ - public static class XunitExtensionsConsts - { - public const string TimeoutEnforcingXunitFramework = "MongoDB.Driver.Core.TestHelpers.XunitExtensions.TimeoutEnforcing.TimeoutEnforcingXunitTestFramework"; - public const string TimeoutEnforcingFrameworkAssembly = "MongoDB.Driver.Core.TestHelpers"; - } -} diff --git a/tests/MongoDB.Driver.Core.Tests/BatchTransformingAsyncCursorTests.cs b/tests/MongoDB.Driver.Core.Tests/BatchTransformingAsyncCursorTests.cs index b6118bfb4b0..894b156e2a2 100644 --- a/tests/MongoDB.Driver.Core.Tests/BatchTransformingAsyncCursorTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/BatchTransformingAsyncCursorTests.cs @@ -21,7 +21,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver diff --git a/tests/MongoDB.Driver.Core.Tests/CollationTests.cs b/tests/MongoDB.Driver.Core.Tests/CollationTests.cs index 2d8cdc6ea7a..aecade5d9ae 100644 --- a/tests/MongoDB.Driver.Core.Tests/CollationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/CollationTests.cs @@ -21,7 +21,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/AuthenticationHelperTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/AuthenticationHelperTests.cs index 67b9e450cf6..1d5d4ff401e 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/AuthenticationHelperTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/AuthenticationHelperTests.cs @@ -19,7 +19,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Configuration; using MongoDB.Driver.Core.Connections; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/CacheableCredentialsProviderTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/CacheableCredentialsProviderTests.cs index e899cdbbae2..2feec20a532 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/CacheableCredentialsProviderTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/CacheableCredentialsProviderTests.cs @@ -18,7 +18,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Authentication.External; using MongoDB.Driver.Core.Misc; using Moq; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/Libgssapi/GssapiSecurityCredentialTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/Libgssapi/GssapiSecurityCredentialTests.cs index a7cc1f0f3a9..85fe729cdce 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/Libgssapi/GssapiSecurityCredentialTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/Libgssapi/GssapiSecurityCredentialTests.cs @@ -15,7 +15,7 @@ using System; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Authentication.Libgssapi; using MongoDB.Driver.Core.Misc; using Xunit; @@ -40,7 +40,7 @@ public GssapiSecurityCredentialTests() } } - [SkippableFact] + [Fact] public void Should_acquire_gssapi_security_credential_with_username_and_password() { RequireEnvironment.Check().EnvironmentVariable("GSSAPI_TESTS_ENABLED"); @@ -50,7 +50,7 @@ public void Should_acquire_gssapi_security_credential_with_username_and_password credential.Should().NotBeNull(); } - [SkippableFact] + [Fact] public void Should_acquire_gssapi_security_credential_with_username_only() { RequireEnvironment.Check().EnvironmentVariable("GSSAPI_TESTS_ENABLED"); @@ -59,7 +59,7 @@ public void Should_acquire_gssapi_security_credential_with_username_only() credential.Should().NotBeNull(); } - [SkippableFact] + [Fact] public void Should_fail_to_acquire_gssapi_security_credential_with_username_and_bad_password() { RequireEnvironment.Check().EnvironmentVariable("GSSAPI_TESTS_ENABLED"); diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoAWSAuthenticatorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoAWSAuthenticatorTests.cs index ff05c2d3e17..bc98cfe7d25 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoAWSAuthenticatorTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoAWSAuthenticatorTests.cs @@ -19,7 +19,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Authentication; using MongoDB.Driver.Core.Authentication.External; using MongoDB.Driver.Core.Clusters; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoDBCRAuthenticatorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoDBCRAuthenticatorTests.cs index 0f0c22cdd48..123e9ee099f 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoDBCRAuthenticatorTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoDBCRAuthenticatorTests.cs @@ -18,7 +18,6 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Connections; using MongoDB.Driver.Core.Helpers; @@ -26,6 +25,7 @@ using MongoDB.Driver.Core.Servers; using MongoDB.Driver.Core.TestHelpers; using MongoDB.Driver.Core.WireProtocol.Messages; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; 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 3dbef36d372..8590e42987c 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoDBX509AuthenticatorTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/MongoDBX509AuthenticatorTests.cs @@ -18,7 +18,6 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Connections; using MongoDB.Driver.Core.Helpers; @@ -26,6 +25,7 @@ using MongoDB.Driver.Core.Servers; using MongoDB.Driver.Core.TestHelpers; using MongoDB.Driver.Core.WireProtocol.Messages; +using MongoDB.TestHelpers.XunitExtensions; 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 680c68ae38d..481ac1e05a5 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/PlainAuthenticatorTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/PlainAuthenticatorTests.cs @@ -18,7 +18,6 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Connections; using MongoDB.Driver.Core.Helpers; @@ -26,6 +25,7 @@ using MongoDB.Driver.Core.Servers; using MongoDB.Driver.Core.TestHelpers; using MongoDB.Driver.Core.WireProtocol.Messages; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.Authentication diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/SaslPrepHelperTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/SaslPrepHelperTests.cs index a719fdf2742..d5c9781e8b0 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/SaslPrepHelperTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/SaslPrepHelperTests.cs @@ -15,7 +15,7 @@ using FluentAssertions; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using System; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/ScramSha1AuthenticatorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/ScramSha1AuthenticatorTests.cs index f8205860cb5..0ab870448e6 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/ScramSha1AuthenticatorTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/ScramSha1AuthenticatorTests.cs @@ -25,7 +25,7 @@ using MongoDB.Driver.Core.Misc; using Xunit; using MongoDB.Driver.Core.Connections; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using System.Linq; using MongoDB.Driver.Core.TestHelpers; using MongoDB.Driver.Core.WireProtocol.Messages; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/ScramSha256AuthenticatorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/ScramSha256AuthenticatorTests.cs index b14a14319e6..813da638541 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Authentication/ScramSha256AuthenticatorTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Authentication/ScramSha256AuthenticatorTests.cs @@ -27,7 +27,7 @@ using MongoDB.Driver.Core.WireProtocol.Messages; using Xunit; using MongoDB.Driver.Core.Connections; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using System.Linq; using MongoDB.Driver.Core.TestHelpers; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelChannelSourceTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelChannelSourceTests.cs index a3fdc367a5c..76a12582048 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelChannelSourceTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelChannelSourceTests.cs @@ -17,7 +17,7 @@ using System.Reflection; using System.Threading; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Servers; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelReadBindingTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelReadBindingTests.cs index b28f7a525bf..9d5e6b99131 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelReadBindingTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelReadBindingTests.cs @@ -21,7 +21,7 @@ using System.Threading; using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Servers; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelReadWriteBindingTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelReadWriteBindingTests.cs index 3f5bbde5905..9d39d692f18 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelReadWriteBindingTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelReadWriteBindingTests.cs @@ -21,7 +21,7 @@ using System.Threading; using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Servers; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelSourceHandleTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelSourceHandleTests.cs index 9021c838836..212ca5f46d9 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelSourceHandleTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelSourceHandleTests.cs @@ -17,7 +17,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelSourceReadWriteBindingTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelSourceReadWriteBindingTests.cs index 08a98eab850..d00f0151e47 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelSourceReadWriteBindingTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ChannelSourceReadWriteBindingTests.cs @@ -16,7 +16,7 @@ using System; using System.Threading; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using Moq; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/CoreSessionOptionsTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/CoreSessionOptionsTests.cs index 44d32ced977..e9662a4b536 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/CoreSessionOptionsTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/CoreSessionOptionsTests.cs @@ -14,7 +14,7 @@ */ using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.Bindings diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/CoreSessionTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/CoreSessionTests.cs index 5d187e9c382..4df1c661b3b 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/CoreSessionTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/CoreSessionTests.cs @@ -21,7 +21,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.Servers; @@ -226,7 +226,7 @@ public void Dispose_should_have_expected_result( Mock.Get(subject.ServerSession).Verify(m => m.Dispose(), Times.Once); } - [SkippableFact] + [Fact] public void StartTransaction_should_throw_when_write_concern_is_unacknowledged() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet).Supports(Feature.Transactions); diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/CoreTransactionTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/CoreTransactionTests.cs index 0776dbdc19a..d43abf48d2c 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/CoreTransactionTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/CoreTransactionTests.cs @@ -19,7 +19,7 @@ using System.Text; using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.Bindings diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/NoCoreServerSessionTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/NoCoreServerSessionTests.cs index a8bb074f07f..d04ae632cd4 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/NoCoreServerSessionTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/NoCoreServerSessionTests.cs @@ -14,7 +14,7 @@ */ using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.Bindings diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/NoCoreSessionTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/NoCoreSessionTests.cs index e223a7df144..ddfdf2e8946 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/NoCoreSessionTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/NoCoreSessionTests.cs @@ -17,7 +17,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.Bindings diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ReadBindingHandleTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ReadBindingHandleTests.cs index 06096798231..d26b05ff749 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ReadBindingHandleTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ReadBindingHandleTests.cs @@ -16,7 +16,7 @@ using System; using System.Threading; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ReadPreferenceBindingTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ReadPreferenceBindingTests.cs index dc4dd76fce0..6f6468e5dbc 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ReadPreferenceBindingTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ReadPreferenceBindingTests.cs @@ -19,7 +19,7 @@ using System.Threading; using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Clusters.ServerSelectors; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ReadWriteBindingHandleTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ReadWriteBindingHandleTests.cs index 0f1345975d8..33f36397c1b 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ReadWriteBindingHandleTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ReadWriteBindingHandleTests.cs @@ -16,7 +16,7 @@ using System; using System.Threading; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ServerChannelSourceTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ServerChannelSourceTests.cs index 1adddd53453..9b20a631e7b 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ServerChannelSourceTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/ServerChannelSourceTests.cs @@ -26,7 +26,7 @@ using MongoDB.Driver.Core.Helpers; using Moq; using Xunit; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; namespace MongoDB.Driver.Core.Bindings { diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/SingleServerReadBindingTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/SingleServerReadBindingTests.cs index 9aee543a620..d731608be10 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/SingleServerReadBindingTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/SingleServerReadBindingTests.cs @@ -18,7 +18,7 @@ using System.Reflection; using System.Threading; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Servers; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/SingleServerReadWriteBindingTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/SingleServerReadWriteBindingTests.cs index 4bfd753457c..5260dfb8cee 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/SingleServerReadWriteBindingTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/SingleServerReadWriteBindingTests.cs @@ -21,7 +21,7 @@ using System.Threading; using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Servers; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/WritableServerBindingTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/WritableServerBindingTests.cs index 5f2dcd0b8d6..9ee482c2f6a 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Bindings/WritableServerBindingTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Bindings/WritableServerBindingTests.cs @@ -20,7 +20,7 @@ using System.Threading; using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Clusters.ServerSelectors; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ClusterDescriptionTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ClusterDescriptionTests.cs index 321733d4a47..0419ca12cc1 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ClusterDescriptionTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ClusterDescriptionTests.cs @@ -16,7 +16,7 @@ using System; using System.Net; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Helpers; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.Servers; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ClusterTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ClusterTests.cs index b846811eb85..58dc3b23afd 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ClusterTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ClusterTests.cs @@ -23,7 +23,7 @@ using FluentAssertions; using Microsoft.Extensions.Logging; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters.ServerSelectors; using MongoDB.Driver.Core.Configuration; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/LoadBalancedClusterTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/LoadBalancedClusterTests.cs index 2615d08fa64..a5d0e6d6f2a 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/LoadBalancedClusterTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/LoadBalancedClusterTests.cs @@ -19,7 +19,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Clusters.ServerSelectors; using MongoDB.Driver.Core.Configuration; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/SingleServerClusterTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/SingleServerClusterTests.cs index 8a4768cfcca..09b9ee76a3e 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/SingleServerClusterTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/SingleServerClusterTests.cs @@ -17,7 +17,7 @@ using System.Linq; using System.Net; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Configuration; using MongoDB.Driver.Core.Events; using MongoDB.Driver.Core.Servers; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Compression/CompressorsTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Compression/CompressorsTests.cs index bfe22209431..9f5e0529750 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Compression/CompressorsTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Compression/CompressorsTests.cs @@ -19,7 +19,7 @@ using System.Text; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Compression; using SharpCompress.IO; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ClusterSettingsTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ClusterSettingsTests.cs index 7295d6f9a58..5cb824910ac 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ClusterSettingsTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ClusterSettingsTests.cs @@ -18,7 +18,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson.TestHelpers.EqualityComparers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ConnectionPoolSettingsTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ConnectionPoolSettingsTests.cs index 426c08c3d20..c5ba1d37e99 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ConnectionPoolSettingsTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ConnectionPoolSettingsTests.cs @@ -15,7 +15,7 @@ using System; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.Configuration diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ConnectionSettingsTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ConnectionSettingsTests.cs index 19919b77599..764674b1504 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ConnectionSettingsTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ConnectionSettingsTests.cs @@ -15,7 +15,7 @@ using System; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Authentication; using MongoDB.Driver.Core.Compression; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ConnectionStringTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ConnectionStringTests.cs index 3581b1793fb..4b6055d1705 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ConnectionStringTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Configuration/ConnectionStringTests.cs @@ -23,7 +23,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Compression; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Configuration/TcpStreamSettingsTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Configuration/TcpStreamSettingsTests.cs index 8b791d0378d..d913c4ee2eb 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Configuration/TcpStreamSettingsTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Configuration/TcpStreamSettingsTests.cs @@ -17,7 +17,7 @@ using System.Net.Sockets; using System.Threading; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.Configuration diff --git a/tests/MongoDB.Driver.Core.Tests/Core/ConnectionPools/ExclusiveConnectionPoolTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/ConnectionPools/ExclusiveConnectionPoolTests.cs index 8efb66633f9..56570e094f9 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/ConnectionPools/ExclusiveConnectionPoolTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/ConnectionPools/ExclusiveConnectionPoolTests.cs @@ -22,7 +22,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Configuration; using MongoDB.Driver.Core.Connections; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/ConnectionPools/MaintenanceHelperTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/ConnectionPools/MaintenanceHelperTests.cs index f7480b74d29..f8b7346b63f 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/ConnectionPools/MaintenanceHelperTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/ConnectionPools/MaintenanceHelperTests.cs @@ -20,7 +20,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Configuration; using MongoDB.Driver.Core.ConnectionPools; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Connections/BinaryConnectionTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Connections/BinaryConnectionTests.cs index 5375fdd7511..03481e8a2b1 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Connections/BinaryConnectionTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Connections/BinaryConnectionTests.cs @@ -22,7 +22,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Configuration; using MongoDB.Driver.Core.Events; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Connections/ClientDocumentHelperTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Connections/ClientDocumentHelperTests.cs index d25a824553a..69c84c4b1ff 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Connections/ClientDocumentHelperTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Connections/ClientDocumentHelperTests.cs @@ -20,7 +20,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.Connections diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Connections/CommandEventHelperTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Connections/CommandEventHelperTests.cs index 06dcc3eae6b..cfbfbeaf262 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Connections/CommandEventHelperTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Connections/CommandEventHelperTests.cs @@ -17,7 +17,7 @@ using Microsoft.Extensions.Logging; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Events; using MongoDB.Driver.Core.Logging; using MongoDB.Driver.Core.Misc; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Connections/ConnectionInitializerTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Connections/ConnectionInitializerTests.cs index 2ab40463732..d4c8ffcdde5 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Connections/ConnectionInitializerTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Connections/ConnectionInitializerTests.cs @@ -20,7 +20,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Authentication; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Compression; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Connections/HelloHelperTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Connections/HelloHelperTests.cs index 0e2d28a8e07..8a9755cfcca 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Connections/HelloHelperTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Connections/HelloHelperTests.cs @@ -18,7 +18,7 @@ using MongoDB.Bson; using MongoDB.Bson.TestHelpers; using Xunit; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Compression; using MongoDB.Driver.Core.Configuration; using MongoDB.Driver.Core.Misc; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Connections/HelloResultTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Connections/HelloResultTests.cs index 25f33d73411..0d0ac28af79 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Connections/HelloResultTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Connections/HelloResultTests.cs @@ -17,7 +17,7 @@ using System.Net; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Compression; using MongoDB.Driver.Core.Misc; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Connections/TcpStreamFactoryTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Connections/TcpStreamFactoryTests.cs index 28545089ed7..014f1b6a523 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Connections/TcpStreamFactoryTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Connections/TcpStreamFactoryTests.cs @@ -23,7 +23,7 @@ using System.Threading.Tasks; using System.Reflection; using System.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using MongoDB.Bson.TestHelpers; @@ -137,7 +137,7 @@ public void CreateStream_should_throw_when_connect_timeout_has_expired( action.ShouldThrow(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void CreateStream_should_call_the_socketConfigurator( [Values(false, true)] @@ -162,7 +162,7 @@ public void CreateStream_should_call_the_socketConfigurator( socketConfiguratorWasCalled.Should().BeTrue(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void CreateStream_should_connect_to_a_running_server_and_return_a_non_null_stream( [Values(false, true)] @@ -185,7 +185,7 @@ public void CreateStream_should_connect_to_a_running_server_and_return_a_non_nul stream.Should().NotBeNull(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void SocketConfigurator_can_be_used_to_set_keepAlive( [Values(false, true)] diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Events/EventPublisherTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Events/EventPublisherTests.cs index 46131ed396d..c54f41023d5 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Events/EventPublisherTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Events/EventPublisherTests.cs @@ -16,7 +16,7 @@ using System; using System.Collections.Generic; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Misc/BatchableSourceTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Misc/BatchableSourceTests.cs index f12a391f800..68a51d4acb9 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Misc/BatchableSourceTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Misc/BatchableSourceTests.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using System.Linq; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.Misc diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Misc/SemaphoreSlimSignalableTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Misc/SemaphoreSlimSignalableTests.cs index 7dff7723e8a..74397ba133b 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Misc/SemaphoreSlimSignalableTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Misc/SemaphoreSlimSignalableTests.cs @@ -19,7 +19,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.Misc diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Misc/StreamExtensionMethodsTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Misc/StreamExtensionMethodsTests.cs index 7a507ef3ef9..bf17fa539c6 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Misc/StreamExtensionMethodsTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Misc/StreamExtensionMethodsTests.cs @@ -22,7 +22,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Misc/WireVersionTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Misc/WireVersionTests.cs index 9b41badcfa6..62ba6aeec8b 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Misc/WireVersionTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Misc/WireVersionTests.cs @@ -23,7 +23,7 @@ namespace MongoDB.Driver.Core.Tests.Core.Misc { public class WireVersionTests { - [SkippableFact] + [Fact] public void Server_maxWireVersion_should_be_in_supported_range() { RequireServer.Check().StableServer(stable: true); diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/AggregateExplainOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/AggregateExplainOperationTests.cs index 104028d760b..5dd0be14c98 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/AggregateExplainOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/AggregateExplainOperationTests.cs @@ -17,7 +17,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers; @@ -162,7 +162,7 @@ public void CreateCommand_should_return_expected_result() result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void CreateCommand_should_return_expected_result_when_AllowDiskUse_is_set( [Values(false, true)] @@ -185,7 +185,7 @@ public void CreateCommand_should_return_expected_result_when_AllowDiskUse_is_set result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void CreateCommand_should_return_expected_result_when_Collation_is_set( [Values("en_US", "fr_CA")] @@ -283,7 +283,7 @@ public void CreateCommand_should_return_expected_result_when_MaxTime_is_set(long result["maxTimeMS"].BsonType.Should().Be(BsonType.Int32); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -297,7 +297,7 @@ public void Execute_should_return_expected_result( result.Should().NotBeNull(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_AllowDiskUse_is_set( [Values(false, true)] @@ -314,7 +314,7 @@ public void Execute_should_return_expected_result_when_AllowDiskUse_is_set( result.Should().NotBeNull(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Collation_is_set( [Values(false, true)] @@ -331,7 +331,7 @@ public void Execute_should_return_expected_result_when_Collation_is_set( result.Should().NotBeNull(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) @@ -348,7 +348,7 @@ public void Execute_should_throw_when_maxTime_is_exceeded( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Comment_is_set( [Values(false, true)] @@ -372,7 +372,7 @@ public void Execute_should_return_expected_result_when_Comment_is_set( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Hint_is_set( [Values(false, true)] @@ -389,7 +389,7 @@ public void Execute_should_return_expected_result_when_Hint_is_set( result.Should().NotBeNull(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_MaxTime_is_set( [Values(false, true)] @@ -406,7 +406,7 @@ public void Execute_should_return_expected_result_when_MaxTime_is_set( result.Should().NotBeNull(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/AggregateOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/AggregateOperationTests.cs index f18aeb17565..d7c4a3273fb 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/AggregateOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/AggregateOperationTests.cs @@ -19,7 +19,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using Xunit; @@ -566,7 +566,7 @@ public void CreateCommand_should_return_the_expected_result_when_using_causal_co result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -605,7 +605,7 @@ public void Execute_should_throw_when_binding_is_null( argumentNullException.ParamName.Should().Be("binding"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) @@ -639,7 +639,7 @@ public void Execute_should_throw_when_pipeline_ends_with_out_or_merge( argumentException.ParamName.Should().Be("pipeline"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_AllowDiskUse_is_set( [Values(null, false, true)] @@ -661,7 +661,7 @@ public void Execute_should_return_expected_result_when_AllowDiskUse_is_set( result.Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_BatchSize_is_set( [Values(null, 1, 10)] @@ -685,7 +685,7 @@ public void Execute_should_return_expected_result_when_BatchSize_is_set( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Collation_is_set( [Values(false, true)] @@ -708,7 +708,7 @@ public void Execute_should_return_expected_result_when_Collation_is_set( result.Should().HaveCount(caseSensitive ? 1 : 2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Comment_is_set( [Values(false, true)] @@ -735,7 +735,7 @@ public void Execute_should_return_expected_result_when_Comment_is_set( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Hint_is_set( [Values(false, true)] @@ -754,7 +754,7 @@ public void Execute_should_return_expected_result_when_Hint_is_set( result.Should().NotBeNull(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Let_is_set_with_match_expression( [Values(false, true)] @@ -777,7 +777,7 @@ public void Execute_should_return_expected_result_when_Let_is_set_with_match_exp }); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Let_is_set_with_project( [Values(false, true)] @@ -801,7 +801,7 @@ public void Execute_should_return_expected_result_when_Let_is_set_with_project( }); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_MaxAwaitTime_is_set( [Values(null, 1000)] @@ -825,7 +825,7 @@ public void Execute_should_return_expected_result_when_MaxAwaitTime_is_set( cursorMaxTime.Should().Be(maxAwaitTime); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_MaxTime_is_set( [Values(null, 1000)] @@ -848,7 +848,7 @@ public void Execute_should_return_expected_result_when_MaxTime_is_set( result.Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_ReadConcern_is_set( [Values(null, ReadConcernLevel.Local)] @@ -871,7 +871,7 @@ public void Execute_should_return_expected_result_when_ReadConcern_is_set( result.Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_UseCursor_is_set( [Values(null, false, true)] @@ -895,7 +895,7 @@ public void Execute_should_return_expected_result_when_UseCursor_is_set( result.Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/AggregateToCollectionOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/AggregateToCollectionOperationTests.cs index a5e49047b0f..535243d003d 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/AggregateToCollectionOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/AggregateToCollectionOperationTests.cs @@ -19,7 +19,7 @@ using System.Net; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.Servers; @@ -550,7 +550,7 @@ public void CreateCommand_should_return_expected_result_when_WriteConcern_is_set result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values("$out", "$merge")] string lastStageName, @@ -606,7 +606,7 @@ public void Execute_should_return_expected_result( result.Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_AllowDiskUse_is_set( [Values(null, false, true)] @@ -628,7 +628,7 @@ public void Execute_should_return_expected_result_when_AllowDiskUse_is_set( result.Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_BypassDocumentValidation_is_set( [Values(null, false, true)] @@ -650,7 +650,7 @@ public void Execute_should_return_expected_result_when_BypassDocumentValidation_ result.Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Collation_is_set( [Values(false, true)] @@ -678,7 +678,7 @@ public void Execute_should_return_expected_result_when_Collation_is_set( result.Should().HaveCount(caseSensitive ? 1 : 2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) @@ -702,7 +702,7 @@ public void Execute_should_throw_when_maxTime_is_exceeded( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Comment_is_set( [Values(false, true)] @@ -728,7 +728,7 @@ public void Execute_should_return_expected_result_when_Comment_is_set( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Hint_is_set( [Values(false, true)] @@ -747,7 +747,7 @@ public void Execute_should_return_expected_result_when_Hint_is_set( result.Should().NotBeNull(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Let_is_set_with_match_expression( [Values(false, true)] @@ -774,7 +774,7 @@ public void Execute_should_return_expected_result_when_Let_is_set_with_match_exp }); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Let_is_set_with_project( [Values(false, true)] @@ -802,7 +802,7 @@ public void Execute_should_return_expected_result_when_Let_is_set_with_project( }); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_MaxTime_is_set( [Values(null, 1000)] @@ -825,7 +825,7 @@ public void Execute_should_return_expected_result_when_MaxTime_is_set( result.Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_a_write_concern_error_occurs( [Values(false, true)] @@ -843,7 +843,7 @@ public void Execute_should_throw_when_a_write_concern_error_occurs( exception.Should().BeOfType(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/AsyncCursorSourceEnumerableAdapterTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/AsyncCursorSourceEnumerableAdapterTests.cs index 08325787bce..7cf809b3a0a 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/AsyncCursorSourceEnumerableAdapterTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/AsyncCursorSourceEnumerableAdapterTests.cs @@ -17,7 +17,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/AsyncCursorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/AsyncCursorTests.cs index 469a8f7c530..72b038c09e7 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/AsyncCursorTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/AsyncCursorTests.cs @@ -25,7 +25,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Connections; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/BulkDeleteOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/BulkDeleteOperationTests.cs index 0c5919d7744..86c6c110e9b 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/BulkDeleteOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/BulkDeleteOperationTests.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/BulkMixedWriteOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/BulkMixedWriteOperationTests.cs index b23a7e58713..22911a37c02 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/BulkMixedWriteOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/BulkMixedWriteOperationTests.cs @@ -20,7 +20,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Events; using MongoDB.Driver.Core.Misc; @@ -281,7 +281,7 @@ public void Execute_with_collation_should_throw_when_collation_is_not_supported( exception.Should().BeNull(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_one_delete_and_let([Values(false, true)] bool async) { @@ -310,7 +310,7 @@ public void Execute_with_one_delete_and_let([Values(false, true)] bool async) list.Should().HaveCount(5); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_one_delete_against_a_matching_document( [Values(false, true)] @@ -338,7 +338,7 @@ public void Execute_with_one_delete_against_a_matching_document( list.Should().HaveCount(5); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_one_delete_against_a_matching_document_with_multi( [Values(false, true)] @@ -366,7 +366,7 @@ public void Execute_with_one_delete_against_a_matching_document_with_multi( list.Should().HaveCount(3); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_one_delete_without_matching_a_document( [Values(false, true)] @@ -394,7 +394,7 @@ public void Execute_with_one_delete_without_matching_a_document( list.Should().HaveCount(6); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_multiple_deletes( [Values(false, true)] @@ -426,7 +426,7 @@ public void Execute_with_multiple_deletes( list.Should().HaveCount(4); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_multiple_deletes_and_let([Values(false, true)] bool async) { @@ -463,7 +463,7 @@ public void Execute_with_multiple_deletes_and_let([Values(false, true)] bool asy list.Should().HaveCount(4); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_fewer_deletes_than_maxBatchCount( [Values(false, true)] @@ -499,7 +499,7 @@ public void Execute_with_fewer_deletes_than_maxBatchCount( list.Should().HaveCount(3); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_more_deletes_than_maxBatchCount( [Values(false, true)] @@ -535,7 +535,7 @@ public void Execute_with_more_deletes_than_maxBatchCount( list.Should().HaveCount(3); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_one_insert( [Values(false, true)] @@ -563,7 +563,7 @@ public void Execute_with_one_insert( list.Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_fewer_inserts_than_maxBatchCount( [Values(false, true)] @@ -598,7 +598,7 @@ public void Execute_with_fewer_inserts_than_maxBatchCount( list.Should().HaveCount(2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_more_inserts_than_maxBatchCount( [Values(false, true)] @@ -635,7 +635,7 @@ public void Execute_with_more_inserts_than_maxBatchCount( list.Should().HaveCount(4); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_one_update_against_a_matching_document( [Values(false, true)] @@ -666,7 +666,7 @@ public void Execute_with_one_update_against_a_matching_document( list.Should().HaveCount(6); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_one_update_and_let( [Values(false, true)] bool async) @@ -703,7 +703,7 @@ public void Execute_with_one_update_and_let( list.Should().HaveCount(6); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_one_update_against_a_matching_document_with_multi( [Values(false, true)] @@ -731,7 +731,7 @@ public void Execute_with_one_update_against_a_matching_document_with_multi( list.Should().HaveCount(6); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_one_update_without_matching_a_document( [Values(false, true)] @@ -759,7 +759,7 @@ public void Execute_with_one_update_without_matching_a_document( list.Should().HaveCount(6); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_fewer_updates_than_maxBatchCount( [Values(false, true)] @@ -794,7 +794,7 @@ public void Execute_with_fewer_updates_than_maxBatchCount( list.Should().HaveCount(6); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_more_updates_than_maxBatchCount( [Values(false, true)] @@ -831,7 +831,7 @@ public void Execute_with_more_updates_than_maxBatchCount( list.Should().HaveCount(6); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_a_very_large_upsert( [Values(false, true)] @@ -865,7 +865,7 @@ public void Execute_with_a_very_large_upsert( list.Should().HaveCount(7); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_an_upsert_matching_multiple_documents( [Values(false, true)] @@ -896,7 +896,7 @@ public void Execute_with_an_upsert_matching_multiple_documents( list.Should().HaveCount(6); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_an_upsert_matching_no_documents( [Values(false, true)] @@ -927,7 +927,7 @@ public void Execute_with_an_upsert_matching_no_documents( list.Should().HaveCount(7); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_an_upsert_matching_one_document( [Values(false, true)] @@ -958,7 +958,7 @@ public void Execute_with_an_upsert_matching_one_document( list.Should().HaveCount(6); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_mixed_requests_and_ordered_is_false( [Values(false, true)] @@ -995,7 +995,7 @@ public void Execute_with_mixed_requests_and_ordered_is_false( list.Should().HaveCount(6); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_mixed_requests_and_let( [Values(false, true)] bool async) @@ -1041,7 +1041,7 @@ public void Execute_with_mixed_requests_and_let( list[4].Should().Be("{ _id : 6, x : 3 }"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_mixed_requests_and_ordered_is_true( [Values(false, true)] @@ -1078,7 +1078,7 @@ public void Execute_with_mixed_requests_and_ordered_is_true( list.Should().HaveCount(6); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_mixed_upserts_and_ordered_is_false( [Values(false, true)] @@ -1115,7 +1115,7 @@ public void Execute_with_mixed_upserts_and_ordered_is_false( list.Should().HaveCount(8); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_mixed_upserts_and_ordered_is_true( [Values(false, true)] @@ -1152,7 +1152,7 @@ public void Execute_with_mixed_upserts_and_ordered_is_true( list.Should().HaveCount(8); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_an_error_in_the_first_batch_and_ordered_is_false( [Values(false, true)] @@ -1193,7 +1193,7 @@ public void Execute_with_an_error_in_the_first_batch_and_ordered_is_false( list.Should().HaveCount(3); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_an_error_in_the_first_batch_and_ordered_is_true( [Values(false, true)] @@ -1240,7 +1240,7 @@ public void Execute_with_an_error_in_the_first_batch_and_ordered_is_true( list.Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_an_error_in_the_second_batch_and_ordered_is_false( [Values(false, true)] @@ -1282,7 +1282,7 @@ public void Execute_with_an_error_in_the_second_batch_and_ordered_is_false( list.Should().HaveCount(4); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_an_error_in_the_second_batch_and_ordered_is_true( [Values(false, true)] @@ -1324,7 +1324,7 @@ public void Execute_with_an_error_in_the_second_batch_and_ordered_is_true( list.Should().HaveCount(3); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_unacknowledged_with_an_error_in_the_first_batch_and_ordered_is_false( [Values(false, true)] @@ -1365,7 +1365,7 @@ public void Execute_unacknowledged_with_an_error_in_the_first_batch_and_ordered_ } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_unacknowledged_with_an_error_in_the_first_batch_and_ordered_is_true( [Values(false, true)] @@ -1411,7 +1411,7 @@ public void Execute_unacknowledged_with_an_error_in_the_first_batch_and_ordered_ } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_unacknowledged_with_an_error_in_the_second_batch_and_ordered_is_false( [Values(false, true)] @@ -1452,7 +1452,7 @@ public void Execute_unacknowledged_with_an_error_in_the_second_batch_and_ordered } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_unacknowledged_with_an_error_in_the_second_batch_and_ordered_is_true( [Values(false, true)] @@ -1493,7 +1493,7 @@ public void Execute_unacknowledged_with_an_error_in_the_second_batch_and_ordered } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_delete_should_not_send_session_id_when_unacknowledged_writes( [Values(false, true)] bool retryRequested, @@ -1514,7 +1514,7 @@ public void Execute_with_delete_should_not_send_session_id_when_unacknowledged_w VerifySessionIdWasNotSentIfUnacknowledgedWrite(subject, "delete", async, useImplicitSession); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_delete_should_send_session_id_when_supported( [Values(false, true)] bool async) @@ -1527,7 +1527,7 @@ public void Execute_with_delete_should_send_session_id_when_supported( } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_insert_should_not_send_session_id_when_unacknowledged_writes( [Values(false, true)] bool retryRequested, @@ -1548,7 +1548,7 @@ public void Execute_with_insert_should_not_send_session_id_when_unacknowledged_w VerifySessionIdWasNotSentIfUnacknowledgedWrite(subject, "insert", async, useImplicitSession); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_insert_should_send_session_id_when_supported( [Values(false, true)] bool async) @@ -1561,7 +1561,7 @@ public void Execute_with_insert_should_send_session_id_when_supported( VerifySessionIdWasSentWhenSupported(subject, "insert", async); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_update_should_not_send_session_id_when_unacknowledged_writes( [Values(false, true)] bool retryRequested, @@ -1582,7 +1582,7 @@ public void Execute_with_update_should_not_send_session_id_when_unacknowledged_w VerifySessionIdWasNotSentIfUnacknowledgedWrite(subject, "update", async, useImplicitSession); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_update_should_send_session_id_when_supported( [Values(false, true)] bool async) @@ -1594,7 +1594,7 @@ public void Execute_with_update_should_send_session_id_when_supported( VerifySessionIdWasSentWhenSupported(subject, "update", async); } - [SkippableTheory] + [Theory] [InlineData(new[] { 1 }, new[] { 1 }, false)] [InlineData(new[] { 1, 1 }, new[] { 2 }, false)] [InlineData(new[] { 10000000, 10000000, 10000000, 10000000 }, new[] { 4 }, false)] @@ -1632,7 +1632,7 @@ public void Execute_with_multiple_deletes_should_split_batches_as_expected_when_ } } - [SkippableTheory] + [Theory] [InlineData(new[] { 1 }, new[] { 1 }, false)] [InlineData(new[] { 1, 1 }, new[] { 2 }, false)] [InlineData(new[] { 10000000, 10000000, 10000000, 10000000 }, new[] { 4 }, false)] @@ -1672,7 +1672,7 @@ public void Execute_with_multiple_inserts_should_split_batches_as_expected_when_ } } - [SkippableTheory] + [Theory] [InlineData(new[] { 1 }, new[] { 1 }, false)] [InlineData(new[] { 1, 1 }, new[] { 2 }, false)] [InlineData(new[] { 10000000, 10000000, 10000000, 10000000 }, new[] { 4 }, false)] diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/BulkUpdateOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/BulkUpdateOperationTests.cs index f8e03922e52..2f2e95fc935 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/BulkUpdateOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/BulkUpdateOperationTests.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ChangeStreamCursorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ChangeStreamCursorTests.cs index 517f8a217a2..f2661693749 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ChangeStreamCursorTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ChangeStreamCursorTests.cs @@ -19,7 +19,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.TestHelpers; using MongoDB.Driver.Core.WireProtocol.Messages.Encoders; @@ -272,7 +272,7 @@ public void GetResumeToken_should_return_expected_result( subject.GetResumeToken().Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void GetResumeToken_should_return_expected_results_when_batch_is_empty_or_fully_iterated( [Values(false, true)] bool async, @@ -336,7 +336,7 @@ public void GetResumeToken_should_return_expected_results_when_batch_is_empty_or } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void GetResumeToken_should_return_expected_results_when_batch_is_not_empty_and_has_not_been_iterated( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ChangeStreamOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ChangeStreamOperationTests.cs index 68ac25aa2e1..b368fdea6a2 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ChangeStreamOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ChangeStreamOperationTests.cs @@ -22,7 +22,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; @@ -375,7 +375,7 @@ public void RetryRequested_get_and_set_should_work( result.Should().Be(value); } - [SkippableTheory] + [Theory] [InlineData(null)] [InlineData("{ '_data' : 'testValue' }")] public void StartAfter_get_and_set_should_work(string startAfter) @@ -402,7 +402,7 @@ public void StartAtOperationTime_get_and_set_should_work(int? t, int? i) result.Should().Be(value); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_for_drop_collection( [Values(false, true)] bool async) @@ -434,7 +434,7 @@ public void Execute_should_return_expected_results_for_drop_collection( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_for_deletes( [Values(false, true)] bool async) @@ -466,7 +466,7 @@ public void Execute_should_return_expected_results_for_deletes( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_for_inserts( [Values(false, true)] bool async) @@ -499,7 +499,7 @@ public void Execute_should_return_expected_results_for_inserts( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_for_pre_post_images( [Values(false, true)] bool async, @@ -547,7 +547,7 @@ public void Execute_should_return_expected_results_for_pre_post_images( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_for_large_batch( [Values(1, 2, 3)] int numberOfChunks, @@ -591,7 +591,7 @@ public void Execute_should_return_expected_results_for_large_batch( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_for_updates( [Values(ChangeStreamFullDocumentOption.Default, ChangeStreamFullDocumentOption.UpdateLookup)] ChangeStreamFullDocumentOption fullDocument, diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CommandOperationBaseTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CommandOperationBaseTests.cs index d0546bcde94..9a0faaff797 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CommandOperationBaseTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CommandOperationBaseTests.cs @@ -20,7 +20,7 @@ using MongoDB.Bson.IO; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Servers; using MongoDB.Driver.Core.WireProtocol.Messages.Encoders; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CompositeWriteOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CompositeWriteOperationTests.cs index 01fd85affd5..18c67618a5c 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CompositeWriteOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CompositeWriteOperationTests.cs @@ -19,7 +19,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Operations; using Moq; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CountDocumentsOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CountDocumentsOperationTests.cs index adfd1999a1f..50b575806c7 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CountDocumentsOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CountDocumentsOperationTests.cs @@ -19,7 +19,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers; @@ -195,7 +195,7 @@ public void Skip_get_and_set_should_work( result.Should().Be(value); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -210,7 +210,7 @@ public void Execute_should_return_expected_result( result.Should().Be(2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_no_documents_match( [Values(false, true)] @@ -228,7 +228,7 @@ public void Execute_should_return_expected_result_when_no_documents_match( result.Should().Be(0); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Collation_is_set( [Values(false, true)] @@ -249,7 +249,7 @@ public void Execute_should_return_expected_result_when_Collation_is_set( result.Should().Be(caseSensitive ? 1 : 2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) @@ -265,7 +265,7 @@ public void Execute_should_throw_when_maxTime_is_exceeded( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Filter_is_set( [Values(false, true)] @@ -283,7 +283,7 @@ public void Execute_should_return_expected_result_when_Filter_is_set( result.Should().Be(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Hint_is_set( [Values(false, true)] @@ -301,7 +301,7 @@ public void Execute_should_return_expected_result_when_Hint_is_set( result.Should().Be(2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Limit_is_set( [Values(null, 1L, 2L)] @@ -321,7 +321,7 @@ public void Execute_should_return_expected_result_when_Limit_is_set( result.Should().Be(limit ?? 2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_MaxTime_is_set( [Values(null, 1000L)] @@ -342,7 +342,7 @@ public void Execute_should_return_expected_result_when_MaxTime_is_set( result.Should().Be(2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_ReadConcern_is_set( [Values(null, ReadConcernLevel.Local)] @@ -363,7 +363,7 @@ public void Execute_should_return_expected_result_when_ReadConcern_is_set( result.Should().Be(2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Skip_is_set( [Values(null, 1L, 2L)] @@ -383,7 +383,7 @@ public void Execute_should_return_expected_result_when_Skip_is_set( result.Should().Be(2 - (skip ?? 0)); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CountOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CountOperationTests.cs index 47c6df019a1..07e21d944a7 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CountOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CountOperationTests.cs @@ -16,7 +16,7 @@ using System; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.TestHelpers; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -437,7 +437,7 @@ public void CreateCommand_should_return_expected_result_when_Skip_is_set( result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -452,7 +452,7 @@ public void Execute_should_return_expected_result( result.Should().Be(2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Collation_is_set( [Values(false, true)] @@ -473,7 +473,7 @@ public void Execute_should_return_expected_result_when_Collation_is_set( result.Should().Be(caseSensitive ? 1 : 2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) @@ -489,7 +489,7 @@ public void Execute_should_throw_when_maxTime_is_exceeded( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Filter_is_set( [Values(false, true)] @@ -507,7 +507,7 @@ public void Execute_should_return_expected_result_when_Filter_is_set( result.Should().Be(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Hint_is_set( [Values(false, true)] @@ -525,7 +525,7 @@ public void Execute_should_return_expected_result_when_Hint_is_set( result.Should().Be(2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Limit_is_set( [Values(null, 1L, 2L)] @@ -545,7 +545,7 @@ public void Execute_should_return_expected_result_when_Limit_is_set( result.Should().Be(limit ?? 2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_MaxTime_is_set( [Values(null, 1000L)] @@ -566,7 +566,7 @@ public void Execute_should_return_expected_result_when_MaxTime_is_set( result.Should().Be(2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_ReadConcern_is_set( [Values(null, ReadConcernLevel.Local)] @@ -587,7 +587,7 @@ public void Execute_should_return_expected_result_when_ReadConcern_is_set( result.Should().Be(2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Skip_is_set( [Values(null, 1L, 2L)] @@ -607,7 +607,7 @@ public void Execute_should_return_expected_result_when_Skip_is_set( result.Should().Be(2 - (skip ?? 0)); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateCollectionOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateCollectionOperationTests.cs index 295c4fdc39f..e5fdf203572 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateCollectionOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateCollectionOperationTests.cs @@ -18,7 +18,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -594,7 +594,7 @@ string GetExpectedCollectionName(string[] array) } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_create_collection( [Values(false, true)] @@ -614,7 +614,7 @@ public void Execute_should_create_collection( info["name"].AsString.Should().Be(_collectionNamespace.CollectionName); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_create_collection_when_AutoIndexId_is_set( [Values(false, true)] @@ -641,7 +641,7 @@ public void Execute_should_create_collection_when_AutoIndexId_is_set( info["options"]["autoIndexId"].ToBoolean().Should().Be(autoIndexId); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_create_collection_when_Capped_is_set( [Values(false, true)] @@ -672,7 +672,7 @@ public void Execute_should_create_collection_when_Capped_is_set( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_create_collection_when_Collation_is_set( [Values(false, true)] @@ -695,7 +695,7 @@ public void Execute_should_create_collection_when_Collation_is_set( info["options"]["collation"]["locale"].AsString.Should().Be("en_US"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_create_collection_when_IndexOptionDefaults_is_set( [Values(false, true)] @@ -723,7 +723,7 @@ public void Execute_should_create_collection_when_IndexOptionDefaults_is_set( info["options"]["indexOptionDefaults"].Should().Be(indexOptionDefaults); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_create_collection_when_MaxDocuments_is_set( [Values(1L, 2L)] @@ -750,7 +750,7 @@ public void Execute_should_create_collection_when_MaxDocuments_is_set( info["options"]["max"].ToInt64().Should().Be(maxDocuments); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_create_collection_when_MaxSize_is_set( [Values(10000L, 20000L)] @@ -776,7 +776,7 @@ public void Execute_should_create_collection_when_MaxSize_is_set( info["options"]["size"].ToInt64().Should().BeGreaterOrEqualTo(maxSize); // server rounds maxSize up } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_create_collection_when_NoPadding_is_set( [Values(false, true)] @@ -801,7 +801,7 @@ public void Execute_should_create_collection_when_NoPadding_is_set( info["options"]["flags"].Should().Be(noPadding ? 2 : 0); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_create_collection_when_StorageEngine_is_set( [Values("abc", "def")] @@ -830,7 +830,7 @@ public void Execute_should_create_collection_when_StorageEngine_is_set( info["options"]["storageEngine"].Should().Be(storageEngine); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_create_collection_when_UsePowerOf2Sizes_is_set( [Values(false, true)] @@ -855,7 +855,7 @@ public void Execute_should_create_collection_when_UsePowerOf2Sizes_is_set( info["options"]["flags"].Should().Be(usePowerOf2Sizes ? 1 : 0); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_create_collection_when_Validator_is_set( [Values(false, true)] @@ -883,7 +883,7 @@ public void Execute_should_create_collection_when_Validator_is_set( info["options"]["validationAction"].AsString.Should().Be("error"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_a_write_concern_error_occurs( [Values(false, true)] @@ -907,7 +907,7 @@ public void Execute_should_throw_when_a_write_concern_error_occurs( exception.Should().BeOfType(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateIndexRequestTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateIndexRequestTests.cs index 5714eb88d8e..94b72ed0e35 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateIndexRequestTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateIndexRequestTests.cs @@ -16,7 +16,7 @@ using System; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateIndexesOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateIndexesOperationTests.cs index cf38de58d75..55e5f4fa61d 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateIndexesOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateIndexesOperationTests.cs @@ -18,7 +18,7 @@ using System.Linq; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers; @@ -69,7 +69,7 @@ public void constructor_should_throw_when_messageEncoderSettings_is_null() argumentNullException.ParamName.Should().Be("messageEncoderSettings"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void CommitQuorum_get_and_set_should_work( [Values(null, 1, 2)] int? w) @@ -245,7 +245,7 @@ public void CreateCommand_should_throw_when_commitQuorum_is_specified_and_not_su exception.Should().BeOfType(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) @@ -262,7 +262,7 @@ public void Execute_should_throw_when_maxTime_is_exceeded( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_work_when_background_is_true( [Values(false, true)] @@ -280,7 +280,7 @@ public void Execute_should_work_when_background_is_true( index["background"].ToBoolean().Should().BeTrue(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_work_when_commitQuorum_is_specified( [Values(1, "majority", "votingMembers")] object commitQuorumCase, @@ -315,7 +315,7 @@ public void Execute_should_work_when_commitQuorum_is_specified( indexes.Select(index => index["name"].AsString).Should().BeEquivalentTo(new[] { "_id_", "x_1" }); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_work_when_creating_one_index( [Values(false, true)] @@ -332,7 +332,7 @@ public void Execute_should_work_when_creating_one_index( indexes.Select(index => index["name"].AsString).Should().BeEquivalentTo(new[] { "_id_", "x_1" }); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_work_when_creating_two_indexes( [Values(false, true)] @@ -353,7 +353,7 @@ public void Execute_should_work_when_creating_two_indexes( indexes.Select(index => index["name"].AsString).Should().BeEquivalentTo(new[] { "_id_", "x_1", "y_1" }); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_work_when_partialFilterExpression_has_value( [Values(false, true)] @@ -371,7 +371,7 @@ public void Execute_should_work_when_partialFilterExpression_has_value( index["partialFilterExpression"].AsBsonDocument.Should().Be(requests[0].PartialFilterExpression); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_work_when_sparse_is_true( [Values(false, true)] @@ -389,7 +389,7 @@ public void Execute_should_work_when_sparse_is_true( index["sparse"].ToBoolean().Should().BeTrue(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_work_when_Collation_has_value( [Values("en_US", "fr_CA")] @@ -410,7 +410,7 @@ public void Execute_should_work_when_Collation_has_value( index["collation"]["locale"].AsString.Should().Be(locale); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_work_when_expireAfter_has_value( [Values(false, true)] @@ -429,7 +429,7 @@ public void Execute_should_work_when_expireAfter_has_value( index["expireAfterSeconds"].ToDouble().Should().Be(expireAfter.TotalSeconds); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_work_when_hidden_has_value( [Values(null, false, true)] bool? hidden, @@ -454,7 +454,7 @@ public void Execute_should_work_when_hidden_has_value( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_work_when_unique_is_true( [Values(false, true)] @@ -472,7 +472,7 @@ public void Execute_should_work_when_unique_is_true( index["unique"].ToBoolean().Should().BeTrue(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_a_write_concern_error_occurs( [Values(false, true)] @@ -491,7 +491,7 @@ public void Execute_should_throw_when_a_write_concern_error_occurs( exception.Should().BeOfType(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateViewOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateViewOperationTests.cs index a600ae0b3e2..ef72d20e5fa 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateViewOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateViewOperationTests.cs @@ -21,7 +21,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; @@ -128,7 +128,7 @@ public void WriteConcern_get_and_set_should_work( result.Should().BeSameAs(value); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_create_view( [Values("a", "b")] @@ -152,7 +152,7 @@ public void Execute_should_create_view( options["pipeline"].AsBsonArray.Cast().Should().Equal(_pipeline); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_create_view_when_Collation_is_set( [Values(null, "en_US")] @@ -188,7 +188,7 @@ public void Execute_should_create_view_when_Collation_is_set( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_create_view_when_WriteConcern_is_set( [Values("a", "b")] @@ -215,7 +215,7 @@ public void Execute_should_create_view_when_WriteConcern_is_set( options["pipeline"].AsBsonArray.Cast().Should().Equal(_pipeline); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_a_write_concern_error_occurs( [Values(false, true)] @@ -233,7 +233,7 @@ public void Execute_should_throw_when_a_write_concern_error_occurs( exception.Should().BeOfType(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/DatabaseExistsOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/DatabaseExistsOperationTests.cs index 82c11374b98..9b57d46dd17 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/DatabaseExistsOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/DatabaseExistsOperationTests.cs @@ -17,7 +17,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using Xunit; @@ -58,7 +58,7 @@ public void Constructor_should_initialize_subject() subject.RetryRequested.Should().BeFalse(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_true_when_database_exists( [Values(false, true)] @@ -81,7 +81,7 @@ public void Execute_should_return_true_when_database_exists( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_false_when_database_does_not_exist( [Values(false, true)] diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/DistinctOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/DistinctOperationTests.cs index 1c134276458..2771d516b83 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/DistinctOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/DistinctOperationTests.cs @@ -18,7 +18,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers; @@ -332,7 +332,7 @@ public void CreateCommand_should_return_the_expected_result_when_using_causal_co result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -350,7 +350,7 @@ public void Execute_should_return_expected_result( result.Should().Contain(new[] { 1, 2, 3 }); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Collation_is_set( [Values(false, true)] @@ -372,7 +372,7 @@ public void Execute_should_return_expected_result_when_Collation_is_set( result.Should().Contain(new[] { 2, 3 }); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Filter_is_set( [Values(false, true)] @@ -393,7 +393,7 @@ public void Execute_should_return_expected_result_when_Filter_is_set( result.Should().Contain(new[] { 2, 3 }); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_MaxTime_is_set( [Values(false, true)] @@ -414,7 +414,7 @@ public void Execute_should_return_expected_result_when_MaxTime_is_set( result.Should().Contain(new[] { 1, 2, 3 }); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_ReadConcern_is_set( [Values(false, true)] @@ -435,7 +435,7 @@ public void Execute_should_return_expected_result_when_ReadConcern_is_set( result.Should().Contain(new[] { 1, 2, 3 }); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) @@ -451,7 +451,7 @@ public void Execute_should_throw_when_maxTime_is_exceeded( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/DropCollectionOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/DropCollectionOperationTests.cs index 429b2dd375d..cde5d1f0f60 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/DropCollectionOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/DropCollectionOperationTests.cs @@ -17,7 +17,7 @@ using System.Linq; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Tests.Core.Operations; @@ -196,7 +196,7 @@ string GetExpectedCollectionName(string[] array) } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_not_throw_when_collection_does_not_exist( [Values(false, true)] @@ -209,7 +209,7 @@ public void Execute_should_not_throw_when_collection_does_not_exist( ExecuteOperation(subject, async); // this will throw if we have a problem... } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -228,7 +228,7 @@ public void Execute_should_return_expected_result( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_a_write_concern_error_occurs( [Values(false, true)] @@ -246,7 +246,7 @@ public void Execute_should_throw_when_a_write_concern_error_occurs( exception.Should().BeOfType(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/DropDatabaseOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/DropDatabaseOperationTests.cs index 864a71781cf..7839d217a1e 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/DropDatabaseOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/DropDatabaseOperationTests.cs @@ -18,7 +18,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; @@ -86,7 +86,7 @@ public void CreateCommand_should_return_expected_result_when_WriteConcern_is_set result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -118,7 +118,7 @@ public void Execute_should_throw_when_binding_is_null( action.ShouldThrow().And.ParamName.Should().Be("binding"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_a_write_concern_error_occurs( [Values(false, true)] @@ -141,7 +141,7 @@ public void Execute_should_throw_when_a_write_concern_error_occurs( exception.Should().BeOfType(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/DropIndexOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/DropIndexOperationTests.cs index 27c04d992b2..b2071cfa907 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/DropIndexOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/DropIndexOperationTests.cs @@ -19,7 +19,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers; @@ -197,7 +197,7 @@ public void CreateCommand_should_return_expectedResult_when_WriteConcern_is_set( result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_not_throw_when_collection_does_not_exist( [Values(false, true)] @@ -215,7 +215,7 @@ public void Execute_should_not_throw_when_collection_does_not_exist( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -246,7 +246,7 @@ public void Execute_should_throw_when_binding_is_null( ex.ParamName.Should().Be("binding"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) @@ -263,7 +263,7 @@ public void Execute_should_throw_when_maxTime_is_exceeded( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_a_write_concern_error_occurs( [Values(false, true)] @@ -282,7 +282,7 @@ public void Execute_should_throw_when_a_write_concern_error_occurs( exception.Should().BeOfType(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/EndTransactionOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/EndTransactionOperationTests.cs index 673ce134fe9..ab50605e5f9 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/EndTransactionOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/EndTransactionOperationTests.cs @@ -18,7 +18,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.WireProtocol.Messages.Encoders; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/EstimatedDocumentCountOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/EstimatedDocumentCountOperationTests.cs index ba47034319b..9208df77be6 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/EstimatedDocumentCountOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/EstimatedDocumentCountOperationTests.cs @@ -17,7 +17,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Connections; @@ -143,7 +143,7 @@ public void RetryRequested_get_and_set_should_work([Values(false, true)] bool va result.Should().Be(value); } - [SkippableFact] + [Fact] public void CreateCommand_should_return_expected_result() { var subject = new EstimatedDocumentCountOperation(_collectionNamespace, _messageEncoderSettings); @@ -217,7 +217,7 @@ public void CreateCommand_should_return_the_expected_result_when_using_causal_co AssertCommandDocument(result, readConcern: expectedReadConcernDocument); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result([Values(false, true)] bool async) { @@ -231,7 +231,7 @@ public void Execute_should_return_expected_result([Values(false, true)] bool asy result.Should().Be(2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded([Values(false, true)] bool async) { @@ -247,7 +247,7 @@ public void Execute_should_throw_when_maxTime_is_exceeded([Values(false, true)] } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_MaxTime_is_set( [Values(null, 1000L)] long? milliseconds, @@ -266,7 +266,7 @@ public void Execute_should_return_expected_result_when_MaxTime_is_set( result.Should().Be(2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_ReadConcern_is_set( [Values(null, ReadConcernLevel.Local)] ReadConcernLevel? level, @@ -286,7 +286,7 @@ public void Execute_should_return_expected_result_when_ReadConcern_is_set( result.Should().Be(2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported([Values(false, true)] bool async) { diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/EvalOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/EvalOperationTests.cs index ba90a67780a..64080a96efa 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/EvalOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/EvalOperationTests.cs @@ -18,7 +18,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; @@ -160,7 +160,7 @@ public void CreateCommand_should_return_expected_result_when_noLock_is_provided( result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -175,7 +175,7 @@ public void Execute_should_return_expected_result( result.Should().Be(1.0); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_args_are_provided( [Values(false, true)] @@ -200,7 +200,7 @@ public void Execute_should_return_expected_result_when_maxTime_is_provided( // TODO: implement EvalOperation MaxTime test } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_noLock_is_provided( [Values(false, true)] @@ -230,7 +230,7 @@ public void Execute_should_throw_when_binding_isNull( action.ShouldThrow(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ExplainOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ExplainOperationTests.cs index a93f1279d2f..3ca20744825 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ExplainOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ExplainOperationTests.cs @@ -19,7 +19,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Connections; @@ -108,7 +108,7 @@ public void CreateCommand_should_return_expected_result(ExplainVerbosity verbosi result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_not_throw_when_collection_does_not_exist( [Values(false, true)] diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOneAndDeleteOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOneAndDeleteOperationTests.cs index 6c42624e79c..7e87965a88d 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOneAndDeleteOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOneAndDeleteOperationTests.cs @@ -18,7 +18,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers; @@ -132,7 +132,7 @@ public void CreateCommand_should_return_expected_result_when_Hint_is_set( result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_hint_should_throw_when_hint_is_not_supported( [Values(0, 1)] int w, @@ -427,7 +427,7 @@ public void CreateCommand_should_return_the_expected_result_when_WriteConcern_is result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) @@ -445,7 +445,7 @@ public void Execute_should_throw_when_maxTime_is_exceeded( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -462,7 +462,7 @@ public void Execute_should_return_expected_result( ReadAllFromCollection().Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Collation_is_set( [Values(false, true)] @@ -483,7 +483,7 @@ public void Execute_should_return_expected_result_when_Collation_is_set( ReadAllFromCollection().Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Let_is_set( [Values(false, true)] bool async) @@ -503,7 +503,7 @@ public void Execute_should_return_expected_result_when_Let_is_set( ReadAllFromCollection().Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_there_is_a_write_concern_error( [Values(false, true)] bool async) @@ -526,7 +526,7 @@ public void Execute_should_throw_when_there_is_a_write_concern_error( ReadAllFromCollection().Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_when_document_does_not_exist( [Values(false, true)] diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOneAndReplaceOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOneAndReplaceOperationTests.cs index 7bf1169c745..4eb8534848e 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOneAndReplaceOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOneAndReplaceOperationTests.cs @@ -18,7 +18,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers; @@ -525,7 +525,7 @@ public void CreateCommand_should_return_expected_result_when_WriteConcern_is_set result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_against_an_existing_document_returning_the_original( [Values(false, true)] @@ -547,7 +547,7 @@ public void Execute_against_an_existing_document_returning_the_original( ); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_against_an_existing_document_returning_the_replacement( [Values(false, true)] @@ -569,7 +569,7 @@ public void Execute_against_an_existing_document_returning_the_replacement( ); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_against_a_non_existing_document_returning_the_original( [Values(false, true)] @@ -592,7 +592,7 @@ public void Execute_against_a_non_existing_document_returning_the_original( ); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_against_a_non_existing_document_returning_the_replacement( [Values(false, true)] @@ -615,7 +615,7 @@ public void Execute_against_a_non_existing_document_returning_the_replacement( ); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_against_a_non_existing_document_returning_the_original_with_upsert( [Values(false, true)] @@ -641,7 +641,7 @@ public void Execute_against_a_non_existing_document_returning_the_original_with_ ); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_against_a_non_existing_document_returning_the_replacement_with_upsert( [Values(false, true)] @@ -667,7 +667,7 @@ public void Execute_against_a_non_existing_document_returning_the_replacement_wi ); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) @@ -685,7 +685,7 @@ public void Execute_should_throw_when_maxTime_is_exceeded( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_there_is_a_write_concern_error( [Values(false, true)] @@ -710,7 +710,7 @@ public void Execute_should_throw_when_there_is_a_write_concern_error( ); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_hint_should_throw_when_hint_is_not_supported( [Values(0, 1)] int w, @@ -744,7 +744,7 @@ public void Execute_with_hint_should_throw_when_hint_is_not_supported( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_let_should_return_correct_results( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOneAndUpdateOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOneAndUpdateOperationTests.cs index e7185115867..715abe1a344 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOneAndUpdateOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOneAndUpdateOperationTests.cs @@ -18,7 +18,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers; @@ -519,7 +519,7 @@ public void CreateCommand_should_return_expected_result_when_WriteConcern_is_set result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_against_an_existing_document_returning_the_original( [Values(false, true)] @@ -540,7 +540,7 @@ public void Execute_against_an_existing_document_returning_the_original( BsonDocument.Parse("{ _id : 11, x : 2, y : 'A' }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_against_an_existing_document_returning_the_updated( [Values(false, true)] @@ -561,7 +561,7 @@ public void Execute_against_an_existing_document_returning_the_updated( BsonDocument.Parse("{ _id : 11, x : 2, y : 'A' }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_against_a_non_existing_document_returning_the_original( [Values(false, true)] @@ -583,7 +583,7 @@ public void Execute_against_a_non_existing_document_returning_the_original( BsonDocument.Parse("{ _id : 11, x : 2, y : 'A' }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_against_a_non_existing_document_returning_the_updated( [Values(false, true)] @@ -605,7 +605,7 @@ public void Execute_against_a_non_existing_document_returning_the_updated( BsonDocument.Parse("{ _id : 11, x : 2, y : 'A' }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_against_a_non_existing_document_returning_the_original_with_upsert( [Values(false, true)] @@ -629,7 +629,7 @@ public void Execute_against_a_non_existing_document_returning_the_original_with_ BsonDocument.Parse("{ _id : 12, x : 0 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_against_a_non_existing_document_returning_the_updated_with_upsert( [Values(false, true)] @@ -653,7 +653,7 @@ public void Execute_against_a_non_existing_document_returning_the_updated_with_u BsonDocument.Parse("{ _id : 12, x : 0 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Collation_is_set( [Values(false, true)] @@ -677,7 +677,7 @@ public void Execute_should_return_expected_result_when_Collation_is_set( BsonDocument.Parse("{ _id : 11, x : 0, y : 'A' }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) @@ -697,7 +697,7 @@ public void Execute_should_throw_when_maxTime_is_exceeded( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_there_is_a_write_concern_error( [Values(false, true)] @@ -722,7 +722,7 @@ public void Execute_should_throw_when_there_is_a_write_concern_error( BsonDocument.Parse("{ _id : 11, x : 2, y : 'A' }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_with_hint_should_throw_when_hint_is_not_supported( [Values(0, 1)] int w, @@ -756,7 +756,7 @@ public void Execute_with_hint_should_throw_when_hint_is_not_supported( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Let_is_set( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOperationTests.cs index 8370bb844ae..42a4d960b01 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/FindOperationTests.cs @@ -19,7 +19,7 @@ using MongoDB.Bson.IO; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Servers; @@ -788,7 +788,7 @@ public void CreateCommand_should_return_the_expected_result_when_using_causal_co result.Should().Be(expectedResult); } - [SkippableFact] + [Fact] public void CreateCursor_should_use_ns_field_instead_of_namespace_passed_in_constructor() { var subject = new FindOperation(_collectionNamespace, BsonDocumentSerializer.Instance, _messageEncoderSettings); @@ -832,7 +832,7 @@ public void CursorType_get_and_set_should_work( result.Should().Be(value); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_find_all_the_documents_matching_the_query( [Values(false, true)] @@ -848,7 +848,7 @@ public void Execute_should_find_all_the_documents_matching_the_query( result.Should().HaveCount(5); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_find_all_the_documents_matching_the_query_when_split_across_batches( [Values(false, true)] @@ -869,7 +869,7 @@ public void Execute_should_find_all_the_documents_matching_the_query_when_split_ } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_find_documents_matching_options( [Values(false, true)] bool withLet, @@ -906,7 +906,7 @@ public void Execute_should_find_documents_matching_options( result.Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Collation_is_set( [Values(false, true)] @@ -926,7 +926,7 @@ public void Execute_should_return_expected_result_when_Collation_is_set( result.Should().HaveCount(2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_binding_is_null( [Values(false, true)] @@ -940,7 +940,7 @@ public void Execute_should_throw_when_binding_is_null( argumentNullException.ParamName.Should().Be("binding"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) @@ -956,7 +956,7 @@ public void Execute_should_throw_when_maxTime_is_exceeded( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/GeoNearOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/GeoNearOperationTests.cs index b1b598c526b..341fa47e97b 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/GeoNearOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/GeoNearOperationTests.cs @@ -19,7 +19,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers; @@ -563,7 +563,7 @@ public void CreateCommand_should_return_the_expected_result_when_using_causal_co result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -579,7 +579,7 @@ public void Execute_should_return_expected_result( result["results"].AsBsonArray.Select(i => i["dis"].ToDouble()).Should().BeInAscendingOrder(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Collation_is_set( [Values(false, true)] @@ -603,7 +603,7 @@ public void Execute_should_return_expected_result_when_Collation_is_set( result["results"].AsBsonArray.Select(i => i["dis"].ToDouble()).Should().BeInAscendingOrder(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) @@ -615,7 +615,7 @@ public void Execute_should_send_session_id_when_supported( VerifySessionIdWasSentWhenSupported(subject, "geoNear", async); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/GeoSearchOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/GeoSearchOperationTests.cs index a8eb1cc828c..bbc1ee3dec3 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/GeoSearchOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/GeoSearchOperationTests.cs @@ -18,7 +18,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers; @@ -159,7 +159,7 @@ public void CreateCommand_should_return_expected_result_when_MaxTime_is_set(long result["maxTimeMS"].BsonType.Should().Be(BsonType.Int32); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -182,7 +182,7 @@ public void Execute_should_return_expected_result( result["results"].Should().NotBeNull(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) @@ -202,7 +202,7 @@ public void Execute_should_send_session_id_when_supported( VerifySessionIdWasSentWhenSupported(subject, "geoSearch", async); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/GroupOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/GroupOperationTests.cs index 9290baaad15..4a7d7d4de0a 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/GroupOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/GroupOperationTests.cs @@ -18,7 +18,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers; @@ -361,7 +361,7 @@ public void CreateCommand_should_return_expected_result_when_MaxTime_is_set(long result["maxTimeMS"].BsonType.Should().Be(BsonType.Int32); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_key_is_used( [Values(false, true)] @@ -379,7 +379,7 @@ public void Execute_should_return_expected_result_when_key_is_used( BsonDocument.Parse("{ x : 3, count : 3 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_keyFunction_is_used( [Values(false, true)] @@ -397,7 +397,7 @@ public void Execute_should_return_expected_result_when_keyFunction_is_used( BsonDocument.Parse("{ x : 3, count : 3 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_Collation_is_set( [Values(false, true)] @@ -437,7 +437,7 @@ public void Execute_should_return_expected_result_when_Collation_is_set( result.Should().Equal(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_FinalizeFunction_is_set( [Values(false, true)] @@ -458,7 +458,7 @@ public void Execute_should_return_expected_result_when_FinalizeFunction_is_set( BsonDocument.Parse("{ x : 3, count : -3 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_MaxTime_is_used( [Values(null, 1000)] @@ -483,7 +483,7 @@ public void Execute_should_return_expected_result_when_MaxTime_is_used( BsonDocument.Parse("{ x : 3, count : 3 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_ResultSerializer_is_used( [Values(false, true)] @@ -502,7 +502,7 @@ public void Execute_should_return_expected_result_when_ResultSerializer_is_used( result.Should().Equal(1, 2, 3); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_binding_is_null( [Values(false, true)] @@ -526,7 +526,7 @@ public void Execute_should_throw_when_binding_is_null( argumentNullException.ParamName.Should().Be("binding"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) @@ -538,7 +538,7 @@ public void Execute_should_send_session_id_when_supported( VerifySessionIdWasSentWhenSupported(subject, "group", async); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/IndexNameHelperTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/IndexNameHelperTests.cs index 9408e62064f..e1de914f99a 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/IndexNameHelperTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/IndexNameHelperTests.cs @@ -15,7 +15,7 @@ using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.Operations diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/InsertOpcodeOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/InsertOpcodeOperationTests.cs index 56c66ed2bd9..6a1ecf438b3 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/InsertOpcodeOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/InsertOpcodeOperationTests.cs @@ -18,7 +18,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using Xunit; @@ -142,7 +142,7 @@ public void WriteConcern_should_work() subject.WriteConcern.Should().Be(WriteConcern.W2); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_insert_a_single_document( [Values(false, true)] @@ -159,7 +159,7 @@ public void Execute_should_insert_a_single_document( list.Should().HaveCount(1); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_insert_multiple_documents( [Values(false, true)] diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListCollectionsOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListCollectionsOperationTests.cs index f0a8be4bb0c..aed03af9ff9 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListCollectionsOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListCollectionsOperationTests.cs @@ -19,7 +19,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using Xunit; @@ -123,7 +123,7 @@ public void RetryRequested_get_and_set_should_work( result.Should().Be(value); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_the_expected_result( [Values(false, true)] @@ -141,7 +141,7 @@ public void Execute_should_return_the_expected_result( list.Select(c => c["name"].AsString).Where(n => n != "system.indexes").Should().BeEquivalentTo(expectedNames); } - [SkippableTheory] + [Theory] [InlineData("{ name : \"regular\" }", "regular", false)] [InlineData("{ name : \"regular\" }", "regular", true)] [InlineData("{ \"options.capped\" : true }", "capped", false)] @@ -163,7 +163,7 @@ public void Execute_should_return_the_expected_result_when_filter_is_used(string list[0]["name"].AsString.Should().Be(expectedName); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_the_expected_result_when_batchSize_is_used([Values(false, true)] bool async) { @@ -181,7 +181,7 @@ public void Execute_should_return_the_expected_result_when_batchSize_is_used([Va } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_the_expected_result_when_the_database_does_not_exist( [Values(false, true)] @@ -197,7 +197,7 @@ public void Execute_should_return_the_expected_result_when_the_database_does_not list.Should().HaveCount(0); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListDatabasesOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListDatabasesOperationTests.cs index 2b426e332de..4767339e37e 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListDatabasesOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListDatabasesOperationTests.cs @@ -16,7 +16,7 @@ using System; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -128,7 +128,7 @@ public void CreateCommand_should_return_expected_result( result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] bool async) @@ -143,7 +143,7 @@ public void Execute_should_return_expected_result( list.Should().Contain(x => x["name"] == _databaseNamespace.DatabaseName); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_the_expected_result_when_filter_is_used( [Values(false, true)] bool async) @@ -162,7 +162,7 @@ public void Execute_should_return_the_expected_result_when_filter_is_used( databases[0]["name"].AsString.Should().Be(_databaseNamespace.DatabaseName); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_the_expected_result_when_nameOnly_is_used( [Values(false, true)] bool nameOnly, diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListIndexesOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListIndexesOperationTests.cs index 1c9f6f2ad20..d90ec1d86c3 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListIndexesOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListIndexesOperationTests.cs @@ -17,7 +17,7 @@ using System.Linq; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -81,7 +81,7 @@ public void RetryRequested_get_should_return_expected_result( result.Should().Be(value); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -97,7 +97,7 @@ public void Execute_should_return_expected_result( list.Select(index => index["name"].AsString).Should().BeEquivalentTo("_id_"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_the_expected_result_when_batchSize_is_used([Values(false, true)] bool async) { @@ -115,7 +115,7 @@ public void Execute_should_return_the_expected_result_when_batchSize_is_used([Va } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_collection_does_not_exist( [Values(false, true)] @@ -131,7 +131,7 @@ public void Execute_should_return_expected_result_when_collection_does_not_exist list.Count.Should().Be(0); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_database_does_not_exist( [Values(false, true)] @@ -161,7 +161,7 @@ public void Execute_should_throw_when_binding_is_null( action.ShouldThrow().And.ParamName.Should().Be("binding"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListIndexesUsingCommandOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListIndexesUsingCommandOperationTests.cs index 3c5650dbff3..48384169736 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListIndexesUsingCommandOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ListIndexesUsingCommandOperationTests.cs @@ -17,7 +17,7 @@ using System.Linq; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -68,7 +68,7 @@ public void BatchSize_get_and_set_should_work() result.Should().Be(batchSize); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -84,7 +84,7 @@ public void Execute_should_return_expected_result( list.Select(index => index["name"].AsString).Should().BeEquivalentTo("_id_"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_the_expected_result_when_batchSize_is_used([Values(false, true)] bool async) { @@ -102,7 +102,7 @@ public void Execute_should_return_the_expected_result_when_batchSize_is_used([Va } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_collection_does_not_exist( [Values(false, true)] @@ -118,7 +118,7 @@ public void Execute_should_return_expected_result_when_collection_does_not_exist list.Count.Should().Be(0); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_database_does_not_exist( [Values(false, true)] @@ -148,7 +148,7 @@ public void Execute_should_throw_when_binding_is_null( action.ShouldThrow().And.ParamName.Should().Be("binding"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceLegacyOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceLegacyOperationTests.cs index f07b034479a..8c29e308409 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceLegacyOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceLegacyOperationTests.cs @@ -20,7 +20,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -64,7 +64,7 @@ public void CreateOutputOptions_should_return_expected_result() result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results( [Values(false, true)] @@ -90,7 +90,7 @@ public void Execute_should_return_expected_results( results.Should().BeEquivalentTo(new BsonArray(expectedResults)); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceOperationBaseTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceOperationBaseTests.cs index 5e4b6dd13ae..4213fdeffb4 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceOperationBaseTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceOperationBaseTests.cs @@ -16,7 +16,7 @@ using System; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.WireProtocol.Messages.Encoders; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceOperationTests.cs index dfc8e0f7076..153bee61319 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceOperationTests.cs @@ -19,7 +19,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; @@ -138,7 +138,7 @@ public void CreateOutputOptions_should_return_expected_result() result.Should().Be("{ inline : 1 }"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results( [Values(false, true)] @@ -158,7 +158,7 @@ public void Execute_should_return_expected_results( BsonDocument.Parse("{ _id : 2, value : 4 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_Collation_is_set( [Values(false, true)] @@ -201,7 +201,7 @@ public void Execute_should_return_expected_results_when_Collation_is_set( results.Should().BeEquivalentTo(expectedResults); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_Filter_is_set( [Values(false, true)] @@ -225,7 +225,7 @@ public void Execute_should_return_expected_results_when_Filter_is_set( BsonDocument.Parse("{ _id : 2, value : 4 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_FinalizeFunction_is_set( [Values(false, true)] @@ -251,7 +251,7 @@ public void Execute_should_return_expected_results_when_FinalizeFunction_is_set( // TODO: figure out why test fails when JavaScriptMode = true (server bug?) - //[SkippableTheory] + //[Theory] //[ParameterAttributeData] //public void Execute_should_return_expected_results_when_JavaScriptMode_is_set( // [Values(null, false, true)] @@ -275,7 +275,7 @@ public void Execute_should_return_expected_results_when_FinalizeFunction_is_set( // BsonDocument.Parse("{ _id : 2, value : 4 }")); //} - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_Limit_is_set( [Values(1, 2)] @@ -302,7 +302,7 @@ public void Execute_should_return_expected_results_when_Limit_is_set( results.Should().Equal(expectedResults); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_MaxTime_is_set( [Values(null, 1000)] @@ -329,7 +329,7 @@ public void Execute_should_return_expected_results_when_MaxTime_is_set( BsonDocument.Parse("{ _id : 2, value : 4 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_ReadConcern_is_set( [Values(null, ReadConcernLevel.Local)] // only use values that are valid on StandAlone servers @@ -356,7 +356,7 @@ public void Execute_should_return_expected_results_when_ReadConcern_is_set( BsonDocument.Parse("{ _id : 2, value : 4 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_ResultSerializer_is_set( [Values(false, true)] @@ -376,7 +376,7 @@ public void Execute_should_return_expected_results_when_ResultSerializer_is_set( results.Should().Equal(3, 4); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_Scope_is_set( [Values(false, true)] @@ -402,7 +402,7 @@ public void Execute_should_return_expected_results_when_Scope_is_set( BsonDocument.Parse("{ _id : 2, value : 4 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_Sort_is_set( [Values(1, -1)] @@ -459,7 +459,7 @@ public void Execute_should_throw_when_binding_is_null( argumentNullException.ParamName.Should().Be("binding"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_maxTime_is_exceeded( [Values(false, true)] bool async) @@ -478,7 +478,7 @@ public void Execute_should_throw_when_maxTime_is_exceeded( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) @@ -492,7 +492,7 @@ public void Execute_should_send_session_id_when_supported( VerifySessionIdWasSentWhenSupported(subject, "mapReduce", async); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void CreateCommand_should_return_expected_result_when_ReadConcern_is_set( [Values(null, ReadConcernLevel.Linearizable, ReadConcernLevel.Local)] @@ -521,7 +521,7 @@ public void CreateCommand_should_return_expected_result_when_ReadConcern_is_set( result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void CreateCommand_should_return_the_expected_result_when_using_causal_consistency( [Values(null, ReadConcernLevel.Linearizable, ReadConcernLevel.Local)] diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceOutputToCollectionOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceOutputToCollectionOperationTests.cs index 2c72232cd52..571b743bee2 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceOutputToCollectionOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/MapReduceOutputToCollectionOperationTests.cs @@ -17,7 +17,7 @@ using System.Reflection; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Connections; @@ -328,7 +328,7 @@ public void CreateOutputOptions_should_return_expected_result_when_NonAtomicOutp result.Should().Be(expectedResult); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -347,7 +347,7 @@ public void Execute_should_return_expected_result( BsonDocument.Parse("{ _id : 2, value : 4 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_Collation_is_set( [Values(false, true)] @@ -389,7 +389,7 @@ public void Execute_should_return_expected_results_when_Collation_is_set( ReadAllFromCollection(_outputCollectionNamespace).Should().BeEquivalentTo(expectedResults); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_Filter_is_set( [Values(false, true)] @@ -412,7 +412,7 @@ public void Execute_should_return_expected_results_when_Filter_is_set( BsonDocument.Parse("{ _id : 2, value : 4 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_FinalizeFunction_is_set( [Values(false, true)] @@ -437,7 +437,7 @@ public void Execute_should_return_expected_results_when_FinalizeFunction_is_set( // TODO: figure out why test fails when JavaScriptMode = true (server bug?) - //[SkippableTheory] + //[Theory] //[ParameterAttributeData] //public void Execute_should_return_expected_results_when_JavaScriptMode_is_set( // [Values(null, false, true)] @@ -460,7 +460,7 @@ public void Execute_should_return_expected_results_when_FinalizeFunction_is_set( // BsonDocument.Parse("{ _id : 2, value : 4 }")); //} - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_Limit_is_set( [Values(1, 2)] @@ -486,7 +486,7 @@ public void Execute_should_return_expected_results_when_Limit_is_set( ReadAllFromCollection(_outputCollectionNamespace).Should().Equal(expectedResults); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_MaxTime_is_set( [Values(null, 1000)] @@ -512,7 +512,7 @@ public void Execute_should_return_expected_results_when_MaxTime_is_set( BsonDocument.Parse("{ _id : 2, value : 4 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_Scope_is_set( [Values(false, true)] @@ -537,7 +537,7 @@ public void Execute_should_return_expected_results_when_Scope_is_set( BsonDocument.Parse("{ _id : 2, value : 4 }")); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_results_when_Sort_is_set( [Values(1, -1)] @@ -593,7 +593,7 @@ public void Execute_should_throw_when_binding_is_null( argumentNullException.ParamName.Should().Be("binding"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_a_write_concern_error_occurs( [Values(false, true)] @@ -612,7 +612,7 @@ public void Execute_should_throw_when_a_write_concern_error_occurs( exception.Should().BeOfType(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/MaxTimeHelperTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/MaxTimeHelperTests.cs index 9583d341b80..9187c83d198 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/MaxTimeHelperTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/MaxTimeHelperTests.cs @@ -15,7 +15,7 @@ using System; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ReIndexOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ReIndexOperationTests.cs index fcfb046228d..0f508037d9d 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ReIndexOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ReIndexOperationTests.cs @@ -17,7 +17,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -71,7 +71,7 @@ public void WriteConcern_get_and_set_should_work( result.Should().BeSameAs(value); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -107,7 +107,7 @@ public void Execute_should_throw_when_binding_is_null( }); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ReadCommandOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ReadCommandOperationTests.cs index 9ecb6ad267e..e66a2fa67d1 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/ReadCommandOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/ReadCommandOperationTests.cs @@ -22,7 +22,7 @@ using MongoDB.Bson.IO; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Servers; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/RenameCollectionOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/RenameCollectionOperationTests.cs index af0363bfff7..ce97884bfed 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/RenameCollectionOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/RenameCollectionOperationTests.cs @@ -18,7 +18,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; @@ -160,7 +160,7 @@ public void DropTarget_should_work( result.Should().Be(dropTarget); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result( [Values(false, true)] @@ -176,7 +176,7 @@ public void Execute_should_return_expected_result( result["ok"].ToBoolean().Should().BeTrue(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_expected_result_when_dropTarget_is_true_and_newCollectionNamespace_exists( [Values(false, true)] @@ -195,7 +195,7 @@ public void Execute_should_return_expected_result_when_dropTarget_is_true_and_ne result["ok"].ToBoolean().Should().BeTrue(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_dropTarget_is_false_and_newCollectionNamespace_exists( [Values(false, true)] @@ -227,7 +227,7 @@ public void Execute_should_throw_when_binding_is_null( action.ShouldThrow().And.ParamName.Should().Be("binding"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_throw_when_a_write_concern_error_occurs( [Values(false, true)] @@ -246,7 +246,7 @@ public void Execute_should_throw_when_a_write_concern_error_occurs( exception.Should().BeOfType(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_send_session_id_when_supported( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/RetryabilityHelperTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/RetryabilityHelperTests.cs index 1ffea68d12a..779c694e354 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/RetryabilityHelperTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/RetryabilityHelperTests.cs @@ -17,7 +17,7 @@ using System.IO; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/RetryableDeleteCommandOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/RetryableDeleteCommandOperationTests.cs index ce7babac785..e77602db114 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/RetryableDeleteCommandOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/RetryableDeleteCommandOperationTests.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/RetryableUpdateCommandOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/RetryableUpdateCommandOperationTests.cs index f8d07ec8498..44f0eb9ae20 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/RetryableUpdateCommandOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/RetryableUpdateCommandOperationTests.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/UpdateOpcodeOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/UpdateOpcodeOperationTests.cs index 27a82145366..150eaa56d90 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/UpdateOpcodeOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/UpdateOpcodeOperationTests.cs @@ -16,7 +16,7 @@ using System; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/WriteCommandOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/WriteCommandOperationTests.cs index 8cbb3a60b09..6da9926706f 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Operations/WriteCommandOperationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Operations/WriteCommandOperationTests.cs @@ -22,7 +22,7 @@ using MongoDB.Bson.IO; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Servers; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Servers/HeartbeatDelayTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Servers/HeartbeatDelayTests.cs index de8709375b7..8c2e9014e08 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Servers/HeartbeatDelayTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Servers/HeartbeatDelayTests.cs @@ -18,7 +18,7 @@ using System.Threading; using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.Servers diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Servers/LoadBalancedServerTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Servers/LoadBalancedServerTests.cs index 81b7ed339f9..6a663956ebe 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Servers/LoadBalancedServerTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Servers/LoadBalancedServerTests.cs @@ -22,7 +22,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Configuration; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Servers/ServerTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Servers/ServerTests.cs index f9a60a07243..73a1f2d8957 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/Servers/ServerTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/Servers/ServerTests.cs @@ -25,7 +25,7 @@ using MongoDB.Bson.IO; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Clusters.ServerSelectors; @@ -897,7 +897,7 @@ private Server SetupServer(bool exceptionOnConnectionOpen, bool exceptionOnConne public class ServerChannelTests { - [SkippableTheory] + [Theory] [InlineData(1, 2, 2)] [InlineData(2, 1, 2)] public void Command_should_send_the_greater_of_the_session_and_cluster_cluster_times(long sessionTimestamp, long clusterTimestamp, long expectedTimestamp) @@ -950,7 +950,7 @@ public void Command_should_send_the_greater_of_the_session_and_cluster_cluster_t actualClusterTime.Should().Be(expectedClusterTime); } - [SkippableFact] + [Fact] public void Command_should_update_the_session_and_cluster_cluster_times() { RequireServer.Check().ClusterTypes(ClusterType.ReplicaSet, ClusterType.Sharded); @@ -987,7 +987,7 @@ public void Command_should_update_the_session_and_cluster_cluster_times() } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Command_should_use_serverApi([Values(false, true)] bool async) { diff --git a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/CommandWriteProtocolTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/CommandWriteProtocolTests.cs index e57a78f19e8..7e5c993b307 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/CommandWriteProtocolTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/CommandWriteProtocolTests.cs @@ -24,7 +24,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Connections; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/CommandMessageSectionTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/CommandMessageSectionTests.cs index 5bf94888178..c73ee5cea79 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/CommandMessageSectionTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/CommandMessageSectionTests.cs @@ -19,7 +19,7 @@ using MongoDB.Bson.IO; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/CommandMessageTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/CommandMessageTests.cs index b912af970f4..beeda5ee40a 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/CommandMessageTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/CommandMessageTests.cs @@ -21,7 +21,7 @@ using MongoDB.Bson; using MongoDB.Bson.IO; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.WireProtocol.Messages.Encoders; using MongoDB.Driver.Core.WireProtocol.Messages.Encoders.BinaryEncoders; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/BinaryEncoders/CommandMessageBinaryEncoderTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/BinaryEncoders/CommandMessageBinaryEncoderTests.cs index 91b2b520bcb..2c99282dbd1 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/BinaryEncoders/CommandMessageBinaryEncoderTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/BinaryEncoders/CommandMessageBinaryEncoderTests.cs @@ -22,7 +22,7 @@ using MongoDB.Bson.IO; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/BinaryEncoders/MessageBinaryEncoderBaseTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/BinaryEncoders/MessageBinaryEncoderBaseTests.cs index 49d464dd409..88cbf532c46 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/BinaryEncoders/MessageBinaryEncoderBaseTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/BinaryEncoders/MessageBinaryEncoderBaseTests.cs @@ -16,7 +16,7 @@ using System.IO; using System.Reflection; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.WireProtocol.Messages.Encoders.BinaryEncoders diff --git a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/BinaryEncoders/QueryMessageBinaryEncoderTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/BinaryEncoders/QueryMessageBinaryEncoderTests.cs index abd83d75469..5f9196472d1 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/BinaryEncoders/QueryMessageBinaryEncoderTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/BinaryEncoders/QueryMessageBinaryEncoderTests.cs @@ -18,7 +18,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.WireProtocol.Messages.Encoders.BinaryEncoders diff --git a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/JsonEncoders/CommandMessageJsonEncoderTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/JsonEncoders/CommandMessageJsonEncoderTests.cs index 34fa0b32c53..c4dae987fa4 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/JsonEncoders/CommandMessageJsonEncoderTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/Encoders/JsonEncoders/CommandMessageJsonEncoderTests.cs @@ -22,7 +22,7 @@ using MongoDB.Bson; using MongoDB.Bson.IO; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/QueryMessageTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/QueryMessageTests.cs index 67591281745..8beb8be06b3 100644 --- a/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/QueryMessageTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Core/WireProtocol/Messages/QueryMessageTests.cs @@ -17,7 +17,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.WireProtocol.Messages.Encoders; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/CreateIndexCommitQuorumTests.cs b/tests/MongoDB.Driver.Core.Tests/CreateIndexCommitQuorumTests.cs index 91a0ca0d051..1742fe8282a 100644 --- a/tests/MongoDB.Driver.Core.Tests/CreateIndexCommitQuorumTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/CreateIndexCommitQuorumTests.cs @@ -16,7 +16,7 @@ using System; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.Tests diff --git a/tests/MongoDB.Driver.Core.Tests/IAsyncCursorExtensionsTests.cs b/tests/MongoDB.Driver.Core.Tests/IAsyncCursorExtensionsTests.cs index f6d90885bf5..aff630021b5 100644 --- a/tests/MongoDB.Driver.Core.Tests/IAsyncCursorExtensionsTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/IAsyncCursorExtensionsTests.cs @@ -19,7 +19,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Operations; using MongoDB.Driver.Core.WireProtocol.Messages.Encoders; diff --git a/tests/MongoDB.Driver.Core.Tests/IAsyncCursorSourceExtensionsTests.cs b/tests/MongoDB.Driver.Core.Tests/IAsyncCursorSourceExtensionsTests.cs index 1e0b081cc9b..e2b8188ce43 100644 --- a/tests/MongoDB.Driver.Core.Tests/IAsyncCursorSourceExtensionsTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/IAsyncCursorSourceExtensionsTests.cs @@ -21,7 +21,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Operations; using MongoDB.Driver.Core.WireProtocol.Messages.Encoders; diff --git a/tests/MongoDB.Driver.Core.Tests/Jira/CSharp3173Tests.cs b/tests/MongoDB.Driver.Core.Tests/Jira/CSharp3173Tests.cs index 2b20aefee98..8d5c405ea23 100644 --- a/tests/MongoDB.Driver.Core.Tests/Jira/CSharp3173Tests.cs +++ b/tests/MongoDB.Driver.Core.Tests/Jira/CSharp3173Tests.cs @@ -22,7 +22,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Clusters.ServerSelectors; using MongoDB.Driver.Core.Configuration; diff --git a/tests/MongoDB.Driver.Core.Tests/LoadBalancingIntergationTests.cs b/tests/MongoDB.Driver.Core.Tests/LoadBalancingIntergationTests.cs index 79fd6560372..64edef3bb35 100644 --- a/tests/MongoDB.Driver.Core.Tests/LoadBalancingIntergationTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/LoadBalancingIntergationTests.cs @@ -20,7 +20,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization.Serializers; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Connections; @@ -43,7 +43,7 @@ public LoadBalancingIntergationTests() _collectionNamespace = CollectionNamespace.FromFullName("db.coll"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void BulkWrite_should_pin_connection_as_expected( [Values(1, 3)] int attempts, @@ -91,7 +91,7 @@ public void BulkWrite_should_pin_connection_as_expected( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void BulkWrite_and_cursor_should_share_pinned_connection_under_the_same_transaction_2( [Values(false, true)] bool async) @@ -163,7 +163,7 @@ public void BulkWrite_and_cursor_should_share_pinned_connection_under_the_same_t } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void BulkWrite_and_cursor_should_share_pinned_connection_under_the_same_transaction( [Values(1, 3)] int attempts, @@ -229,7 +229,7 @@ public void BulkWrite_and_cursor_should_share_pinned_connection_under_the_same_t } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Cursor_should_pin_connection_as_expected( [Values(1, 3)] int attempts, @@ -300,7 +300,7 @@ public void Cursor_should_pin_connection_as_expected( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Cursor_should_pin_connection_in_transaction_with_new_sessions_as_expected( [Values(1, 3)] int attempts, @@ -374,7 +374,7 @@ public void Cursor_should_pin_connection_in_transaction_with_new_sessions_as_exp } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Cursor_should_pin_connection_in_transaction_with_the_same_session_as_expected( [Values(1, 4)] int attempts, @@ -451,7 +451,7 @@ public void Cursor_should_pin_connection_in_transaction_with_the_same_session_as } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Cursor_should_unpin_connection_for_operations_under_the_same_transaction_after_abortTransaction_and_cursor_dispose( [Values(1, 3)] int attempts, diff --git a/tests/MongoDB.Driver.Core.Tests/MongoExceptionTests.cs b/tests/MongoDB.Driver.Core.Tests/MongoExceptionTests.cs index 3668bac3563..4425ec13bb9 100644 --- a/tests/MongoDB.Driver.Core.Tests/MongoExceptionTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/MongoExceptionTests.cs @@ -19,7 +19,7 @@ using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver diff --git a/tests/MongoDB.Driver.Core.Tests/Properties/AssemblyInfo.cs b/tests/MongoDB.Driver.Core.Tests/Properties/AssemblyInfo.cs index c98f691b42d..5ccb2904469 100644 --- a/tests/MongoDB.Driver.Core.Tests/Properties/AssemblyInfo.cs +++ b/tests/MongoDB.Driver.Core.Tests/Properties/AssemblyInfo.cs @@ -14,11 +14,11 @@ */ using System.Runtime.InteropServices; -using MongoDB.Driver.Core.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; [assembly: ComVisible(false)] [assembly: CollectionBehavior(DisableTestParallelization = true)] -[assembly: TestFramework(XunitExtensionsConsts.TimeoutEnforcingXunitFramework, XunitExtensionsConsts.TimeoutEnforcingFrameworkAssembly)] +[assembly: TestFramework(XunitExtensionsConstants.TimeoutEnforcingXunitFramework, XunitExtensionsConstants.TimeoutEnforcingFrameworkAssembly)] diff --git a/tests/MongoDB.Driver.Core.Tests/ReadConcernTests.cs b/tests/MongoDB.Driver.Core.Tests/ReadConcernTests.cs index c594865f310..db0c5284b11 100644 --- a/tests/MongoDB.Driver.Core.Tests/ReadConcernTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/ReadConcernTests.cs @@ -20,7 +20,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/ReadPreferenceHedgeTests.cs b/tests/MongoDB.Driver.Core.Tests/ReadPreferenceHedgeTests.cs index 6cf46ed5a65..9b6f36e6b7e 100644 --- a/tests/MongoDB.Driver.Core.Tests/ReadPreferenceHedgeTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/ReadPreferenceHedgeTests.cs @@ -14,7 +14,7 @@ */ using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Core.Tests diff --git a/tests/MongoDB.Driver.Core.Tests/ReadPreferenceTests.cs b/tests/MongoDB.Driver.Core.Tests/ReadPreferenceTests.cs index 22535318a7e..602d018ed55 100644 --- a/tests/MongoDB.Driver.Core.Tests/ReadPreferenceTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/ReadPreferenceTests.cs @@ -21,7 +21,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Tests; using Xunit; diff --git a/tests/MongoDB.Driver.Core.Tests/TransactionOptionsTests.cs b/tests/MongoDB.Driver.Core.Tests/TransactionOptionsTests.cs index dc2d18100e7..d9257362bed 100644 --- a/tests/MongoDB.Driver.Core.Tests/TransactionOptionsTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/TransactionOptionsTests.cs @@ -14,7 +14,7 @@ */ using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver diff --git a/tests/MongoDB.Driver.Core.Tests/WriteConcernTests.cs b/tests/MongoDB.Driver.Core.Tests/WriteConcernTests.cs index a44f75e0e05..690b8d61657 100644 --- a/tests/MongoDB.Driver.Core.Tests/WriteConcernTests.cs +++ b/tests/MongoDB.Driver.Core.Tests/WriteConcernTests.cs @@ -20,7 +20,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver diff --git a/tests/MongoDB.Driver.Examples/ClientSideEncryption2Examples.cs b/tests/MongoDB.Driver.Examples/ClientSideEncryption2Examples.cs index 536c478eae2..6c6b4dde152 100644 --- a/tests/MongoDB.Driver.Examples/ClientSideEncryption2Examples.cs +++ b/tests/MongoDB.Driver.Examples/ClientSideEncryption2Examples.cs @@ -33,7 +33,7 @@ public class ClientSideEncryption2Examples private readonly static CollectionNamespace CollectionNamespace = CollectionNamespace.FromFullName("docsExamples.encrypted"); private readonly static CollectionNamespace KeyVaultNamespace = CollectionNamespace.FromFullName("keyvault.datakeys"); - [SkippableFact] + [Fact] public void FLE2AutomaticEncryption() { RequireServer.Check().Supports(Feature.Csfle2).ClusterTypes(ClusterType.ReplicaSet, ClusterType.Sharded, ClusterType.LoadBalanced); diff --git a/tests/MongoDB.Driver.Examples/Properties/AssemblyInfo.cs b/tests/MongoDB.Driver.Examples/Properties/AssemblyInfo.cs index fbbd5774143..35a2ab489b9 100644 --- a/tests/MongoDB.Driver.Examples/Properties/AssemblyInfo.cs +++ b/tests/MongoDB.Driver.Examples/Properties/AssemblyInfo.cs @@ -14,8 +14,11 @@ */ using System.Runtime.InteropServices; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; [assembly: ComVisible(false)] [assembly: CollectionBehavior(DisableTestParallelization = true)] + +[assembly: TestFramework(XunitExtensionsConstants.TimeoutEnforcingXunitFramework, XunitExtensionsConstants.TimeoutEnforcingFrameworkAssembly)] diff --git a/tests/MongoDB.Driver.Examples/TransactionExamplesForDocs/WithTransactionExample1.cs b/tests/MongoDB.Driver.Examples/TransactionExamplesForDocs/WithTransactionExample1.cs index 6c4ab87e324..2a384355165 100644 --- a/tests/MongoDB.Driver.Examples/TransactionExamplesForDocs/WithTransactionExample1.cs +++ b/tests/MongoDB.Driver.Examples/TransactionExamplesForDocs/WithTransactionExample1.cs @@ -25,7 +25,7 @@ namespace MongoDB.Driver.Examples.TransactionExamplesForDocs { public class WithTransactionExample1 { - [SkippableFact] + [Fact] public void Example1() { RequireServer.Check().ClusterTypes(ClusterType.ReplicaSet, ClusterType.Sharded).Supports(Feature.Transactions); diff --git a/tests/MongoDB.Driver.Examples/UpdatePrimer.cs b/tests/MongoDB.Driver.Examples/UpdatePrimer.cs index 3fe3778115e..af423307167 100644 --- a/tests/MongoDB.Driver.Examples/UpdatePrimer.cs +++ b/tests/MongoDB.Driver.Examples/UpdatePrimer.cs @@ -23,7 +23,7 @@ namespace MongoDB.Driver.Examples { public class UpdatePrimer : PrimerTestFixture { - [SkippableFact] + [Fact] public async Task UpdateTopLevelFields() { RequireServer.Check(); @@ -74,7 +74,7 @@ public async Task UpdateEmbeddedField() // @end: update-embedded-field } - [SkippableFact] + [Fact] public async Task UpdateMultipleDocuments() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.GridFS.Tests/DelegatingStreamTests.cs b/tests/MongoDB.Driver.GridFS.Tests/DelegatingStreamTests.cs index dcd02487a56..2656fbb44c2 100644 --- a/tests/MongoDB.Driver.GridFS.Tests/DelegatingStreamTests.cs +++ b/tests/MongoDB.Driver.GridFS.Tests/DelegatingStreamTests.cs @@ -18,7 +18,7 @@ using System.Threading; using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.GridFS.Tests/GridFSBucketOptionsTests.cs b/tests/MongoDB.Driver.GridFS.Tests/GridFSBucketOptionsTests.cs index 74d80659d7c..f8b68630834 100644 --- a/tests/MongoDB.Driver.GridFS.Tests/GridFSBucketOptionsTests.cs +++ b/tests/MongoDB.Driver.GridFS.Tests/GridFSBucketOptionsTests.cs @@ -19,7 +19,7 @@ using System.Text; using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.GridFS.Tests diff --git a/tests/MongoDB.Driver.GridFS.Tests/GridFSBucketTests.cs b/tests/MongoDB.Driver.GridFS.Tests/GridFSBucketTests.cs index cad743c9580..36d0690b019 100644 --- a/tests/MongoDB.Driver.GridFS.Tests/GridFSBucketTests.cs +++ b/tests/MongoDB.Driver.GridFS.Tests/GridFSBucketTests.cs @@ -21,7 +21,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -327,7 +327,7 @@ public void DownloadToStreamByName_should_throw_when_filename_is_null( action.ShouldThrow().And.ParamName.Should().Be("filename"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Drop_should_drop_the_files_and_chunks_collections( [Values(false, true)] bool async) @@ -352,7 +352,7 @@ public void Drop_should_drop_the_files_and_chunks_collections( collectionNames.Should().NotContain("fs.chunks"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Drop_should_throw_when_a_write_concern_error_occurss( [Values(false, true)] diff --git a/tests/MongoDB.Driver.GridFS.Tests/GridFSDownloadStreamBaseTests.cs b/tests/MongoDB.Driver.GridFS.Tests/GridFSDownloadStreamBaseTests.cs index 9f031c1796b..efce1a67b53 100644 --- a/tests/MongoDB.Driver.GridFS.Tests/GridFSDownloadStreamBaseTests.cs +++ b/tests/MongoDB.Driver.GridFS.Tests/GridFSDownloadStreamBaseTests.cs @@ -20,7 +20,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; diff --git a/tests/MongoDB.Driver.GridFS.Tests/GridFSFileInfoTests.cs b/tests/MongoDB.Driver.GridFS.Tests/GridFSFileInfoTests.cs index b09c32d921f..b8a28b31b51 100644 --- a/tests/MongoDB.Driver.GridFS.Tests/GridFSFileInfoTests.cs +++ b/tests/MongoDB.Driver.GridFS.Tests/GridFSFileInfoTests.cs @@ -22,7 +22,7 @@ using MongoDB.Bson; using MongoDB.Bson.IO; using MongoDB.Bson.Serialization; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.GridFS.Tests diff --git a/tests/MongoDB.Driver.GridFS.Tests/GridFSFindOptionsTests.cs b/tests/MongoDB.Driver.GridFS.Tests/GridFSFindOptionsTests.cs index b8e3d3efe79..6532d091905 100644 --- a/tests/MongoDB.Driver.GridFS.Tests/GridFSFindOptionsTests.cs +++ b/tests/MongoDB.Driver.GridFS.Tests/GridFSFindOptionsTests.cs @@ -19,7 +19,7 @@ using System.Text; using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.GridFS.Tests diff --git a/tests/MongoDB.Driver.GridFS.Tests/GridFSSeekableDownloadStreamTests.cs b/tests/MongoDB.Driver.GridFS.Tests/GridFSSeekableDownloadStreamTests.cs index cd6cd2e878e..379a4dfd955 100644 --- a/tests/MongoDB.Driver.GridFS.Tests/GridFSSeekableDownloadStreamTests.cs +++ b/tests/MongoDB.Driver.GridFS.Tests/GridFSSeekableDownloadStreamTests.cs @@ -20,7 +20,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; diff --git a/tests/MongoDB.Driver.GridFS.Tests/GridFSUploadOptionsTests.cs b/tests/MongoDB.Driver.GridFS.Tests/GridFSUploadOptionsTests.cs index 485819ed9e7..4a6fa3d46d2 100644 --- a/tests/MongoDB.Driver.GridFS.Tests/GridFSUploadOptionsTests.cs +++ b/tests/MongoDB.Driver.GridFS.Tests/GridFSUploadOptionsTests.cs @@ -20,7 +20,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.GridFS.Tests diff --git a/tests/MongoDB.Driver.GridFS.Tests/GridFSUploadStreamTests.cs b/tests/MongoDB.Driver.GridFS.Tests/GridFSUploadStreamTests.cs index 1f3cbca7e46..ce063af2048 100644 --- a/tests/MongoDB.Driver.GridFS.Tests/GridFSUploadStreamTests.cs +++ b/tests/MongoDB.Driver.GridFS.Tests/GridFSUploadStreamTests.cs @@ -17,7 +17,7 @@ using System.IO; using System.Threading; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Tests; using Xunit; diff --git a/tests/MongoDB.Driver.GridFS.Tests/Properties/AssemblyInfo.cs b/tests/MongoDB.Driver.GridFS.Tests/Properties/AssemblyInfo.cs index b9c458de29c..35a2ab489b9 100644 --- a/tests/MongoDB.Driver.GridFS.Tests/Properties/AssemblyInfo.cs +++ b/tests/MongoDB.Driver.GridFS.Tests/Properties/AssemblyInfo.cs @@ -14,11 +14,11 @@ */ using System.Runtime.InteropServices; -using MongoDB.Driver.Core.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; [assembly: ComVisible(false)] [assembly: CollectionBehavior(DisableTestParallelization = true)] -[assembly: TestFramework(XunitExtensionsConsts.TimeoutEnforcingXunitFramework, XunitExtensionsConsts.TimeoutEnforcingFrameworkAssembly)] +[assembly: TestFramework(XunitExtensionsConstants.TimeoutEnforcingXunitFramework, XunitExtensionsConstants.TimeoutEnforcingFrameworkAssembly)] diff --git a/tests/MongoDB.Driver.GridFS.Tests/Specifications/gridfs/GridFSTestRunner.cs b/tests/MongoDB.Driver.GridFS.Tests/Specifications/gridfs/GridFSTestRunner.cs index ff25181e5d7..481259cc4ca 100644 --- a/tests/MongoDB.Driver.GridFS.Tests/Specifications/gridfs/GridFSTestRunner.cs +++ b/tests/MongoDB.Driver.GridFS.Tests/Specifications/gridfs/GridFSTestRunner.cs @@ -18,17 +18,16 @@ using System.IO; using System.Linq; using System.Reflection; -using System.Threading.Tasks; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; using MongoDB.Driver.Tests; using Xunit; +using Xunit.Sdk; namespace MongoDB.Driver.GridFS.Tests.Specifications.gridfs { public class GridFSTestRunner { - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseSource))] [Trait("Category", "Specifications_gridfs")] public void RunTest(BsonDocument data, BsonDocument testDefinition) diff --git a/tests/MongoDB.Driver.Legacy.Tests/Builders/IndexKeysBuilderTests.cs b/tests/MongoDB.Driver.Legacy.Tests/Builders/IndexKeysBuilderTests.cs index 82e28798e05..78c2385e92a 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Builders/IndexKeysBuilderTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Builders/IndexKeysBuilderTests.cs @@ -37,7 +37,7 @@ public IndexKeysBuilderTests() _primary = _server.Primary; } - [SkippableFact] + [Fact] public void CreateIndex_with_wildcard_index_should_create_expected_index() { RequireServer.Check().Supports(Feature.WildcardIndexes); @@ -54,7 +54,7 @@ public void CreateIndex_with_wildcard_index_should_create_expected_index() index["key"]["a.$**"].AsInt32.Should().Be(1); } - [SkippableFact] + [Fact] public void CreateIndex_with_wildcardProjection_should_create_expected_index() { RequireServer.Check().Supports(Feature.WildcardIndexes); @@ -248,7 +248,7 @@ public void TestTextCombination() Assert.Equal(expected, key.ToJson()); } - [SkippableFact] + [Fact] public void TestTextIndexCreation() { RequireServer.Check().VersionGreaterThanOrEqualTo("2.6.0").ClusterTypes(ClusterType.Standalone, ClusterType.ReplicaSet); diff --git a/tests/MongoDB.Driver.Legacy.Tests/Builders/IndexKeysBuilderTypedTests.cs b/tests/MongoDB.Driver.Legacy.Tests/Builders/IndexKeysBuilderTypedTests.cs index 0e8b3af14ee..de82af9eead 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Builders/IndexKeysBuilderTypedTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Builders/IndexKeysBuilderTypedTests.cs @@ -60,7 +60,7 @@ private class Test public int Id { get; set; } } - [SkippableFact] + [Fact] public void CreateIndex_with_wildcard_index_should_create_expected_index() { RequireServer.Check().Supports(Feature.WildcardIndexes); @@ -74,7 +74,7 @@ public void CreateIndex_with_wildcard_index_should_create_expected_index() index["key"]["a.$**"].AsInt32.Should().Be(1); } - [SkippableFact] + [Fact] public void CreateIndex_with_wildcardProjection_should_create_expected_index() { RequireServer.Check().Supports(Feature.WildcardIndexes); @@ -298,7 +298,7 @@ public void TestTextArrayNonArrayFields2() Assert.Equal(expected, keys.ToJson()); } - [SkippableFact] + [Fact] public void TestTextIndexCreation() { RequireServer.Check().VersionGreaterThanOrEqualTo("2.6.0").ClusterTypes(ClusterType.Standalone, ClusterType.ReplicaSet); diff --git a/tests/MongoDB.Driver.Legacy.Tests/ClientDocumentHelperTests.cs b/tests/MongoDB.Driver.Legacy.Tests/ClientDocumentHelperTests.cs index 13399a73803..36ac58c16e2 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/ClientDocumentHelperTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/ClientDocumentHelperTests.cs @@ -16,7 +16,7 @@ using System.Linq; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Connections; using Xunit; diff --git a/tests/MongoDB.Driver.Legacy.Tests/CommandResults/CollectionStatsResultTests.cs b/tests/MongoDB.Driver.Legacy.Tests/CommandResults/CollectionStatsResultTests.cs index 9aa38a69fb6..f5b81dada13 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/CommandResults/CollectionStatsResultTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/CommandResults/CollectionStatsResultTests.cs @@ -34,7 +34,7 @@ public CollectionStatsResultTests() _collection = LegacyTestConfiguration.Collection; } - [SkippableFact] + [Fact] public void Test() { RequireServer.Check().ClusterTypes(ClusterType.Standalone, ClusterType.ReplicaSet).StorageEngine("mmapv1"); diff --git a/tests/MongoDB.Driver.Legacy.Tests/CommandResults/DatabaseStatsResultTests.cs b/tests/MongoDB.Driver.Legacy.Tests/CommandResults/DatabaseStatsResultTests.cs index e0dfa1afddd..efc8a588e79 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/CommandResults/DatabaseStatsResultTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/CommandResults/DatabaseStatsResultTests.cs @@ -14,7 +14,7 @@ */ using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver; using MongoDB.Driver.Core; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -35,7 +35,7 @@ public DatabaseStatsResultTests() _collection = LegacyTestConfiguration.Collection; } - [SkippableFact] + [Fact] public void Test() { RequireServer.Check().StorageEngine("mmapv1"); diff --git a/tests/MongoDB.Driver.Legacy.Tests/DefaultLegacyOperationExecutorTests.cs b/tests/MongoDB.Driver.Legacy.Tests/DefaultLegacyOperationExecutorTests.cs index ba7b6c94fe8..27a6335c258 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/DefaultLegacyOperationExecutorTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/DefaultLegacyOperationExecutorTests.cs @@ -16,7 +16,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Operations; using Moq; diff --git a/tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp216Tests.cs b/tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp216Tests.cs index 2f6bb0a325b..ebd20190675 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp216Tests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp216Tests.cs @@ -15,7 +15,7 @@ using System.Linq; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -32,7 +32,7 @@ public CSharp216Tests() _adminDatabase = LegacyTestConfiguration.Server.GetDatabase("admin"); } - [SkippableFact] + [Fact] public void TestAmbiguousEvalArguments() { RequireServer.Check().Supports(Feature.Eval); @@ -51,7 +51,7 @@ public void TestAmbiguousEvalArguments() #pragma warning restore } - [SkippableFact] + [Fact] public void TestNoLock() { RequireServer.Check().Supports(Feature.Eval); diff --git a/tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp269Tests.cs b/tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp269Tests.cs index af706f43e90..89ceac2f059 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp269Tests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp269Tests.cs @@ -43,7 +43,7 @@ public CSharp269Tests() _database.GridFS.Chunks.Drop(); } - [SkippableFact] + [Fact] public void TestUploadAndDownload() { RequireServer.Check().ClusterTypes(Core.Clusters.ClusterType.Standalone, Core.Clusters.ClusterType.ReplicaSet); diff --git a/tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp365Tests.cs b/tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp365Tests.cs index 01d4b1eb0c2..031b3f95cd9 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp365Tests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Jira/CSharp365Tests.cs @@ -23,7 +23,7 @@ namespace MongoDB.Driver.Tests.Jira.CSharp365 { public class CSharp365Tests { - [SkippableFact] + [Fact] public void TestExplainWithFieldsAndCoveredIndex() { RequireServer.Check().Supports(Feature.LegacyWireProtocol); diff --git a/tests/MongoDB.Driver.Legacy.Tests/Linq/BsonDocumentBackedClassSerializerTests.cs b/tests/MongoDB.Driver.Legacy.Tests/Linq/BsonDocumentBackedClassSerializerTests.cs index 386d84dbb3c..9ffc6e09498 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Linq/BsonDocumentBackedClassSerializerTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Linq/BsonDocumentBackedClassSerializerTests.cs @@ -21,7 +21,7 @@ using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.Serialization.Options; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Builders; using Xunit; diff --git a/tests/MongoDB.Driver.Legacy.Tests/Linq/ExplainTests.cs b/tests/MongoDB.Driver.Legacy.Tests/Linq/ExplainTests.cs index 062ddced971..9f4287b11cd 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Linq/ExplainTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Linq/ExplainTests.cs @@ -42,7 +42,7 @@ public ExplainTests() _collection = LegacyTestConfiguration.Collection; } - [SkippableFact] + [Fact] public void TestExplainFromLinqQueryEqualsExplainFromCursor() { RequireServer.Check().Supports(Feature.LegacyWireProtocol); @@ -64,7 +64,7 @@ public void TestExplainFromLinqQueryEqualsExplainFromCursor() } } - [SkippableFact] + [Fact] public void TestVerboseExplainFromLinqQueryEqualsVerboseExplainFromCursor() { RequireServer.Check().Supports(Feature.LegacyWireProtocol); diff --git a/tests/MongoDB.Driver.Legacy.Tests/Linq/SelectNullableTests.cs b/tests/MongoDB.Driver.Legacy.Tests/Linq/SelectNullableTests.cs index 6911aea7b69..611e1e0b96a 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Linq/SelectNullableTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Linq/SelectNullableTests.cs @@ -17,7 +17,7 @@ using System.Linq; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver; using MongoDB.Driver.Linq; using Xunit; @@ -61,7 +61,7 @@ private static bool OneTimeSetup() return true; } - [SkippableFact] + [Fact] public void TestWhereEEqualsA() { RequireEnvironment.Check().EnvironmentVariable("MONO"); // Does not pass on Mono 3.2.5. Excluding for now. diff --git a/tests/MongoDB.Driver.Legacy.Tests/Linq/SelectOfTypeHierarchicalTests.cs b/tests/MongoDB.Driver.Legacy.Tests/Linq/SelectOfTypeHierarchicalTests.cs index 10947efab8d..e225d24fde7 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Linq/SelectOfTypeHierarchicalTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Linq/SelectOfTypeHierarchicalTests.cs @@ -250,7 +250,7 @@ where b is D Assert.Equal(1, Consume(query)); } - [SkippableFact] + [Fact] public void TestWhereBTypeEqualsB() { RequireServer.Check().VersionGreaterThanOrEqualTo("2.0.0"); diff --git a/tests/MongoDB.Driver.Legacy.Tests/Linq/SelectQueryTests.cs b/tests/MongoDB.Driver.Legacy.Tests/Linq/SelectQueryTests.cs index 59c31a82aec..eb865b5dc0b 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Linq/SelectQueryTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Linq/SelectQueryTests.cs @@ -4456,7 +4456,7 @@ where c.SA[0].Contains("o") Assert.Equal(1, Consume(query)); } - [SkippableFact] + [Fact] public void TestWhereSASub0ContainsONot() { var query = from c in __collection.AsQueryable() @@ -4502,7 +4502,7 @@ where c.SA[0].EndsWith("m") Assert.Equal(1, Consume(query)); } - [SkippableFact] + [Fact] public void TestWhereSASub0EndsWithMNot() { var query = from c in __collection.AsQueryable() @@ -4549,7 +4549,7 @@ where regex.IsMatch(c.SA[0]) Assert.Equal(1, Consume(query)); } - [SkippableFact] + [Fact] public void TestWhereSASub0IsMatchNot() { var regex = new Regex(@"^T"); @@ -4596,7 +4596,7 @@ where Regex.IsMatch(c.SA[0], "^T") Assert.Equal(1, Consume(query)); } - [SkippableFact] + [Fact] public void TestWhereSASub0IsMatchStaticNot() { var query = from c in __collection.AsQueryable() @@ -4665,7 +4665,7 @@ where c.SA[0].StartsWith("T") Assert.Equal(1, Consume(query)); } - [SkippableFact] + [Fact] public void TestWhereSASub0StartsWithTNot() { var query = from c in __collection.AsQueryable() diff --git a/tests/MongoDB.Driver.Legacy.Tests/Linq/WithIndexTests.cs b/tests/MongoDB.Driver.Legacy.Tests/Linq/WithIndexTests.cs index eed0c3c4b9d..8aafe399ff5 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Linq/WithIndexTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Linq/WithIndexTests.cs @@ -106,7 +106,7 @@ public void TestQueryWithIndexBeforeConditionHasIndexNameHint() Assert.Equal("{ \"a\" : 1, \"b\" : 3 }", selectQuery.BuildQuery().ToJson()); } - [SkippableFact] + [Fact] public void TestIndexNameHintIsUsedInQuery() { RequireServer.Check().Supports(Feature.LegacyWireProtocol); @@ -184,7 +184,7 @@ public void TestQueryWithIndexBeforeConditionHasIndexDocumentHint() Assert.Equal("{ \"a\" : 1, \"b\" : 3 }", selectQuery.BuildQuery().ToJson()); } - [SkippableFact] + [Fact] public void TestIndexDocumentHintIsUsedInQuery() { RequireServer.Check().Supports(Feature.LegacyWireProtocol); diff --git a/tests/MongoDB.Driver.Legacy.Tests/MongoCollectionTests.cs b/tests/MongoDB.Driver.Legacy.Tests/MongoCollectionTests.cs index 9830a72b8b0..fb2dde4aad7 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/MongoCollectionTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/MongoCollectionTests.cs @@ -26,7 +26,7 @@ using MongoDB.Driver.GeoJsonObjectModel; using FluentAssertions; using Xunit; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; @@ -140,7 +140,7 @@ public void TestAggregateCursor() Assert.Equal(2, dictionary[3]); } - [SkippableFact] + [Fact] public void TestAggregateExplain() { RequireServer.Check().Supports(Feature.LegacyWireProtocol); @@ -184,7 +184,7 @@ public void TestAggregateMaxTime() } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void TestAggregateOutputToCollection( [Values("$out", "$merge")] string lastStageName, @@ -259,7 +259,7 @@ public void TestAggregateOutputToCollection( Assert.Equal(2, dictionary[3]); } - [SkippableFact] + [Fact] public void TestAggregateWriteConcern() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -441,7 +441,7 @@ public void TestCountZero() Assert.Equal(0, count); } - [SkippableFact] + [Fact] public void TestCountUsesImplicitSession() { RequireServer.Check(); @@ -484,7 +484,7 @@ public void TestCountWithMaxTime() } } - [SkippableFact] + [Fact] public void TestCountWithMaxTimeFromFind() { RequireServer.Check(); @@ -509,7 +509,7 @@ public void TestCountWithQuery() Assert.Equal(1, count); } - [SkippableFact] + [Fact] public void TestCountWithReadPreferenceFromFind() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -525,7 +525,7 @@ public void TestCountWithReadPreferenceFromFind() } } - [SkippableFact] + [Fact] public void TestCountWithHint() { RequireServer.Check(); @@ -542,7 +542,7 @@ public void TestCountWithHint() Assert.Equal(1, count); } - [SkippableFact] + [Fact] public void TestCountWithHintFromFind() { RequireServer.Check(); @@ -554,7 +554,7 @@ public void TestCountWithHintFromFind() Assert.Equal(1, count); } - [SkippableFact] + [Fact] public void TestCountWithHintAndLimitFromFind() { RequireServer.Check(); @@ -576,7 +576,7 @@ public void TestCreateCollection() Assert.True(collection.Exists()); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void TestCreateCollectionSetAutoIndexId( [Values(false, true)] @@ -596,7 +596,7 @@ public void TestCreateCollectionSetAutoIndexId( Assert.Equal(expectedIndexCount, indexCount); } - [SkippableFact] + [Fact] public void TestCreateCollectionSetCappedSetMaxDocuments() { RequireServer.Check().ClusterTypes(ClusterType.Standalone, ClusterType.ReplicaSet).StorageEngine("mmapv1"); @@ -612,7 +612,7 @@ public void TestCreateCollectionSetCappedSetMaxDocuments() Assert.True(stats.MaxDocuments == 1000); } - [SkippableFact] + [Fact] public void TestCreateCollectionSetCappedSetMaxSize() { RequireServer.Check().ClusterTypes(ClusterType.Standalone, ClusterType.ReplicaSet).StorageEngine("mmapv1"); @@ -627,7 +627,7 @@ public void TestCreateCollectionSetCappedSetMaxSize() Assert.True(stats.StorageSize >= 10000); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void TestCreateCollectionSetNoPadding( [Values(false, true)] @@ -648,7 +648,7 @@ public void TestCreateCollectionSetNoPadding( Assert.Equal(userFlags, stats.UserFlags); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void TestCreateCollectionSetUsePowerOf2Sizes( [Values(false, true)] @@ -764,7 +764,7 @@ void AssertNamespace(IndexInfo indexInfo) Assert.True(indexes[1].Version >= 0); } - [SkippableFact] + [Fact] public void TestCreateIndexWithStorageEngine() { RequireServer.Check().StorageEngine("wiredTiger"); @@ -780,7 +780,7 @@ public void TestCreateIndexWithStorageEngine() Assert.Equal(2, result.Count); } - [SkippableFact] + [Fact] public void TestCreateIndexWriteConcern() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -917,7 +917,7 @@ public void TestDropIndex() _collection.IndexExistsByName("x_1").Should().BeFalse(); } - [SkippableFact] + [Fact] public void TestDropIndexWriteConcern() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -949,7 +949,7 @@ public void TestCreateIndexTimeToLive() Assert.Equal(TimeSpan.FromHours(1), indexes[1].TimeToLive); } - [SkippableFact] + [Fact] public void TestExplain() { RequireServer.Check().Supports(Feature.LegacyWireProtocol); @@ -1098,7 +1098,7 @@ public void TestFindAndModifyUpsert() Assert.Equal(1, result.ModifiedDocument["count"].AsInt32); } - [SkippableFact] + [Fact] public void TestFindAndModifyReplaceWithWriteConcernError() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -1125,7 +1125,7 @@ public void TestFindAndModifyReplaceWithWriteConcernError() modifiedDocument.Should().Be("{ _id : 1, x : 2 }"); } - [SkippableFact] + [Fact] public void TestFindAndModifyUpdateWithWriteConcernError() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -1248,7 +1248,7 @@ public void TestFindAndRemoveWithMaxTime() } } - [SkippableFact] + [Fact] public void TestFindAndRemoveWithWriteConcernError() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -1547,7 +1547,7 @@ public void TestFindWithinRectangle() // note: the hits are unordered } - [SkippableFact] + [Fact] public void TestFindWithMaxScan() { RequireServer.Check().VersionLessThan("4.1.0-"); @@ -1588,7 +1588,7 @@ private class Place } #pragma warning restore - [SkippableFact] + [Fact] public void TestGeoHaystackSearch() { RequireServer.Check().VersionLessThan("4.8.0"); @@ -1625,7 +1625,7 @@ public void TestGeoHaystackSearch() } } - [SkippableFact] + [Fact] public void TestGeoHaystackSearchWithMaxTime() { RequireServer.Check().VersionLessThan("4.8.0"); @@ -1659,7 +1659,7 @@ public void TestGeoHaystackSearchWithMaxTime() } } - [SkippableFact] + [Fact] public void TestGeoHaystackSearch_Typed() { RequireServer.Check().VersionLessThan("4.8.0"); @@ -1695,7 +1695,7 @@ public void TestGeoHaystackSearch_Typed() } } - [SkippableFact] + [Fact] public void TestGeoNear() { RequireServer.Check().Supports(Feature.GeoNearCommand); @@ -1742,7 +1742,7 @@ public void TestGeoNear() Assert.Equal("Coffee", place.Type); } - [SkippableFact] + [Fact] public void TestGeoNearGeneric() { RequireServer.Check().Supports(Feature.GeoNearCommand); @@ -1789,7 +1789,7 @@ public void TestGeoNearGeneric() Assert.Equal("Coffee", place.Type); } - [SkippableFact] + [Fact] public void TestGeoNearSphericalFalse() { RequireServer.Check().Supports(Feature.GeoNearCommand); @@ -1845,7 +1845,7 @@ public void TestGeoNearSphericalFalse() Assert.Equal("Coffee", hit2.RawDocument["Type"].AsString); } - [SkippableFact] + [Fact] public void TestGeoNearSphericalTrue() { RequireServer.Check().Supports(Feature.GeoNearCommand); @@ -1901,7 +1901,7 @@ public void TestGeoNearSphericalTrue() Assert.Equal("Coffee", hit2.RawDocument["Type"].AsString); } - [SkippableFact] + [Fact] public void TestGeoNearWithGeoJsonPoints() { RequireServer.Check().Supports(Feature.GeoNearCommand); @@ -1939,7 +1939,7 @@ public void TestGeoNearWithGeoJsonPoints() Assert.Equal("Coffee", hit2.Type); } - [SkippableFact] + [Fact] public void TestGeoNearWithMaxTime() { RequireServer.Check().Supports(Feature.GeoNearCommand); @@ -2032,7 +2032,7 @@ public void TestGetMore() _collection.FindAll().ToList(); } - [SkippableFact] + [Fact] public void TestGroupWithFinalizeFunction() { RequireServer.Check().Supports(Feature.GroupCommand); @@ -2062,7 +2062,7 @@ public void TestGroupWithFinalizeFunction() Assert.Equal(-3, results[2]["count"].ToInt32()); } - [SkippableFact] + [Fact] public void TestGroupWithKeyFields() { RequireServer.Check().Supports(Feature.GroupCommand); @@ -2091,7 +2091,7 @@ public void TestGroupWithKeyFields() Assert.Equal(3, results[2]["count"].ToInt32()); } - [SkippableFact] + [Fact] public void TestGroupWithKeyFunction() { RequireServer.Check().Supports(Feature.GroupCommand); @@ -2120,7 +2120,7 @@ public void TestGroupWithKeyFunction() Assert.Equal(3, results[2]["count"].ToInt32()); } - [SkippableFact] + [Fact] public void TestGroupWithMaxTime() { RequireServer.Check().Supports(Feature.GroupCommand); @@ -2147,7 +2147,7 @@ public void TestGroupWithMaxTime() } } - [SkippableFact] + [Fact] public void TestGroupWithQuery() { RequireServer.Check().Supports(Feature.GroupCommand); @@ -2256,7 +2256,7 @@ public void TestInsertBatchContinueOnError() Assert.Equal(3, collection.Count()); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void TestInsertBatchMultipleBatchesWriteConcernDisabledContinueOnErrorFalse( [Values(false, true)] bool retryWrites) @@ -2297,7 +2297,7 @@ public void TestInsertBatchMultipleBatchesWriteConcernDisabledContinueOnErrorFal Assert.Equal(0, collection.Count(Query.EQ("_id", 5))); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void TestInsertBatchMultipleBatchesWriteConcernDisabledContinueOnErrorTrue( [Values(false, true)] bool retryWrites) @@ -2496,7 +2496,7 @@ public void TestInsertDuplicateKey() CheckExpectedResult(expectedResult, result); } - [SkippableFact] + [Fact] public void TestInsertWithWriteConcernError() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -2870,7 +2870,7 @@ public void TestMapReduceInlineWithQuery() } } - [SkippableFact] + [Fact] public void TestMapReduceWriteConcern() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -3023,7 +3023,7 @@ public void TestRemoveNoMatchingDocument() Assert.Equal(0, _collection.Count()); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void TestRemoveUnacknowledeged( [Values(false, true)] bool retryWrites) @@ -3044,7 +3044,7 @@ public void TestRemoveUnacknowledeged( } } - [SkippableFact] + [Fact] public void TestRemoveWithWriteConcernError() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -3126,7 +3126,7 @@ public void TestGetStats() _collection.GetStats(); } - [SkippableFact] + [Fact] public void TestGetStatsNoPadding() { RequireServer.Check().ClusterTypes(ClusterType.Standalone, ClusterType.ReplicaSet).StorageEngine("mmapv1"); @@ -3144,7 +3144,7 @@ public void TestGetStatsNoPadding() Assert.True((stats.UserFlags & CollectionUserFlags.NoPadding) != 0); } - [SkippableFact] + [Fact] public void TestGetStatsUsePowerOf2Sizes() { RequireServer.Check().ClusterTypes(ClusterType.Standalone, ClusterType.ReplicaSet).StorageEngine("mmapv1"); @@ -3297,7 +3297,7 @@ public void TestUpdateNullQuery() Assert.Equal(2, _collection.Count()); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void TestUpdateUnacknowledged( [Values(false, true)] bool retryWrites) @@ -3321,7 +3321,7 @@ public void TestUpdateUnacknowledged( } } - [SkippableFact] + [Fact] public void TestUpdateWithWriteConcernError() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -3395,7 +3395,7 @@ public void TestUpsertDuplicateKey() }); } - [SkippableFact] + [Fact] public void TestValidate() { RequireServer.Check().StorageEngine("mmapv1"); diff --git a/tests/MongoDB.Driver.Legacy.Tests/MongoDatabaseTests.cs b/tests/MongoDB.Driver.Legacy.Tests/MongoDatabaseTests.cs index aee0bb74b94..1fe01451f27 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/MongoDatabaseTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/MongoDatabaseTests.cs @@ -18,7 +18,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver; using MongoDB.Driver.Builders; using MongoDB.Driver.Core; @@ -82,7 +82,7 @@ public void TestCreateCollection() Assert.True(_database.CollectionExists(collectionName)); } - [SkippableFact] + [Fact] public void TestCreateCollectionSetIndexOptionDefaults() { RequireServer.Check().ClusterTypes(ClusterType.Standalone, ClusterType.ReplicaSet); @@ -102,7 +102,7 @@ public void TestCreateCollectionSetIndexOptionDefaults() Assert.Equal(expectedIndexOptionDefaultsDocument, collectionInfo["options"]["indexOptionDefaults"]); } - [SkippableFact] + [Fact] public void TestCreateCollectionSetStorageEngine() { RequireServer.Check().VersionGreaterThanOrEqualTo("2.7.0"); @@ -125,7 +125,7 @@ public void TestCreateCollectionSetStorageEngine() Assert.Equal(storageEngineOptions, resultCollection["options"]["storageEngine"]); } - [SkippableFact] + [Fact] public void TestCreateCollectionSetValidator() { RequireServer.Check(); @@ -146,7 +146,7 @@ public void TestCreateCollectionSetValidator() Assert.Equal("strict", collectionInfo["options"]["validationLevel"].AsString); } - [SkippableFact] + [Fact] public void TestCreateCollectionWriteConcern() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -160,7 +160,7 @@ public void TestCreateCollectionWriteConcern() exception.Should().BeOfType(); } - [SkippableFact] + [Fact] public void TestCreateViewWriteConcern() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -189,7 +189,7 @@ public void TestDropCollection() Assert.False(_database.CollectionExists(collectionName)); } - [SkippableFact] + [Fact] public void TestDropCollectionWriteConcern() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -203,7 +203,7 @@ public void TestDropCollectionWriteConcern() exception.Should().BeOfType(); } - [SkippableFact] + [Fact] public void TestEvalNoArgs() { RequireServer.Check().Supports(Feature.Eval); @@ -217,7 +217,7 @@ public void TestEvalNoArgs() #pragma warning restore } - [SkippableFact] + [Fact] public void TestEvalNoArgsNoLock() { RequireServer.Check().Supports(Feature.Eval); @@ -231,7 +231,7 @@ public void TestEvalNoArgsNoLock() #pragma warning restore } - [SkippableFact] + [Fact] public void TestEvalWithMaxTime() { RequireServer.Check().Supports(Feature.Eval); @@ -255,7 +255,7 @@ public void TestEvalWithMaxTime() #pragma warning restore } - [SkippableFact] + [Fact] public void TestEvalWithOneArg() { RequireServer.Check().Supports(Feature.Eval); @@ -269,7 +269,7 @@ public void TestEvalWithOneArg() #pragma warning restore } - [SkippableFact] + [Fact] public void TestEvalWithOneArgNoLock() { RequireServer.Check().Supports(Feature.Eval); @@ -283,7 +283,7 @@ public void TestEvalWithOneArgNoLock() #pragma warning restore } - [SkippableFact] + [Fact] public void TestEvalWithTwoArgs() { RequireServer.Check().Supports(Feature.Eval); @@ -297,7 +297,7 @@ public void TestEvalWithTwoArgs() #pragma warning restore } - [SkippableFact] + [Fact] public void TestEvalWithTwoArgsNoLock() { RequireServer.Check().Supports(Feature.Eval); @@ -368,7 +368,7 @@ public void TestGetCollectionNames() Assert.Equal(new[] { "a", "b", "c" }, collectionNames.Where(n => n != "system.indexes")); } - [SkippableFact] + [Fact] public void TestGetCurrentOp() { RequireServer.Check().ClusterTypes(ClusterType.Standalone, ClusterType.ReplicaSet); @@ -452,7 +452,7 @@ public void TestRenameCollectionDropTarget() Assert.True(_database.CollectionExists(collectionName2)); } - [SkippableFact] + [Fact] public void TestRenameCollectionWriteConcern() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -505,7 +505,7 @@ public void TestSetProfilingLevel() } } - [SkippableTheory] + [Theory] [InlineData("user1", "pass1", true)] [InlineData("user2", "pass2", false)] public void TestUserMethods(string username, string password, bool isReadOnly) diff --git a/tests/MongoDB.Driver.Legacy.Tests/MongoServerTests.cs b/tests/MongoDB.Driver.Legacy.Tests/MongoServerTests.cs index 45d3053e446..42768187407 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/MongoServerTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/MongoServerTests.cs @@ -18,7 +18,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -109,7 +109,7 @@ public void TestDropDatabase() Assert.False(databaseNames.Contains(database.Name)); } - [SkippableFact] + [Fact] public void TestDropDatabaseWriteConcern() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); @@ -212,7 +212,7 @@ public void TestPrimary() Assert.True(instance.IsPrimary); } - [SkippableFact] + [Fact] public void TestReconnect() { RequireEnvironment.Check().EnvironmentVariable("EXPLICIT"); diff --git a/tests/MongoDB.Driver.Legacy.Tests/Operations/BulkWriteOperationTests.cs b/tests/MongoDB.Driver.Legacy.Tests/Operations/BulkWriteOperationTests.cs index 349730a6ae5..98f837697cc 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Operations/BulkWriteOperationTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Operations/BulkWriteOperationTests.cs @@ -17,7 +17,7 @@ using System.Linq; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Builders; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; @@ -40,7 +40,7 @@ public BulkWriteOperationTests() _collection = LegacyTestConfiguration.Database.GetCollection(GetType().Name); } - [SkippableFact] + [Fact] public void TestBatchSplittingBySizeWithErrorsOrdered() { RequirePlatform.Check().SkipWhen(SupportedOperatingSystem.MacOS); @@ -81,7 +81,7 @@ public void TestBatchSplittingBySizeWithErrorsOrdered() Assert.Equal(expectedDocuments, _collection.FindAll()); } - [SkippableFact] + [Fact] public void TestBatchSplittingBySizeWithErrorsUnordered() { RequirePlatform.Check().SkipWhen(SupportedOperatingSystem.MacOS); @@ -121,7 +121,7 @@ public void TestBatchSplittingBySizeWithErrorsUnordered() _collection.FindAll().Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(-1)] [InlineData(0)] [InlineData(1)] @@ -144,7 +144,7 @@ public void TestBatchSplittingDeletesNearMaxWriteBatchCount(int maxBatchCountDel Assert.Equal(0, _collection.Count()); } - [SkippableTheory] + [Theory] [InlineData(-1)] [InlineData(0)] [InlineData(1)] @@ -166,7 +166,7 @@ public void TestBatchSplittingInsertsNearMaxWriteBatchCount(int maxBatchCountDel Assert.Equal(count, _collection.Count()); } - [SkippableTheory] + [Theory] [InlineData(-1)] [InlineData(0)] [InlineData(1)] @@ -191,7 +191,7 @@ public void TestBatchSplittingUpdatesNearMaxWriteBatchCount(int maxBatchCountDel Assert.Equal(count, _collection.Count(Query.EQ("n", 1))); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestExecuteTwice(bool ordered) @@ -205,7 +205,7 @@ public void TestExecuteTwice(bool ordered) Assert.Throws(() => bulk.Execute()); } - [SkippableTheory] + [Theory] [InlineData(false, 0)] [InlineData(false, 1)] [InlineData(true, 0)] @@ -235,7 +235,7 @@ public void TestExecuteWithExplicitWriteConcern(bool ordered, int w) } } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestExecuteWithNoRequests(bool ordered) @@ -247,7 +247,7 @@ public void TestExecuteWithNoRequests(bool ordered) Assert.Throws(() => bulk.Execute()); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestFindAfterExecute(bool ordered) @@ -261,7 +261,7 @@ public void TestFindAfterExecute(bool ordered) Assert.Throws(() => bulk.Find(new QueryDocument())); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestFindWithNullQuery(bool ordered) @@ -273,7 +273,7 @@ public void TestFindWithNullQuery(bool ordered) Assert.Throws(() => bulk.Find(null)); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestInsertAfterExecute(bool ordered) @@ -287,7 +287,7 @@ public void TestInsertAfterExecute(bool ordered) Assert.Throws(() => bulk.Insert(new BsonDocument())); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestInsertDollarPrefixedKeyRejectedPre50(bool ordered) @@ -301,7 +301,7 @@ public void TestInsertDollarPrefixedKeyRejectedPre50(bool ordered) Assert.Throws>(() => bulk.Execute()); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestInsertDollarPrefixedKeyAcceptedPost50(bool ordered) @@ -322,7 +322,7 @@ public void TestInsertDollarPrefixedKeyAcceptedPost50(bool ordered) _collection.FindAll().Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestInsertMultipleDocuments(bool ordered) @@ -350,7 +350,7 @@ public void TestInsertMultipleDocuments(bool ordered) _collection.FindAll().Should().BeEquivalentTo(documents); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestInsertOneDocument(bool ordered) @@ -371,7 +371,7 @@ public void TestInsertOneDocument(bool ordered) _collection.FindAll().Should().BeEquivalentTo(new[] { document }); } - [SkippableFact] + [Fact] public void TestMixedOperationsOrdered() { RequirePlatform.Check().SkipWhen(SupportedOperatingSystem.MacOS); @@ -411,7 +411,7 @@ public void TestMixedOperationsOrdered() _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableFact] + [Fact] public void TestMixedOperationsUnordered() { RequirePlatform.Check().SkipWhen(SupportedOperatingSystem.MacOS); @@ -453,7 +453,7 @@ public void TestMixedOperationsUnordered() _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableFact] + [Fact] public void TestMixedUpsertsOrdered() { RequirePlatform.Check().SkipWhen(SupportedOperatingSystem.MacOS); @@ -482,7 +482,7 @@ public void TestMixedUpsertsOrdered() _collection.FindAll().Should().BeEquivalentTo(expectedDocuments); } - [SkippableFact] + [Fact] public void TestMixedUpsertsUnordered() { RequirePlatform.Check().SkipWhen(SupportedOperatingSystem.MacOS); @@ -511,7 +511,7 @@ public void TestMixedUpsertsUnordered() _collection.FindAll().Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestNonDefaultWriteConcern(bool ordered) @@ -534,7 +534,7 @@ public void TestNonDefaultWriteConcern(bool ordered) Assert.Equal(0, _collection.Count()); } - [SkippableFact] + [Fact] public void TestOrderedBatchWithErrors() { RequirePlatform.Check().SkipWhen(SupportedOperatingSystem.MacOS); @@ -579,7 +579,7 @@ public void TestOrderedBatchWithErrors() _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestRemoveMultiple(bool ordered) @@ -610,7 +610,7 @@ public void TestRemoveMultiple(bool ordered) _collection.FindAll().Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestRemoveOneOnlyRemovesOneDocument(bool ordered) @@ -632,7 +632,7 @@ public void TestRemoveOneOnlyRemovesOneDocument(bool ordered) _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestRemoveWithEmptyQueryRemovesAllDocuments(bool ordered) @@ -653,7 +653,7 @@ public void TestRemoveWithEmptyQueryRemovesAllDocuments(bool ordered) Assert.Equal(0, _collection.Count()); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestRemoveWithQueryRemovesOnlyMatchingDocuments(bool ordered) @@ -675,7 +675,7 @@ public void TestRemoveWithQueryRemovesOnlyMatchingDocuments(bool ordered) _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestReplaceOneKeyValidation(bool ordered) @@ -692,7 +692,7 @@ public void TestReplaceOneKeyValidation(bool ordered) Assert.Throws(() => bulk.Execute()); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestReplaceOneWithMultipleMatchingDocuments(bool ordered) @@ -724,7 +724,7 @@ public void TestReplaceOneWithMultipleMatchingDocuments(bool ordered) _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableFact] + [Fact] public void TestUnorderedBatchWithErrors() { RequirePlatform.Check().SkipWhen(SupportedOperatingSystem.MacOS); @@ -775,7 +775,7 @@ public void TestUnorderedBatchWithErrors() _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestUpdateChecksThatAllTopLevelFieldNamesAreOperators(bool ordered) @@ -790,7 +790,7 @@ public void TestUpdateChecksThatAllTopLevelFieldNamesAreOperators(bool ordered) Assert.Throws(() => bulk.Execute()); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestUpdateOneBasic(bool ordered) @@ -821,7 +821,7 @@ public void TestUpdateOneBasic(bool ordered) _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestUpdateOneKeyValidation(bool ordered) @@ -844,7 +844,7 @@ public void TestUpdateOneKeyValidation(bool ordered) } } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestUpdateOnlyAffectsDocumentsThatMatch(bool ordered) @@ -878,7 +878,7 @@ public void TestUpdateOnlyAffectsDocumentsThatMatch(bool ordered) _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestUpdateUpdatesAllMatchingDocuments(bool ordered) @@ -909,7 +909,7 @@ public void TestUpdateUpdatesAllMatchingDocuments(bool ordered) _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestUpsertOneVeryLargeDocument(bool ordered) @@ -937,7 +937,7 @@ public void TestUpsertOneVeryLargeDocument(bool ordered) _collection.FindAll().Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestUpsertReplaceOneDoesNotAffectNonUpsertsInTheSameOperation(bool ordered) @@ -963,7 +963,7 @@ public void TestUpsertReplaceOneDoesNotAffectNonUpsertsInTheSameOperation(bool o _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestUpsertReplaceOneOnlyReplacesOneMatchingDocument(bool ordered) @@ -995,7 +995,7 @@ public void TestUpsertReplaceOneOnlyReplacesOneMatchingDocument(bool ordered) _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestUpsertUpdateOneDoesNotAffectNonUpsertsInTheSameOperation(bool ordered) @@ -1036,7 +1036,7 @@ public void TestUpsertUpdateOneDoesNotAffectNonUpsertsInTheSameOperation(bool or _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestUpsertUpdateOneOnlyAffectsOneMatchingDocument(bool ordered) @@ -1067,7 +1067,7 @@ public void TestUpsertUpdateOneOnlyAffectsOneMatchingDocument(bool ordered) _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestUpsertUpdateUpsertsAndDoesNotAffectNonUpsertsInTheSameOperation(bool ordered) @@ -1108,7 +1108,7 @@ public void TestUpsertUpdateUpsertsAndDoesNotAffectNonUpsertsInTheSameOperation( _collection.FindAll().SetFields(Fields.Exclude("_id")).Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestUpsertWithMultipleMatchingDocuments(bool ordered) @@ -1141,7 +1141,7 @@ public void TestUpsertWithMultipleMatchingDocuments(bool ordered) _collection.FindAll().Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestUpsertWithNoMatchingDocument(bool ordered) @@ -1174,7 +1174,7 @@ public void TestUpsertWithNoMatchingDocument(bool ordered) _collection.FindAll().Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestUpsertWithOneMatchingDocument(bool ordered) @@ -1207,7 +1207,7 @@ public void TestUpsertWithOneMatchingDocument(bool ordered) _collection.FindAll().Should().BeEquivalentTo(expectedDocuments); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void TestW0DoesNotReportErrors( [Values(false, true)] bool retryWrites, @@ -1242,7 +1242,7 @@ public void TestW0DoesNotReportErrors( } } - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void TestW2AgainstStandalone(bool ordered) @@ -1263,7 +1263,7 @@ public void TestW2AgainstStandalone(bool ordered) } } - [SkippableFact] + [Fact] public void TestWTimeoutPlusDuplicateKeyError() { RequireEnvironment.Check().EnvironmentVariable("EXPLICIT"); diff --git a/tests/MongoDB.Driver.Legacy.Tests/Operations/CurrentOpOperationTests.cs b/tests/MongoDB.Driver.Legacy.Tests/Operations/CurrentOpOperationTests.cs index 542494dc6d0..66a1b0ae6a5 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Operations/CurrentOpOperationTests.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Operations/CurrentOpOperationTests.cs @@ -16,7 +16,7 @@ using System; using System.Threading.Tasks; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Misc; @@ -57,7 +57,7 @@ public void constructor_should_throw_when_databaseNamespace_is_null() action.ShouldThrow().And.ParamName.Should().Be("databaseNamespace"); } - [SkippableFact] + [Fact] public void Execute_should_return_expected_result() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Legacy.Tests/Operations/CurrentOpUsingCommandOperation.cs b/tests/MongoDB.Driver.Legacy.Tests/Operations/CurrentOpUsingCommandOperation.cs index 769139d3ffe..715cce000cf 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Operations/CurrentOpUsingCommandOperation.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Operations/CurrentOpUsingCommandOperation.cs @@ -18,7 +18,7 @@ using System.Threading.Tasks; using FluentAssertions; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Misc; @@ -72,7 +72,7 @@ public void CreateOperation_should_return_expected_result() result.ResultSerializer.Should().BeSameAs(BsonDocumentSerializer.Instance); } - [SkippableFact] + [Fact] public void Execute_should_return_expected_result() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Legacy.Tests/Properties/AssemblyInfo.cs b/tests/MongoDB.Driver.Legacy.Tests/Properties/AssemblyInfo.cs index 3aba0e8f41b..d0af98a9d42 100644 --- a/tests/MongoDB.Driver.Legacy.Tests/Properties/AssemblyInfo.cs +++ b/tests/MongoDB.Driver.Legacy.Tests/Properties/AssemblyInfo.cs @@ -14,11 +14,11 @@ */ using System.Runtime.InteropServices; -using MongoDB.Driver.Core.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; [assembly: ComVisible(false)] [assembly: CollectionBehavior(DisableTestParallelization = true)] -[assembly: TestFramework(XunitExtensionsConsts.TimeoutEnforcingXunitFramework, XunitExtensionsConsts.TimeoutEnforcingFrameworkAssembly)] +[assembly: TestFramework(XunitExtensionsConstants.TimeoutEnforcingXunitFramework, XunitExtensionsConstants.TimeoutEnforcingFrameworkAssembly)] diff --git a/tests/MongoDB.Driver.Tests/AggregateFluentBucketAutoTests.cs b/tests/MongoDB.Driver.Tests/AggregateFluentBucketAutoTests.cs index d2e0755f75e..dbf467c6c42 100644 --- a/tests/MongoDB.Driver.Tests/AggregateFluentBucketAutoTests.cs +++ b/tests/MongoDB.Driver.Tests/AggregateFluentBucketAutoTests.cs @@ -84,7 +84,7 @@ public void BucketAuto_should_add_expected_stage() renderedStage.Document.Should().Be("{ $bucketAuto : { groupBy : \"$year\", buckets : 4 } }"); } - [SkippableFact] + [Fact] public void BucketAuto_should_return_expected_result() { RequireServer.Check(); @@ -120,7 +120,7 @@ public void BucketAuto_with_granularity_should_add_expected_stage() renderedStage.Document.Should().Be("{ $bucketAuto : { groupBy : \"$_id\", buckets : 4, granularity : 'POWERSOF2' } }"); } - [SkippableFact] + [Fact] public void BucketAuto_with_granularity_should_return_expected_result() { RequireServer.Check(); @@ -156,7 +156,7 @@ public void BucketAuto_with_output_should_add_expected_stage() renderedStage.Document.Should().Be("{ $bucketAuto : { groupBy : \"$year\", buckets : 4, output : { years : { $push : \"$year\" }, count : { $sum : 1 } } } }"); } - [SkippableFact] + [Fact] public void BucketAuto_with_output_should_return_expected_result() { RequireServer.Check(); @@ -192,7 +192,7 @@ public void BucketAuto_typed_should_add_expected_stage() renderedStage.Document.Should().Be("{ $bucketAuto : { groupBy : \"$year\", buckets : 4 } }"); } - [SkippableFact] + [Fact] public void BucketAuto_typed_should_return_expected_result() { RequireServer.Check(); @@ -230,7 +230,7 @@ public void BucketAuto_typed_with_output_should_add_expected_stage() renderedStage.Document.Should().Be("{ $bucketAuto : { groupBy : \"$year\", buckets : 4, output : { Years : { $push : \"$year\" }, Count : { $sum : 1 } } } }"); } - [SkippableFact] + [Fact] public void BucketAuto_typed_with_output_should_return_expected_result() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/AggregateFluentBucketTests.cs b/tests/MongoDB.Driver.Tests/AggregateFluentBucketTests.cs index 7e11b5594b2..f1c0c27205a 100644 --- a/tests/MongoDB.Driver.Tests/AggregateFluentBucketTests.cs +++ b/tests/MongoDB.Driver.Tests/AggregateFluentBucketTests.cs @@ -86,7 +86,7 @@ public void Bucket_should_add_expected_stage() renderedStage.Document.Should().Be("{ $bucket : { groupBy : \"$year\", boundaries : [ 1900, 1920, 1950 ], default : \"Unknown\" } }"); } - [SkippableFact] + [Fact] public void Bucket_should_return_expected_result() { RequireServer.Check(); @@ -123,7 +123,7 @@ public void Bucket_with_output_should_add_expected_stage() renderedStage.Document.Should().Be("{ $bucket : { groupBy : \"$year\", boundaries : [ 1900, 1920, 1950 ], default : \"Unknown\", output : { years : { $push : \"$year\" }, count : { $sum : 1 } } } }"); } - [SkippableFact] + [Fact] public void Bucket_with_output_should_return_expected_result() { RequireServer.Check(); @@ -160,7 +160,7 @@ public void Bucket_typed_should_add_expected_stage() renderedStage.Document.Should().Be("{ $bucket : { groupBy : \"$year\", boundaries : [ 1900, 1920, 1950 ], default : \"Unknown\" } }"); } - [SkippableFact] + [Fact] public void Bucket_typed_should_return_expected_result() { RequireServer.Check(); @@ -200,7 +200,7 @@ public void Bucket_typed_with_output_should_add_expected_stage() renderedStage.Document.Should().Be("{ $bucket : { groupBy : \"$year\", boundaries : [ 1900, 1920, 1950 ], default : \"Unknown\", output : { Years : { $push : \"$year\" }, Count : { $sum : 1 } } } }"); } - [SkippableFact] + [Fact] public void Bucket_typed_with_output_should_return_expected_result() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/AggregateFluentFacetTests.cs b/tests/MongoDB.Driver.Tests/AggregateFluentFacetTests.cs index f6898679aba..68b67c2c854 100644 --- a/tests/MongoDB.Driver.Tests/AggregateFluentFacetTests.cs +++ b/tests/MongoDB.Driver.Tests/AggregateFluentFacetTests.cs @@ -96,7 +96,7 @@ public void Facet_with_1_facet_should_add_the_expected_stage() }"); } - [SkippableFact] + [Fact] public void Facet_with_1_facet_should_return_expected_result() { RequireServer.Check(); @@ -159,7 +159,7 @@ public void Facet_with_2_facets_should_add_the_expected_stage() }"); } - [SkippableFact] + [Fact] public void Facet_with_2_facets_should_return_expected_result() { RequireServer.Check(); @@ -237,7 +237,7 @@ public void Facet_with_3_facets_should_add_the_expected_stage() }"); } - [SkippableFact] + [Fact] public void Facet_with_3_facets_should_return_expected_result() { RequireServer.Check(); @@ -310,7 +310,7 @@ public void Facet_typed_with_1_facet_should_add_the_expected_stage() }"); } - [SkippableFact] + [Fact] public void Facet_typed_with_1_facet_should_return_expected_result() { RequireServer.Check(); @@ -374,7 +374,7 @@ public void Facet_typed_with_2_facets_should_add_the_expected_stage() }"); } - [SkippableFact] + [Fact] public void Facet_typed_with_2_facets_should_return_expected_result() { RequireServer.Check(); @@ -453,7 +453,7 @@ public void Facet_typed_with_3_facets_should_add_the_expected_stage() }"); } - [SkippableFact] + [Fact] public void Facet_typed_with_3_facets_should_return_expected_result() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/AggregateFluentGraphLookupWithAirportsCollectionTests.cs b/tests/MongoDB.Driver.Tests/AggregateFluentGraphLookupWithAirportsCollectionTests.cs index 354ecbc9d42..e421cef7c7e 100644 --- a/tests/MongoDB.Driver.Tests/AggregateFluentGraphLookupWithAirportsCollectionTests.cs +++ b/tests/MongoDB.Driver.Tests/AggregateFluentGraphLookupWithAirportsCollectionTests.cs @@ -110,7 +110,7 @@ public void GraphLookup_should_add_expected_stage() }"); } - [SkippableFact] + [Fact] public void GraphLookup_should_return_expected_result() { RequireServer.Check(); @@ -190,7 +190,7 @@ public void GraphLookup_typed_should_add_expected_stage() }"); } - [SkippableFact] + [Fact] public void GraphLookup_typed_should_return_expected_result() { RequireServer.Check(); @@ -268,7 +268,7 @@ public void GraphLookup_typed_with_array_valued_start_with_should_add_expected_s }"); } - [SkippableFact] + [Fact] public void GraphLookup_typed_with_array_valued_start_with_should_return_expected_result() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/AggregateFluentGraphLookupWithEmployeeCollectionTests.cs b/tests/MongoDB.Driver.Tests/AggregateFluentGraphLookupWithEmployeeCollectionTests.cs index 2eaae36ef88..0a8885ca701 100644 --- a/tests/MongoDB.Driver.Tests/AggregateFluentGraphLookupWithEmployeeCollectionTests.cs +++ b/tests/MongoDB.Driver.Tests/AggregateFluentGraphLookupWithEmployeeCollectionTests.cs @@ -95,7 +95,7 @@ public void GraphLookup_should_add_expected_stage() }"); } - [SkippableFact] + [Fact] public void GraphLookup_should_return_expected_result() { RequireServer.Check(); @@ -150,7 +150,7 @@ public void GraphLookup_with_restrictSearchWithMatch_should_add_expected_stage() }"); } - [SkippableFact] + [Fact] public void GraphLookup_with_restrictSearchWithMatch_should_return_expected_result() { RequireServer.Check(); @@ -205,7 +205,7 @@ public void GraphLookup_with_expressions_should_add_expected_stage() }"); } - [SkippableFact] + [Fact] public void GraphLookup_with_expressions_should_return_expected_result() { RequireServer.Check(); @@ -252,7 +252,7 @@ public void GraphLookup_untyped_based_should_add_expected_stage() }"); } - [SkippableFact] + [Fact] public void GraphLookup_untyped_based_should_return_expected_result() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/AggregateFluentTests.cs b/tests/MongoDB.Driver.Tests/AggregateFluentTests.cs index b6bd0f88e0a..5f538d76e00 100644 --- a/tests/MongoDB.Driver.Tests/AggregateFluentTests.cs +++ b/tests/MongoDB.Driver.Tests/AggregateFluentTests.cs @@ -18,7 +18,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using Moq; @@ -165,7 +165,7 @@ public void Count_should_add_the_expected_stage( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Count_should_return_the_expected_result( [Values(false, true)] @@ -196,7 +196,7 @@ public void Count_should_return_the_expected_result( result.Should().Be(1); } - [SkippableFact] + [Fact] public void Function_should_return_expected_result() { RequireServer.Check().Supports(Feature.AggregateFunction); @@ -262,7 +262,7 @@ public void Function_should_return_expected_result() result[2].Should().Be("{ _id : 3, name : 'Mrs. Eppie Delta', scores : [ 9, 8, 8 ], isFound : false, message : 'Hello Mrs. Eppie Delta. Your total score is 25.' }"); } - [SkippableFact] + [Fact] public void Group_with_accumulator_should_return_expected_result() { RequireServer.Check().Supports(Feature.AggregateAccumulator); @@ -315,7 +315,7 @@ public void Group_with_accumulator_should_return_expected_result() result[1].Should().Be("{ _id : 'Homer', minCopies : 10, avgCopies : 10.0, maxCopies : 10 }"); } - [SkippableFact] + [Fact] public void Lookup_with_let_and_bsondocuments_params_should_return_the_expected_result() { RequireServer.Check(); @@ -413,7 +413,7 @@ public class StockData public int Instock { get; set; } } - [SkippableFact] + [Fact] public void Lookup_with_let_should_return_the_expected_result() { RequireServer.Check(); @@ -481,7 +481,7 @@ public void Lookup_with_let_should_return_the_expected_result() result[2].Should().Be("{ 'item' : 'cookies', 'price' : 10, 'ordered' : 60, 'stockdata' : [{ 'instock' : 80 }] }"); } - [SkippableFact] + [Fact] public void Lookup_with_let_and_mismatched_pipeline_condition_should_return_the_expected_result() { RequireServer.Check(); @@ -548,7 +548,7 @@ public void Lookup_with_let_and_mismatched_pipeline_condition_should_return_the_ result[2].Should().Be("{ 'item' : 'cookies', 'price' : 10, 'ordered' : 60, 'stockdata' : [] }"); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Lookup_without_let_should_return_the_expected_result([Values(null, "{}")] string emptyLetValue) { @@ -1229,7 +1229,7 @@ public class ItemResult public string Name { get; set; } } - [SkippableFact] + [Fact] public void UnionWith_with_different_schemas_and_projection_should_return_the_expected_result() { RequireServer.Check().Supports(Feature.AggregateUnionWith); diff --git a/tests/MongoDB.Driver.Tests/AggregateGraphLookupEnumerableFromOrToTests.cs b/tests/MongoDB.Driver.Tests/AggregateGraphLookupEnumerableFromOrToTests.cs index 1af563945fe..fee02d81a62 100644 --- a/tests/MongoDB.Driver.Tests/AggregateGraphLookupEnumerableFromOrToTests.cs +++ b/tests/MongoDB.Driver.Tests/AggregateGraphLookupEnumerableFromOrToTests.cs @@ -25,7 +25,7 @@ namespace MongoDB.Driver.Tests public class AggregateGraphLookupEnumerableFromOrToTests { // public methods - [SkippableFact] + [Fact] public void GraphLookup_with_many_to_one_parameters_should_return_expected_result() { RequireServer.Check(); @@ -66,7 +66,7 @@ public void GraphLookup_with_many_to_one_parameters_should_return_expected_resul result[1].ToBsonDocument().Should().Be(expectedResult[1].ToBsonDocument()); } - [SkippableFact] + [Fact] public void GraphLookup_with_one_to_many_parameters_should_return_expected_result() { RequireServer.Check(); @@ -107,7 +107,7 @@ public void GraphLookup_with_one_to_many_parameters_should_return_expected_resul result[1].ToBsonDocument().Should().Be(expectedResult[1].ToBsonDocument()); } - [SkippableFact] + [Fact] public void GraphLookup_with_one_to_one_parameters_should_return_expected_result() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/AsyncCursorTests.cs b/tests/MongoDB.Driver.Tests/AsyncCursorTests.cs index de6c749b949..66600b03cf9 100644 --- a/tests/MongoDB.Driver.Tests/AsyncCursorTests.cs +++ b/tests/MongoDB.Driver.Tests/AsyncCursorTests.cs @@ -20,7 +20,7 @@ using FluentAssertions.Common; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Events; using MongoDB.Driver.Core.Misc; @@ -33,7 +33,7 @@ namespace MongoDB.Driver.Tests public class AsyncCursorTests { //public methods - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Cursor_should_not_throw_exception_after_double_close([Values(false, true)] bool async) { @@ -60,7 +60,7 @@ public void Cursor_should_not_throw_exception_after_double_close([Values(false, } } - [SkippableFact] + [Fact] public void KillCursor_should_actually_work() { RequireServer.Check(); @@ -91,7 +91,7 @@ public void KillCursor_should_actually_work() } } - [SkippableFact] + [Fact] public void Tailable_cursor_should_be_able_to_be_cancelled_from_a_different_thread_with_expected_result() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/AuthenticationTests.cs b/tests/MongoDB.Driver.Tests/AuthenticationTests.cs index e37b805fb41..f8ae926047e 100644 --- a/tests/MongoDB.Driver.Tests/AuthenticationTests.cs +++ b/tests/MongoDB.Driver.Tests/AuthenticationTests.cs @@ -19,7 +19,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters.ServerSelectors; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -32,7 +32,7 @@ namespace MongoDB.Driver.Tests /// public class AuthenticationTests { - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Authentication_fails_when_user_has_Scram_Sha_1_mechanism_and_mechanism_is_Scram_Sha_256( [Values(false, true)] bool async) @@ -51,7 +51,7 @@ public void Authentication_fails_when_user_has_Scram_Sha_1_mechanism_and_mechani AssertAuthenticationFails(settings, async); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Authentication_fails_when_user_has_Scram_Sha_256_mechanism_and_mechanism_is_Scram_Sha_1( [Values(false, true)] bool async) @@ -69,7 +69,7 @@ public void Authentication_fails_when_user_has_Scram_Sha_256_mechanism_and_mecha AssertAuthenticationFails(settings, async); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Authentication_fails_when_user_is_non_extant_and_mechanism_is_not_specified( [Values(false, true)] bool async) @@ -86,7 +86,7 @@ public void Authentication_fails_when_user_is_non_extant_and_mechanism_is_not_sp AssertAuthenticationFails(settings, async); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Authentication_succeeds_when_user_has_both_Scram_Sha_mechanisms_and_mechanism_is_not_specified( [Values(false, true)] bool async) @@ -104,7 +104,7 @@ public void Authentication_succeeds_when_user_has_both_Scram_Sha_mechanisms_and_ AssertAuthenticationSucceeds(settings, async); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Authentication_succeeds_when_user_has_both_scram_sha_mechanisms_and_mechanism_is_Scram_Sha_256( [Values(false, true)] bool async) @@ -122,7 +122,7 @@ public void Authentication_succeeds_when_user_has_both_scram_sha_mechanisms_and_ AssertAuthenticationSucceeds(settings, async); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Authentication_succeeds_when_user_has_Scram_Sha_1_Mechanism_and_mechanism_is_not_specified( [Values(false, true)] bool async) @@ -141,7 +141,7 @@ public void Authentication_succeeds_when_user_has_Scram_Sha_1_Mechanism_and_mech AssertAuthenticationSucceeds(settings, async, speculativeAuthenticatationShouldSucceedIfPossible: false); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Authentication_succeeds_when_user_has_Scram_Sha_256_mechanism_and_mechanism_is_not_specified( [Values(false, true)] bool async) @@ -159,7 +159,7 @@ public void Authentication_succeeds_when_user_has_Scram_Sha_256_mechanism_and_me AssertAuthenticationSucceeds(settings, async); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Authentication_succeeds_when_user_has_Scram_Sha_1_mechanism_and_mechanism_is_Scram_Sha_1( [Values(false, true)] bool async) @@ -178,7 +178,7 @@ public void Authentication_succeeds_when_user_has_Scram_Sha_1_mechanism_and_mech AssertAuthenticationSucceeds(settings, async); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Authentication_succeeds_when_user_has_Scram_Sha_256_mechanism_and_mechanism_is_Scram_Sha_256( [Values(false, true)] bool async) @@ -195,7 +195,7 @@ public void Authentication_succeeds_when_user_has_Scram_Sha_256_mechanism_and_me AssertAuthenticationSucceeds(settings, async); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Authentication_succeeds_when_user_has_multiple_credentials_and_mechanism_is_not_specified( [Values(false, true)] bool async) @@ -222,7 +222,7 @@ public void Authentication_succeeds_when_user_has_multiple_credentials_and_mecha AssertAuthenticationSucceeds(settings, async); } - [SkippableTheory] + [Theory] [InlineData("IX", "IX", "\u2168", "\u2163", false)] // "IX", "IX", Roman numeral nine, Roman numeral four [InlineData("IX", "IX", "\u2168", "\u2163", true)] // "IX", "IX", Roman numeral nine, Roman numeral four public void Authentication_succeeds_with_Ascii_username_and_Ascii_password_when_SaslPrep_equivalent_username_exists( @@ -245,7 +245,7 @@ public void Authentication_succeeds_with_Ascii_username_and_Ascii_password_when_ AssertAuthenticationSucceeds(settings, async); } - [SkippableTheory] + [Theory] [InlineData("IX", "IX", "I\u00ADX", "\u2168", "\u2163", false)] // "IX", "IX", "I-X", Roman numeral nine, Roman numeral four [InlineData("IX", "IX", "I\u00ADX", "\u2168", "\u2163", true)] // "IX", "IX", "I-X", Roman numeral nine, Roman numeral four public void Authentication_succeeds_with_Ascii_username_and_nonSaslPrepped_password_when_SaslPrep_equivalent_username_exists( @@ -269,7 +269,7 @@ public void Authentication_succeeds_with_Ascii_username_and_nonSaslPrepped_passw AssertAuthenticationSucceeds(settings, async); } - [SkippableTheory] + [Theory] [InlineData("IX", "IX", "\u2168", "\u2163", "I\u00ADV", false)] // "IX", "IX", Roman numeral nine, Roman numeral four, I-V [InlineData("IX", "IX", "\u2168", "\u2163", "I\u00ADV", true)] // "IX", "IX", Roman numeral nine, Roman numeral four, I-V public void Authentication_succeeds_with_Unicode_username_and_nonSaslPrepped_password_when_SaslPrep_equivalent_username_exists( @@ -293,7 +293,7 @@ public void Authentication_succeeds_with_Unicode_username_and_nonSaslPrepped_pas AssertAuthenticationSucceeds(settings, async); } - [SkippableTheory] + [Theory] [InlineData("IX", "IX", "\u2168", "\u2163", false)] // "IX", "IX", Roman numeral nine, Roman numeral four [InlineData("IX", "IX", "\u2168", "\u2163", true)] // "IX", "IX", Roman numeral nine, Roman numeral four public void Authentication_succeeds_with_Unicode_username_and_Unicode_password_when_SaslPrep_equivalent_username_exists( @@ -316,7 +316,7 @@ public void Authentication_succeeds_with_Unicode_username_and_Unicode_password_w AssertAuthenticationSucceeds(settings, async); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Authentication_succeeds_with_MONGODB_X509_mechanism( [Values(false, true)] bool async) diff --git a/tests/MongoDB.Driver.Tests/CausalConsistencyTests.cs b/tests/MongoDB.Driver.Tests/CausalConsistencyTests.cs index 6bf8e3a34af..d321e7a377e 100644 --- a/tests/MongoDB.Driver.Tests/CausalConsistencyTests.cs +++ b/tests/MongoDB.Driver.Tests/CausalConsistencyTests.cs @@ -19,7 +19,7 @@ using System.Linq; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Events; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -30,7 +30,7 @@ namespace MongoDB.Driver.Tests { public class CausalConsistencyTests { - [SkippableFact] + [Fact] public void OperationTime_should_have_no_value_on_a_newly_created_ClientSession() { RequireServer.Check().SupportsCausalConsistency(); @@ -42,7 +42,7 @@ public void OperationTime_should_have_no_value_on_a_newly_created_ClientSession( } } - [SkippableFact] + [Fact] public void AfterClusterTime_should_be_empty_on_the_first_operation() { RequireServer.Check().SupportsCausalConsistency(); @@ -62,7 +62,7 @@ public void AfterClusterTime_should_be_empty_on_the_first_operation() } } - [SkippableFact] + [Fact] public void Session_OperationTime_should_get_updated_after_an_operation() { RequireServer.Check().SupportsCausalConsistency(); @@ -87,7 +87,7 @@ public void Session_OperationTime_should_get_updated_after_an_operation() } } - [SkippableFact] + [Fact] public void AfterClusterTime_should_be_sent_after_the_first_read_operation() { RequireServer.Check().SupportsCausalConsistency(); @@ -117,7 +117,7 @@ public void AfterClusterTime_should_be_sent_after_the_first_read_operation() } } - [SkippableFact] + [Fact] public void AfterClusterTime_should_be_sent_after_the_first_write_operation() { RequireServer.Check().SupportsCausalConsistency(); @@ -147,7 +147,7 @@ public void AfterClusterTime_should_be_sent_after_the_first_write_operation() } } - [SkippableFact] + [Fact] public void AfterClusterTime_should_not_be_sent_when_the_session_is_not_causally_consistent() { RequireServer.Check().SupportsCausalConsistency(); @@ -168,7 +168,7 @@ public void AfterClusterTime_should_not_be_sent_when_the_session_is_not_causally } } - [SkippableFact] + [Fact] public void ReadConcern_should_not_include_level_when_using_the_server_default() { RequireServer.Check().SupportsCausalConsistency(); @@ -194,7 +194,7 @@ public void ReadConcern_should_not_include_level_when_using_the_server_default() } } - [SkippableFact] + [Fact] public void ReadConcern_should_include_level_when_not_using_the_server_default() { RequireServer.Check().SupportsCausalConsistency(); diff --git a/tests/MongoDB.Driver.Tests/ClientSessionHandleTests.cs b/tests/MongoDB.Driver.Tests/ClientSessionHandleTests.cs index 086587149fa..153d66eb3f2 100644 --- a/tests/MongoDB.Driver.Tests/ClientSessionHandleTests.cs +++ b/tests/MongoDB.Driver.Tests/ClientSessionHandleTests.cs @@ -20,7 +20,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; diff --git a/tests/MongoDB.Driver.Tests/ClientSessionOptionsTests.cs b/tests/MongoDB.Driver.Tests/ClientSessionOptionsTests.cs index ea13f0cddd9..b6282ba7932 100644 --- a/tests/MongoDB.Driver.Tests/ClientSessionOptionsTests.cs +++ b/tests/MongoDB.Driver.Tests/ClientSessionOptionsTests.cs @@ -14,7 +14,7 @@ */ using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Tests diff --git a/tests/MongoDB.Driver.Tests/ClusterKeyTests.cs b/tests/MongoDB.Driver.Tests/ClusterKeyTests.cs index c89db0ede76..69a124096f3 100644 --- a/tests/MongoDB.Driver.Tests/ClusterKeyTests.cs +++ b/tests/MongoDB.Driver.Tests/ClusterKeyTests.cs @@ -19,7 +19,7 @@ using System.Security.Authentication; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Compression; using MongoDB.Driver.Core.Configuration; diff --git a/tests/MongoDB.Driver.Tests/ClusterTests.cs b/tests/MongoDB.Driver.Tests/ClusterTests.cs index 2ea15f99abd..194e0219f0a 100644 --- a/tests/MongoDB.Driver.Tests/ClusterTests.cs +++ b/tests/MongoDB.Driver.Tests/ClusterTests.cs @@ -21,7 +21,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; @@ -62,7 +62,7 @@ public ClusterTests(ITestOutputHelper output) : base(output) /// Test that starting a new transaction on a pinned ClientSession unpins the /// session and normal server selection is performed for the next operation. /// - [SkippableTheory] + [Theory] [ParameterAttributeData] public void SelectServer_loadbalancing_prose_test([Values(false, true)] bool async) { diff --git a/tests/MongoDB.Driver.Tests/Communication/Security/AwsAuthenticationTests.cs b/tests/MongoDB.Driver.Tests/Communication/Security/AwsAuthenticationTests.cs index 4757e6c0d87..cde9bd5b544 100644 --- a/tests/MongoDB.Driver.Tests/Communication/Security/AwsAuthenticationTests.cs +++ b/tests/MongoDB.Driver.Tests/Communication/Security/AwsAuthenticationTests.cs @@ -18,7 +18,7 @@ using Amazon.Runtime.CredentialManagement; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Tests.Communication.Security @@ -38,7 +38,7 @@ namespace MongoDB.Driver.Tests.Communication.Security [Trait("Category", "AwsMechanism")] public class AwsAuthenticationTests { - [SkippableFact] + [Fact] public void Aws_authentication_should_should_have_expected_result() { RequireEnvironment.Check().EnvironmentVariable("AWS_TESTS_ENABLED"); @@ -65,7 +65,7 @@ public void Ecs_should_fill_AWS_CONTAINER_CREDENTIALS_RELATIVE_URI() (awsContainerUri != null).Should().Be(isEcs); } - [SkippableFact] + [Fact] public void AwsSdk_should_support_all_required_handlers() { var credentialsGeneratorsDelegatesEnumerator = FallbackCredentialsFactory.CredentialsGenerators.GetEnumerator(); diff --git a/tests/MongoDB.Driver.Tests/Communication/Security/GssapiAuthenticationTests.cs b/tests/MongoDB.Driver.Tests/Communication/Security/GssapiAuthenticationTests.cs index 54f34af7952..1781b522cd4 100644 --- a/tests/MongoDB.Driver.Tests/Communication/Security/GssapiAuthenticationTests.cs +++ b/tests/MongoDB.Driver.Tests/Communication/Security/GssapiAuthenticationTests.cs @@ -16,7 +16,7 @@ using System; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Tests.Communication.Security @@ -27,7 +27,7 @@ public class GssapiAuthenticationTests { private static readonly string __collectionName = "test"; - [SkippableFact] + [Fact] public void TestNoCredentials() { RequireEnvironment.Check().EnvironmentVariable("GSSAPI_TESTS_ENABLED"); @@ -44,7 +44,7 @@ public void TestNoCredentials() } - [SkippableFact] + [Fact] public void TestSuccessfulAuthentication() { RequireEnvironment.Check().EnvironmentVariable("GSSAPI_TESTS_ENABLED"); @@ -60,7 +60,7 @@ public void TestSuccessfulAuthentication() result.Should().NotBeNull(); } - [SkippableFact] + [Fact] public void TestBadPassword() { RequireEnvironment.Check().EnvironmentVariable("GSSAPI_TESTS_ENABLED"); diff --git a/tests/MongoDB.Driver.Tests/Communication/Security/PlainAuthenticationTests.cs b/tests/MongoDB.Driver.Tests/Communication/Security/PlainAuthenticationTests.cs index e309fc4ccfd..572191aebb8 100644 --- a/tests/MongoDB.Driver.Tests/Communication/Security/PlainAuthenticationTests.cs +++ b/tests/MongoDB.Driver.Tests/Communication/Security/PlainAuthenticationTests.cs @@ -16,7 +16,7 @@ using System; using System.Linq; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver; using Xunit; @@ -35,7 +35,7 @@ public PlainAuthenticationTests() _settings = MongoClientSettings.FromUrl(new MongoUrl(CoreTestConfiguration.ConnectionString.ToString())); } - [SkippableFact] + [Fact] public void TestNoCredentials() { RequireEnvironment.Check().EnvironmentVariable("PLAIN_AUTH_TESTS_ENABLED"); @@ -53,7 +53,7 @@ public void TestNoCredentials() }); } - [SkippableFact] + [Fact] public void TestSuccessfulAuthentication() { RequireEnvironment.Check().EnvironmentVariable("PLAIN_AUTH_TESTS_ENABLED"); @@ -68,7 +68,7 @@ public void TestSuccessfulAuthentication() Assert.NotNull(result); } - [SkippableFact] + [Fact] public void TestBadPassword() { RequireEnvironment.Check().EnvironmentVariable("PLAIN_AUTH_TESTS_ENABLED"); diff --git a/tests/MongoDB.Driver.Tests/ConnectionsSurvivePrimaryStepDownTests.cs b/tests/MongoDB.Driver.Tests/ConnectionsSurvivePrimaryStepDownTests.cs index 71c1f4a49b0..24b52988ea6 100644 --- a/tests/MongoDB.Driver.Tests/ConnectionsSurvivePrimaryStepDownTests.cs +++ b/tests/MongoDB.Driver.Tests/ConnectionsSurvivePrimaryStepDownTests.cs @@ -18,7 +18,7 @@ using System.Net; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; @@ -37,7 +37,7 @@ public class ConnectionsSurvivePrimaryStepDownTests private readonly string _collectionName = "step-down"; private readonly string _databaseName = "step-down"; - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Connection_pool_should_be_cleared_when_Shutdown_exceptions( [Values( @@ -74,7 +74,7 @@ public void Connection_pool_should_be_cleared_when_Shutdown_exceptions( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Connection_pool_should_not_be_cleared_when_replSetStepDown_and_GetMore([Values(false, true)] bool async) { @@ -143,7 +143,7 @@ void RunOnSecondary(IMongoClient primaryClient, EndPoint secondaryEndpoint, Bson } } - [SkippableFact] + [Fact] public void Connection_pool_should_work_as_expected_when_NonPrimary_exception() { RequireServer.Check().Supports(Feature.FailPointsFailCommand).ClusterType(ClusterType.ReplicaSet); diff --git a/tests/MongoDB.Driver.Tests/CreateManyIndexOptionsTest.cs b/tests/MongoDB.Driver.Tests/CreateManyIndexOptionsTest.cs index edcf3e7891d..5ed06f04ce7 100644 --- a/tests/MongoDB.Driver.Tests/CreateManyIndexOptionsTest.cs +++ b/tests/MongoDB.Driver.Tests/CreateManyIndexOptionsTest.cs @@ -15,7 +15,7 @@ using System; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Tests diff --git a/tests/MongoDB.Driver.Tests/CreateOneIndexOptionsTest.cs b/tests/MongoDB.Driver.Tests/CreateOneIndexOptionsTest.cs index 1ee8cb739d3..e0b8d0dd4f2 100644 --- a/tests/MongoDB.Driver.Tests/CreateOneIndexOptionsTest.cs +++ b/tests/MongoDB.Driver.Tests/CreateOneIndexOptionsTest.cs @@ -15,7 +15,7 @@ using System; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Tests diff --git a/tests/MongoDB.Driver.Tests/CreateViewOptionsTests.cs b/tests/MongoDB.Driver.Tests/CreateViewOptionsTests.cs index e7e1d3b5483..6ba3faad10f 100644 --- a/tests/MongoDB.Driver.Tests/CreateViewOptionsTests.cs +++ b/tests/MongoDB.Driver.Tests/CreateViewOptionsTests.cs @@ -17,7 +17,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Tests diff --git a/tests/MongoDB.Driver.Tests/DecryptedSecureStringTests.cs b/tests/MongoDB.Driver.Tests/DecryptedSecureStringTests.cs index b12eee1a875..81d139470aa 100644 --- a/tests/MongoDB.Driver.Tests/DecryptedSecureStringTests.cs +++ b/tests/MongoDB.Driver.Tests/DecryptedSecureStringTests.cs @@ -20,7 +20,7 @@ using System.Security; using FluentAssertions; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Tests diff --git a/tests/MongoDB.Driver.Tests/DropIndexOptionsTest.cs b/tests/MongoDB.Driver.Tests/DropIndexOptionsTest.cs index e860bca5baa..39933afe653 100644 --- a/tests/MongoDB.Driver.Tests/DropIndexOptionsTest.cs +++ b/tests/MongoDB.Driver.Tests/DropIndexOptionsTest.cs @@ -15,7 +15,7 @@ using System; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Tests diff --git a/tests/MongoDB.Driver.Tests/Encryption/AutoEncryptionOptionsTests.cs b/tests/MongoDB.Driver.Tests/Encryption/AutoEncryptionOptionsTests.cs index 1e233ee4b4b..75fb468d505 100644 --- a/tests/MongoDB.Driver.Tests/Encryption/AutoEncryptionOptionsTests.cs +++ b/tests/MongoDB.Driver.Tests/Encryption/AutoEncryptionOptionsTests.cs @@ -19,7 +19,7 @@ using System.Security.Cryptography.X509Certificates; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Encryption; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Tests/Encryption/AutoEncryptionTests.cs b/tests/MongoDB.Driver.Tests/Encryption/AutoEncryptionTests.cs index 629de19ff94..9027da0ed13 100644 --- a/tests/MongoDB.Driver.Tests/Encryption/AutoEncryptionTests.cs +++ b/tests/MongoDB.Driver.Tests/Encryption/AutoEncryptionTests.cs @@ -20,7 +20,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.Logging; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -47,7 +47,7 @@ public AutoEncryptionTests(ITestOutputHelper testOutputHelper) { } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void CryptClient_should_be_initialized([Values(false, true)] bool withAutoEncryption) { @@ -68,7 +68,7 @@ public void CryptClient_should_be_initialized([Values(false, true)] bool withAut } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public async Task Mongocryptd_should_be_initialized_when_auto_encryption([Values(false, true)] bool withAutoEncryption, [Values(false, true)] bool async) { @@ -107,7 +107,7 @@ public async Task Mongocryptd_should_be_initialized_when_auto_encryption([Values } } - [SkippableFact] + [Fact] public void Shared_library_should_be_loaded_when_CRYPT_SHARED_LIB_PATH_is_set() { RequireServer.Check().Supports(Feature.ClientSideEncryption); diff --git a/tests/MongoDB.Driver.Tests/Encryption/ClientEncryptionTests.cs b/tests/MongoDB.Driver.Tests/Encryption/ClientEncryptionTests.cs index 7c3623165a6..70b9607ba3b 100644 --- a/tests/MongoDB.Driver.Tests/Encryption/ClientEncryptionTests.cs +++ b/tests/MongoDB.Driver.Tests/Encryption/ClientEncryptionTests.cs @@ -18,7 +18,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using MongoDB.Driver.Encryption; @@ -35,7 +35,7 @@ public class ClientEncryptionTests private static readonly CollectionNamespace __keyVaultCollectionNamespace = CollectionNamespace.FromFullName("datakeys.keyvault"); #endregion - [SkippableFact] + [Fact] public async Task AddAlternateKeyName_should_correctly_handle_input_arguments() { RequireServer.Check().Supports(Feature.ClientSideEncryption); @@ -49,7 +49,7 @@ public async Task AddAlternateKeyName_should_correctly_handle_input_arguments() } } - [SkippableFact] + [Fact] public async Task CreateDataKey_should_correctly_handle_input_arguments() { RequireServer.Check().Supports(Feature.ClientSideEncryption); @@ -65,7 +65,7 @@ public async Task CreateDataKey_should_correctly_handle_input_arguments() } - [SkippableFact] + [Fact] public void CryptClient_should_be_initialized() { RequireServer.Check().Supports(Feature.ClientSideEncryption); @@ -77,7 +77,7 @@ public void CryptClient_should_be_initialized() } } - [SkippableFact] + [Fact] public async Task Decrypt_should_correctly_handle_input_arguments() { RequireServer.Check().Supports(Feature.ClientSideEncryption); @@ -89,7 +89,7 @@ public async Task Decrypt_should_correctly_handle_input_arguments() } } - [SkippableFact] + [Fact] public async Task Encrypt_should_correctly_handle_input_arguments() { RequireServer.Check().Supports(Feature.ClientSideEncryption); @@ -104,7 +104,7 @@ public async Task Encrypt_should_correctly_handle_input_arguments() } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public async Task Encryption_should_use_correct_binarySubType([Values(false, true)] bool async) { @@ -125,7 +125,7 @@ public async Task Encryption_should_use_correct_binarySubType([Values(false, tru } } - [SkippableFact] + [Fact] public async Task GetKeyByAlternateKeyName_should_correctly_handle_input_arguments() { RequireServer.Check().Supports(Feature.ClientSideEncryption); @@ -137,7 +137,7 @@ public async Task GetKeyByAlternateKeyName_should_correctly_handle_input_argumen } } - [SkippableFact] + [Fact] public async Task RemoveAlternateKeyName_should_correctly_handle_input_arguments() { RequireServer.Check().Supports(Feature.ClientSideEncryption); @@ -151,7 +151,7 @@ public async Task RemoveAlternateKeyName_should_correctly_handle_input_arguments } } - [SkippableFact] + [Fact] public async Task RewrapManyDataKey_should_correctly_handle_input_arguments() { RequireServer.Check().Supports(Feature.ClientSideEncryption); diff --git a/tests/MongoDB.Driver.Tests/EstimatedDocumentCountOptionsTests.cs b/tests/MongoDB.Driver.Tests/EstimatedDocumentCountOptionsTests.cs index 69dafc95bf0..dae0b51ff0b 100644 --- a/tests/MongoDB.Driver.Tests/EstimatedDocumentCountOptionsTests.cs +++ b/tests/MongoDB.Driver.Tests/EstimatedDocumentCountOptionsTests.cs @@ -15,7 +15,7 @@ using System; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Tests diff --git a/tests/MongoDB.Driver.Tests/FilterDefinitionBuilderTests.cs b/tests/MongoDB.Driver.Tests/FilterDefinitionBuilderTests.cs index ac20e6be083..a9164295ac8 100644 --- a/tests/MongoDB.Driver.Tests/FilterDefinitionBuilderTests.cs +++ b/tests/MongoDB.Driver.Tests/FilterDefinitionBuilderTests.cs @@ -20,7 +20,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using MongoDB.Driver.GeoJsonObjectModel; using Xunit; @@ -1244,7 +1244,7 @@ private static bool CreateTestData() } #endregion - [SkippableTheory] + [Theory] [InlineData(0U, new[] { 2, 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gt : 0 } }, { X : { $lt : 0 } } ] }")] [InlineData(1U, new[] { 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gt : 1 } }, { X : { $lt : 0 } } ] }")] [InlineData(0x7fffffffU, new[] { 4, 5, 6, 7 }, "{ $or : [ { X : { $gt : 2147483647 } }, { X : { $lt : 0 } } ] }")] @@ -1265,7 +1265,7 @@ public void Gt_UInt32(uint value, int[] expectedIds, string expectedFilter) ids.Should().Equal(expectedIds); } - [SkippableTheory] + [Theory] [InlineData(0U, new[] { 2, 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gt : 0 } }, { X : { $lt : 0 } } ] }")] [InlineData(1U, new[] { 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gt : 1 } }, { X : { $lt : 0 } } ] }")] [InlineData(0x7fffffffU, new[] { 4, 5, 6, 7 }, "{ $or : [ { X : { $gt : 2147483647 } }, { X : { $lt : 0 } } ] }")] @@ -1286,7 +1286,7 @@ public void Gt_UInt32_typed(uint value, int[] expectedIds, string expectedFilter ids.Should().Equal(expectedIds); } - [SkippableTheory] + [Theory] [InlineData(0U, new[] { 1, 2, 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gte : 0 } }, { X : { $lt : 0 } } ] }")] [InlineData(1U, new[] { 2, 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gte : 1 } }, { X : { $lt : 0 } } ] }")] [InlineData(0x7fffffffU, new[] { 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gte : 2147483647 } }, { X : { $lt : 0 } } ] }")] @@ -1307,7 +1307,7 @@ public void Gte_UInt32(uint value, int[] expectedIds, string expectedFilter) ids.Should().Equal(expectedIds); } - [SkippableTheory] + [Theory] [InlineData(0U, new[] { 1, 2, 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gte : 0 } }, { X : { $lt : 0 } } ] }")] [InlineData(1U, new[] { 2, 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gte : 1 } }, { X : { $lt : 0 } } ] }")] [InlineData(0x7fffffffU, new[] { 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gte : 2147483647 } }, { X : { $lt : 0 } } ] }")] @@ -1328,7 +1328,7 @@ public void Gte_UInt32_typed(uint value, int[] expectedIds, string expectedFilte ids.Should().Equal(expectedIds); } - [SkippableTheory] + [Theory] [InlineData(0U, new int[0], "{ $and : [ { X : { $gte : 0 } }, { X : { $lt : 0 } } ] }")] [InlineData(1U, new[] { 1 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lt : 1 } } ] }")] [InlineData(0x7fffffffU, new[] { 1, 2 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lt : 2147483647 } } ] }")] @@ -1349,7 +1349,7 @@ public void Lt_UInt32(uint value, int[] expectedIds, string expectedFilter) ids.Should().Equal(expectedIds); } - [SkippableTheory] + [Theory] [InlineData(0U, new int[0], "{ $and : [ { X : { $gte : 0 } }, { X : { $lt : 0 } } ] }")] [InlineData(1U, new[] { 1 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lt : 1 } } ] }")] [InlineData(0x7fffffffU, new[] { 1, 2 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lt : 2147483647 } } ] }")] @@ -1370,7 +1370,7 @@ public void Lt_UInt32_typed(uint value, int[] expectedIds, string expectedFilter ids.Should().Equal(expectedIds); } - [SkippableTheory] + [Theory] [InlineData(0U, new int[] { 1 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lte : 0 } } ] }")] [InlineData(1U, new[] { 1, 2 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lte : 1 } } ] }")] [InlineData(0x7fffffffU, new[] { 1, 2, 3 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lte : 2147483647 } } ] }")] @@ -1391,7 +1391,7 @@ public void Lte_UInt32(uint value, int[] expectedIds, string expectedFilter) ids.Should().Equal(expectedIds); } - [SkippableTheory] + [Theory] [InlineData(0U, new int[] { 1 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lte : 0 } } ] }")] [InlineData(1U, new[] { 1, 2 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lte : 1 } } ] }")] [InlineData(0x7fffffffU, new[] { 1, 2, 3 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lte : 2147483647 } } ] }")] @@ -1465,7 +1465,7 @@ private static bool CreateTestData() } #endregion - [SkippableTheory] + [Theory] [InlineData(0UL, new[] { 2, 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gt : NumberLong(0) } }, { X : { $lt : 0 } } ] }")] [InlineData(1UL, new[] { 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gt : NumberLong(1) } }, { X : { $lt : 0 } } ] }")] [InlineData(0x7fffffffffffffffUL, new[] { 4, 5, 6, 7 }, "{ $or : [ { X : { $gt : NumberLong(9223372036854775807) } }, { X : { $lt : 0 } } ] }")] @@ -1486,7 +1486,7 @@ public void Gt_UInt64(ulong value, int[] expectedIds, string expectedFilter) ids.Should().Equal(expectedIds); } - [SkippableTheory] + [Theory] [InlineData(0UL, new[] { 2, 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gt : NumberLong(0) } }, { X : { $lt : 0 } } ] }")] [InlineData(1UL, new[] { 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gt : NumberLong(1) } }, { X : { $lt : 0 } } ] }")] [InlineData(0x7fffffffffffffffUL, new[] { 4, 5, 6, 7 }, "{ $or : [ { X : { $gt : NumberLong(9223372036854775807) } }, { X : { $lt : 0 } } ] }")] @@ -1507,7 +1507,7 @@ public void Gt_UInt64_typed(ulong value, int[] expectedIds, string expectedFilte ids.Should().Equal(expectedIds); } - [SkippableTheory] + [Theory] [InlineData(0UL, new[] { 1, 2, 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gte : NumberLong(0) } }, { X : { $lt : 0 } } ] }")] [InlineData(1UL, new[] { 2, 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gte : NumberLong(1) } }, { X : { $lt : 0 } } ] }")] [InlineData(0x7fffffffffffffffUL, new[] { 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gte : NumberLong(9223372036854775807) } }, { X : { $lt : 0 } } ] }")] @@ -1528,7 +1528,7 @@ public void Gte_UInt64(ulong value, int[] expectedIds, string expectedFilter) ids.Should().Equal(expectedIds); } - [SkippableTheory] + [Theory] [InlineData(0UL, new[] { 1, 2, 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gte : NumberLong(0) } }, { X : { $lt : 0 } } ] }")] [InlineData(1UL, new[] { 2, 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gte : NumberLong(1) } }, { X : { $lt : 0 } } ] }")] [InlineData(0x7fffffffffffffffUL, new[] { 3, 4, 5, 6, 7 }, "{ $or : [ { X : { $gte : NumberLong(9223372036854775807) } }, { X : { $lt : 0 } } ] }")] @@ -1549,7 +1549,7 @@ public void Gte_UInt64_typed(ulong value, int[] expectedIds, string expectedFilt ids.Should().Equal(expectedIds); } - [SkippableTheory] + [Theory] [InlineData(0UL, new int[0], "{ $and : [ { X : { $gte : 0 } }, { X : { $lt : NumberLong(0) } } ] }")] [InlineData(1UL, new[] { 1 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lt : NumberLong(1) } } ] }")] [InlineData(0x7fffffffffffffffUL, new[] { 1, 2 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lt : NumberLong(9223372036854775807) } } ] }")] @@ -1570,7 +1570,7 @@ public void Lt_UInt64(ulong value, int[] expectedIds, string expectedFilter) ids.Should().Equal(expectedIds); } - [SkippableTheory] + [Theory] [InlineData(0UL, new int[0], "{ $and : [ { X : { $gte : 0 } }, { X : { $lt : NumberLong(0) } } ] }")] [InlineData(1UL, new[] { 1 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lt : NumberLong(1) } } ] }")] [InlineData(0x7fffffffffffffffUL, new[] { 1, 2 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lt : NumberLong(9223372036854775807) } } ] }")] @@ -1591,7 +1591,7 @@ public void Lt_UInt64_typed(ulong value, int[] expectedIds, string expectedFilte ids.Should().Equal(expectedIds); } - [SkippableTheory] + [Theory] [InlineData(0UL, new[] { 1 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lte : NumberLong(0) } } ] }")] [InlineData(1UL, new[] { 1, 2 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lte : NumberLong(1) } } ] }")] [InlineData(0x7fffffffffffffffUL, new[] { 1, 2, 3 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lte : NumberLong(9223372036854775807) } } ] }")] @@ -1612,7 +1612,7 @@ public void Lte_UInt64(ulong value, int[] expectedIds, string expectedFilter) ids.Should().Equal(expectedIds); } - [SkippableTheory] + [Theory] [InlineData(0UL, new[] { 1 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lte : NumberLong(0) } } ] }")] [InlineData(1UL, new[] { 1, 2 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lte : NumberLong(1) } } ] }")] [InlineData(0x7fffffffffffffffUL, new[] { 1, 2, 3 }, "{ $and : [ { X : { $gte : 0 } }, { X : { $lte : NumberLong(9223372036854775807) } } ] }")] diff --git a/tests/MongoDB.Driver.Tests/FindFluentTests.cs b/tests/MongoDB.Driver.Tests/FindFluentTests.cs index b9ca37b891c..bae0d79750d 100644 --- a/tests/MongoDB.Driver.Tests/FindFluentTests.cs +++ b/tests/MongoDB.Driver.Tests/FindFluentTests.cs @@ -20,7 +20,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Linq; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Tests/IAggregateFluentExtensionsTests.cs b/tests/MongoDB.Driver.Tests/IAggregateFluentExtensionsTests.cs index 24051134cb2..17377ed835c 100644 --- a/tests/MongoDB.Driver.Tests/IAggregateFluentExtensionsTests.cs +++ b/tests/MongoDB.Driver.Tests/IAggregateFluentExtensionsTests.cs @@ -17,7 +17,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using MongoDB.Driver.Linq; using Moq; @@ -203,7 +203,7 @@ public void Lookup_should_generate_the_correct_group_when_using_lambdas() AssertLast(subject, expectedLookup); } - [SkippableFact] + [Fact] public void Lookup_expressive_should_generate_the_correct_lookup_when_using_BsonDocument() { RequireServer.Check(); @@ -219,7 +219,7 @@ public void Lookup_expressive_should_generate_the_correct_lookup_when_using_Bson AssertLast(subject, expectedLookup); } - [SkippableFact] + [Fact] public void Lookup_expressive_should_generate_the_correct_lookup_when_using_lambdas() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/IFindFluentExtensionsTests.cs b/tests/MongoDB.Driver.Tests/IFindFluentExtensionsTests.cs index 8c0b6b2b1bc..60bc77841cc 100644 --- a/tests/MongoDB.Driver.Tests/IFindFluentExtensionsTests.cs +++ b/tests/MongoDB.Driver.Tests/IFindFluentExtensionsTests.cs @@ -20,7 +20,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.Serialization; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Tests/IMongoClientExtensionsTests.cs b/tests/MongoDB.Driver.Tests/IMongoClientExtensionsTests.cs index e3a103c5ec7..4cd59675a0f 100644 --- a/tests/MongoDB.Driver.Tests/IMongoClientExtensionsTests.cs +++ b/tests/MongoDB.Driver.Tests/IMongoClientExtensionsTests.cs @@ -15,7 +15,7 @@ using System.Threading; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Tests/IMongoCollectionExtensionsTests.cs b/tests/MongoDB.Driver.Tests/IMongoCollectionExtensionsTests.cs index 77279086626..7b326b27cf3 100644 --- a/tests/MongoDB.Driver.Tests/IMongoCollectionExtensionsTests.cs +++ b/tests/MongoDB.Driver.Tests/IMongoCollectionExtensionsTests.cs @@ -18,7 +18,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Linq; using MongoDB.Driver.Tests.Linq.Linq2ImplementationTests; using MongoDB.Driver.Tests.Linq.Linq3ImplementationTests; diff --git a/tests/MongoDB.Driver.Tests/IMongoDatabaseExtensionsTests.cs b/tests/MongoDB.Driver.Tests/IMongoDatabaseExtensionsTests.cs index 7158c95f3da..ac41119a061 100644 --- a/tests/MongoDB.Driver.Tests/IMongoDatabaseExtensionsTests.cs +++ b/tests/MongoDB.Driver.Tests/IMongoDatabaseExtensionsTests.cs @@ -15,7 +15,7 @@ using System.Threading; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Tests/Jira/CSharp2564Tests.cs b/tests/MongoDB.Driver.Tests/Jira/CSharp2564Tests.cs index 071c74bfa84..c3147928d60 100644 --- a/tests/MongoDB.Driver.Tests/Jira/CSharp2564Tests.cs +++ b/tests/MongoDB.Driver.Tests/Jira/CSharp2564Tests.cs @@ -30,7 +30,7 @@ namespace MongoDB.Driver.Tests.Jira { public class CSharp2564Tests { - [SkippableFact] + [Fact] public async Task Misbehaved_async_method_should_not_deadlock_server_selection() { RequireServer.Check().ClusterType(ClusterType.ReplicaSet); diff --git a/tests/MongoDB.Driver.Tests/Jira/CSharp3188Tests.cs b/tests/MongoDB.Driver.Tests/Jira/CSharp3188Tests.cs index eace8ca6627..2027d15dab2 100644 --- a/tests/MongoDB.Driver.Tests/Jira/CSharp3188Tests.cs +++ b/tests/MongoDB.Driver.Tests/Jira/CSharp3188Tests.cs @@ -18,7 +18,7 @@ using System.Net.Sockets; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; @@ -28,7 +28,7 @@ namespace MongoDB.Driver.Tests.Jira { public class CSharp3188Tests { - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Connection_timeout_should_throw_expected_exception([Values(false, true)] bool async) { diff --git a/tests/MongoDB.Driver.Tests/Jira/CSharp3915Tests.cs b/tests/MongoDB.Driver.Tests/Jira/CSharp3915Tests.cs index 035d53ae041..f614237004a 100644 --- a/tests/MongoDB.Driver.Tests/Jira/CSharp3915Tests.cs +++ b/tests/MongoDB.Driver.Tests/Jira/CSharp3915Tests.cs @@ -28,7 +28,7 @@ namespace MongoDB.Driver.Tests.Jira public class CSharp3915Tests : Linq3IntegrationTest { // this example is from: https://www.mongodb.com/docs/v5.2/reference/operator/aggregation/densify - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void Densify_time_series_data_example_using_aggregate_should_work(bool usingExpressions) @@ -76,7 +76,7 @@ public void Densify_time_series_data_example_using_aggregate_should_work(bool us } // this example is from: https://www.mongodb.com/docs/v5.2/reference/operator/aggregation/densify - [SkippableFact] + [Fact] public void Densify_time_series_data_example_using_linq_should_work() { RequireServer.Check().Supports(Feature.DensifyStage); @@ -112,7 +112,7 @@ public void Densify_time_series_data_example_using_linq_should_work() } // this example is from: https://www.mongodb.com/docs/v5.2/reference/operator/aggregation/densify - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void Densify_the_full_range_of_values_example_using_aggregate_should_work(bool usingExpressions) @@ -164,7 +164,7 @@ public void Densify_the_full_range_of_values_example_using_aggregate_should_work } // this example is from: https://www.mongodb.com/docs/v5.2/reference/operator/aggregation/densify - [SkippableFact] + [Fact] public void Densify_the_full_range_of_values_example_using_linq_should_work() { RequireServer.Check().Supports(Feature.DensifyStage); @@ -203,7 +203,7 @@ public void Densify_the_full_range_of_values_example_using_linq_should_work() } // this example is from: https://www.mongodb.com/docs/v5.2/reference/operator/aggregation/densify - [SkippableTheory] + [Theory] [InlineData(false)] [InlineData(true)] public void Densify_values_within_each_partition_example_using_aggregate_should_work(bool usingExpressions) @@ -247,7 +247,7 @@ public void Densify_values_within_each_partition_example_using_aggregate_should_ } // this example is from: https://www.mongodb.com/docs/v5.2/reference/operator/aggregation/densify - [SkippableFact] + [Fact] public void Densify_values_within_each_partition_example_using_linq_should_work() { RequireServer.Check().Supports(Feature.DensifyStage); diff --git a/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenTestFactory.cs b/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenTestFactory.cs index dd46600f40f..322e77dac89 100644 --- a/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenTestFactory.cs +++ b/tests/MongoDB.Driver.Tests/JsonDrivenTests/JsonDrivenTestFactory.cs @@ -19,6 +19,7 @@ using MongoDB.Bson.TestHelpers.JsonDrivenTests; using MongoDB.Driver.Core; using Xunit; +using Xunit.Sdk; namespace MongoDB.Driver.Tests.JsonDrivenTests { diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/AggregateQueryableExecutionModelTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/AggregateQueryableExecutionModelTests.cs index 71641b87c47..7dad1c6e754 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/AggregateQueryableExecutionModelTests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/AggregateQueryableExecutionModelTests.cs @@ -16,7 +16,7 @@ using System.Threading; using MongoDB.Bson; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Linq; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/MongoQueryProviderImplTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/MongoQueryProviderImplTests.cs index abb9802d549..4bccd8615e1 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/MongoQueryProviderImplTests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/MongoQueryProviderImplTests.cs @@ -18,7 +18,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Linq; using MongoDB.Driver.Linq.Linq2Implementation; using Moq; diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/MongoQueryableTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/MongoQueryableTests.cs index fb4a19af16a..a293d2a62ac 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/MongoQueryableTests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/MongoQueryableTests.cs @@ -179,7 +179,7 @@ public async Task CountAsync_with_no_matches() result.Should().Be(0); } - [SkippableFact] + [Fact] public void Distinct_document_followed_by_where() { RequireServer.Check(); @@ -193,7 +193,7 @@ public void Distinct_document_followed_by_where() "{ $match: { '_id.A': 'Awesome' } }"); } - [SkippableFact] + [Fact] public void Distinct_document_preceded_by_select_where() { RequireServer.Check(); @@ -209,7 +209,7 @@ public void Distinct_document_preceded_by_select_where() "{ $group: { '_id': '$$ROOT' } }"); } - [SkippableFact] + [Fact] public void Distinct_document_preceded_by_where_select() { RequireServer.Check(); @@ -224,7 +224,7 @@ public void Distinct_document_preceded_by_where_select() "{ $group: { '_id': { 'A': '$A', 'B': '$B' } } }"); } - [SkippableFact] + [Fact] public void Distinct_field_preceded_by_where_select() { RequireServer.Check(); @@ -239,7 +239,7 @@ public void Distinct_field_preceded_by_where_select() "{ $group: { '_id': '$A' } }"); } - [SkippableFact] + [Fact] public void Distinct_field_preceded_by_select_where() { RequireServer.Check(); @@ -473,7 +473,7 @@ public void GroupBy_with_resultSelector_anonymous_type_method() "{ $group: { _id: '$A', FirstB: { $first: '$B'} } }"); } - [SkippableFact] + [Fact] public void GroupJoin_method() { RequireServer.Check(); @@ -489,7 +489,7 @@ public void GroupJoin_method() "{ $lookup: { from: 'testcollection_other', localField: '_id', foreignField: '_id', as: 'o' } }"); } - [SkippableFact] + [Fact] public void GroupJoinForeignField_method() { RequireServer.Check(); @@ -505,7 +505,7 @@ public void GroupJoinForeignField_method() "{ $lookup: { from: 'testcollection_other', localField: '_id', foreignField: 'CEF', as: 'o' } }"); } - [SkippableFact] + [Fact] public void GroupJoin_syntax() { RequireServer.Check(); @@ -519,7 +519,7 @@ join o in CreateOtherQuery() on p.Id equals o.Id into joined "{ $project: { A: '$A', SumCEF: { $sum: '$joined.CEF' }, _id: 0 } }"); } - [SkippableFact] + [Fact] public void GroupJoin_syntax_with_a_transparent_identifier() { RequireServer.Check(); @@ -535,7 +535,7 @@ orderby p.B "{ $project: { A: '$A', Joined: '$joined', _id: 0 } }"); } - [SkippableFact] + [Fact] public void GroupJoin_syntax_with_select_many() { RequireServer.Check(); @@ -551,7 +551,7 @@ from subo in joined "{ $project: { A: '$A', CEF: '$joined.CEF', _id: 0 } }"); } - [SkippableFact] + [Fact] public void GroupJoin_syntax_with_select_many_and_DefaultIfEmpty() { RequireServer.Check(); @@ -568,7 +568,7 @@ from subo in joined.DefaultIfEmpty() "{ $project: { A: '$A', CEF: { $ifNull: ['$joined.CEF', null] }, _id: 0 } }"); } - [SkippableFact] + [Fact] public void Join_method() { RequireServer.Check(); @@ -585,7 +585,7 @@ public void Join_method() "{ $unwind: '$o' }"); } - [SkippableFact] + [Fact] public void JoinForeignField_method() { RequireServer.Check(); @@ -602,7 +602,7 @@ public void JoinForeignField_method() "{ $unwind: '$o' }"); } - [SkippableFact] + [Fact] public void Join_syntax() { RequireServer.Check(); @@ -617,7 +617,7 @@ join o in CreateOtherQuery() on p.Id equals o.Id "{ $project: { A: '$A', CEF: '$o.CEF', _id: 0 } }"); } - [SkippableFact] + [Fact] public void Join_syntax_with_a_transparent_identifier() { RequireServer.Check(); @@ -866,7 +866,7 @@ public void OrderBy_ThenBy_ThenByDescending_with_redundant_fields_in_different_d act.ShouldThrow(); } - [SkippableFact] + [Fact] public void Sample() { RequireServer.Check(); @@ -877,7 +877,7 @@ public void Sample() "{ $sample: { size: 100 } }"); } - [SkippableFact] + [Fact] public void Sample_after_another_function() { RequireServer.Check(); @@ -934,7 +934,7 @@ public void Select_method_computed_scalar_followed_by_where() "{ $match: { __fld0: 'Awesome Balloon' } }"); } - [SkippableFact] + [Fact] public void Select_method_with_predicated_any() { RequireServer.Check(); @@ -1056,7 +1056,7 @@ public void Select_syntax_array() "{ $project: { M: '$M', _id: 0 } }"); } - [SkippableFact] + [Fact] public void Select_method_array_index() { RequireServer.Check(); @@ -1067,7 +1067,7 @@ public void Select_method_array_index() "{ $project: { __fld0: { $arrayElemAt: ['$M', 0] }, _id: 0 } }"); } - [SkippableFact] + [Fact] public void Select_syntax_array_index() { RequireServer.Check(); @@ -1079,7 +1079,7 @@ public void Select_syntax_array_index() "{ $project: { __fld0: { $arrayElemAt: ['$M', 0] }, _id: 0 } }"); } - [SkippableFact] + [Fact] public void Select_method_embedded_pipeline() { RequireServer.Check(); @@ -1090,7 +1090,7 @@ public void Select_method_embedded_pipeline() "{ $project: { __fld0: { $arrayElemAt: ['$M', 0] }, _id: 0 } }"); } - [SkippableFact] + [Fact] public void Select_method_computed_array() { RequireServer.Check(); @@ -1102,7 +1102,7 @@ public void Select_method_computed_array() "{ $project: { __fld0: { $map: { input: '$M', as: 'i', in: { $add: ['$$i', 1] } } }, _id: 0 } }"); } - [SkippableFact] + [Fact] public void Select_syntax_computed_array() { RequireServer.Check(); @@ -1546,7 +1546,7 @@ public void Skip() "{ $skip: 10 }"); } - [SkippableFact] + [Fact] public void StandardDeviationPopulation() { RequireServer.Check(); @@ -1556,7 +1556,7 @@ public void StandardDeviationPopulation() result.Should().Be(50); } - [SkippableFact] + [Fact] public void StandardDeviationPopulation_with_selector() { RequireServer.Check(); @@ -1566,7 +1566,7 @@ public void StandardDeviationPopulation_with_selector() result.Should().Be(50); } - [SkippableFact] + [Fact] public async Task StandardDeviationPopulationAsync() { RequireServer.Check(); @@ -1576,7 +1576,7 @@ public async Task StandardDeviationPopulationAsync() result.Should().Be(50); } - [SkippableFact] + [Fact] public async Task StandardDeviationPopulationAsync_with_selector() { RequireServer.Check(); @@ -1586,7 +1586,7 @@ public async Task StandardDeviationPopulationAsync_with_selector() result.Should().Be(50); } - [SkippableFact] + [Fact] public void StandardDeviationSample() { RequireServer.Check(); @@ -1596,7 +1596,7 @@ public void StandardDeviationSample() result.Should().BeApproximately(70.7106781186548, .0001); } - [SkippableFact] + [Fact] public void StandardDeviationSample_with_selector() { RequireServer.Check(); @@ -1606,7 +1606,7 @@ public void StandardDeviationSample_with_selector() result.Should().BeApproximately(70.7106781186548, .0001); } - [SkippableFact] + [Fact] public async Task StandardDeviationSampleAsync() { RequireServer.Check(); @@ -1616,7 +1616,7 @@ public async Task StandardDeviationSampleAsync() result.Should().BeApproximately(70.7106781186548, .0001); } - [SkippableFact] + [Fact] public async Task StandardDeviationSampleAsync_with_selector() { RequireServer.Check(); @@ -1719,7 +1719,7 @@ public void Where_method_with_predicated_any() "{ $match : { 'G' : { '$elemMatch' : { 'D' : \"Don't\" } } } }"); } - [SkippableFact] + [Fact] public void AsQueryable_in_transaction() { RequireServer.Check().ClusterTypes(ClusterType.ReplicaSet, ClusterType.Sharded).Supports(Feature.Transactions); diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/Translators/AggregateGroupTranslatorTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/Translators/AggregateGroupTranslatorTests.cs index af2cdbb7fce..03ff1fb006e 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/Translators/AggregateGroupTranslatorTests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/Translators/AggregateGroupTranslatorTests.cs @@ -299,7 +299,7 @@ public void Should_translate_push_with_ToList() result.Value.Result.Should().Equal(111); } - [SkippableFact] + [Fact] public void Should_translate_stdDevPop_with_embedded_projector() { RequireServer.Check(); @@ -311,7 +311,7 @@ public void Should_translate_stdDevPop_with_embedded_projector() result.Value.Result.Should().Be(50); } - [SkippableFact] + [Fact] public void Should_translate_stdDevPop_with_selected_projector() { RequireServer.Check(); @@ -323,7 +323,7 @@ public void Should_translate_stdDevPop_with_selected_projector() result.Value.Result.Should().Be(50); } - [SkippableFact] + [Fact] public void Should_translate_stdDevSamp_with_embedded_projector() { RequireServer.Check(); @@ -335,7 +335,7 @@ public void Should_translate_stdDevSamp_with_embedded_projector() result.Value.Result.Should().BeApproximately(70.7106781156545, .0001); } - [SkippableFact] + [Fact] public void Should_translate_stdDevSamp_with_selected_projector() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/Translators/AggregateProjectTranslatorTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/Translators/AggregateProjectTranslatorTests.cs index d284572788c..bd31927a996 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/Translators/AggregateProjectTranslatorTests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/Translators/AggregateProjectTranslatorTests.cs @@ -57,7 +57,7 @@ public void Should_translate_using_non_anonymous_type_with_parameterized_constru result.Value.Field.Should().Be("Balloon"); } - [SkippableFact] + [Fact] public void Should_translate_abs() { RequireServer.Check(); @@ -88,7 +88,7 @@ public void Should_translate_add_flattened() result.Value.Result.Should().Be(43); } - [SkippableFact] + [Fact] public void Should_translate_allElementsTrue() { RequireServer.Check(); @@ -100,7 +100,7 @@ public void Should_translate_allElementsTrue() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_anyElementTrue() { RequireServer.Check(); @@ -112,7 +112,7 @@ public void Should_translate_anyElementTrue() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_anyElementTrue_with_predicate() { RequireServer.Check(); @@ -124,7 +124,7 @@ public void Should_translate_anyElementTrue_with_predicate() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_anyElementTrue_using_Contains() { RequireServer.Check(); @@ -136,7 +136,7 @@ public void Should_translate_anyElementTrue_using_Contains() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_anyElementTrue_using_Contains_on_a_local_collection() { RequireServer.Check(); @@ -169,7 +169,7 @@ public void Should_translate_and_flattened() result.Value.Result.Should().BeFalse(); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_constant_ElementAt() { RequireServer.Check(); @@ -181,7 +181,7 @@ public void Should_translate_arrayElemAt_using_a_constant_ElementAt() result.Value.Result.Should().Be(4); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_constant_indexer() { RequireServer.Check(); @@ -193,7 +193,7 @@ public void Should_translate_arrayElemAt_using_a_constant_indexer() result.Value.Result.Should().Be(4); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_constant_get_Item() { RequireServer.Check(); @@ -205,7 +205,7 @@ public void Should_translate_arrayElemAt_using_a_constant_get_Item() result.Value.Result.Should().Be(20); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_variable_ElementAt() { RequireServer.Check(); @@ -217,7 +217,7 @@ public void Should_translate_arrayElemAt_using_a_variable_ElementAt() result.Value.Result.Should().Be(4); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_variable_indexer() { RequireServer.Check(); @@ -229,7 +229,7 @@ public void Should_translate_arrayElemAt_using_a_variable_indexer() result.Value.Result.Should().Be(4); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_variable_get_Item() { RequireServer.Check(); @@ -241,7 +241,7 @@ public void Should_translate_arrayElemAt_using_a_variable_get_Item() result.Value.Result.Should().Be(20); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_constant_ElementAt_followed_by_a_field() { RequireServer.Check(); @@ -253,7 +253,7 @@ public void Should_translate_arrayElemAt_using_a_constant_ElementAt_followed_by_ result.Value.Result.Should().Be("Dolphin"); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_variable_ElementAt_followed_by_a_field() { RequireServer.Check(); @@ -265,7 +265,7 @@ public void Should_translate_arrayElemAt_using_a_variable_ElementAt_followed_by_ result.Value.Result.Should().Be("Dolphin"); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_First() { RequireServer.Check(); @@ -277,7 +277,7 @@ public void Should_translate_arrayElemAt_using_First() result.Value.Result.Should().Be(2); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_First_followed_by_a_field() { RequireServer.Check(); @@ -289,7 +289,7 @@ public void Should_translate_arrayElemAt_using_First_followed_by_a_field() result.Value.Result.Should().Be("Don't"); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_Last() { RequireServer.Check(); @@ -301,7 +301,7 @@ public void Should_translate_arrayElemAt_using_Last() result.Value.Result.Should().Be(5); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_Last_followed_by_a_field() { RequireServer.Check(); @@ -313,7 +313,7 @@ public void Should_translate_arrayElemAt_using_Last_followed_by_a_field() result.Value.Result.Should().Be("Dolphin"); } - [SkippableFact] + [Fact] public void Should_translate_avg() { RequireServer.Check(); @@ -325,7 +325,7 @@ public void Should_translate_avg() result.Value.Result.Should().BeApproximately(3.66666667, .0001); } - [SkippableFact] + [Fact] public void Should_translate_avg_with_selector() { RequireServer.Check(); @@ -337,7 +337,7 @@ public void Should_translate_avg_with_selector() result.Value.Result.Should().Be(44); } - [SkippableFact] + [Fact] public void Should_translate_boolToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -349,7 +349,7 @@ public void Should_translate_boolToString() result.Value.Result.Should().Be("true"); } - [SkippableFact] + [Fact] public void Should_translate_ceil() { RequireServer.Check(); @@ -381,7 +381,7 @@ public void Should_translate_compare() result.Value.Result.Should().Be(0); } - [SkippableFact] + [Fact] public void Should_translate_concat() { RequireServer.Check(); @@ -393,7 +393,7 @@ public void Should_translate_concat() result.Value.Result.Should().Be("AwesomeBalloon"); } - [SkippableFact] + [Fact] public void Should_translate_concat_flattened() { RequireServer.Check(); @@ -405,7 +405,7 @@ public void Should_translate_concat_flattened() result.Value.Result.Should().Be("Awesome Balloon"); } - [SkippableFact] + [Fact] public void Should_translate_concatArrays() { RequireServer.Check(); @@ -427,7 +427,7 @@ public void Should_translate_condition() result.Value.Result.Should().Be("b"); } - [SkippableFact] + [Fact] public void Should_translate_dateTimeToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -439,7 +439,7 @@ public void Should_translate_dateTimeToString() result.Value.Result.Should().Be("2012-12-01T13:14:15.016Z"); } - [SkippableFact] + [Fact] public void Should_translate_dateToString() { RequireServer.Check(); @@ -481,7 +481,7 @@ public void Should_translate_day_of_year() result.Value.Result.Should().Be(336); } - [SkippableFact] + [Fact] public void Should_translate_decimalToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -513,7 +513,7 @@ public void Should_translate_divide_3_numbers() result.Value.Result.Should().BeApproximately(0.04, .01); } - [SkippableFact] + [Fact] public void Should_translate_doubleToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -545,7 +545,7 @@ public void Should_translate_equals_as_a_method_call() result.Value.Result.Should().BeFalse(); } - [SkippableFact] + [Fact] public void Should_translate_exp() { RequireServer.Check(); @@ -557,7 +557,7 @@ public void Should_translate_exp() result.Value.Result.Should().BeApproximately(59874.1417151978, .0001); } - [SkippableFact] + [Fact] public void Should_translate_floor() { RequireServer.Check(); @@ -599,7 +599,7 @@ public void Should_translate_hour() result.Value.Result.Should().Be(13); } - [SkippableFact] + [Fact] public void Should_translate_indexOfBytes() { RequireServer.Check(); @@ -629,7 +629,7 @@ public void Should_translate_indexOfBytes() result.Value.Result.Should().Be(-1); } - [SkippableFact] + [Fact] public void Should_translate_indexOfCP() { RequireServer.Check(); @@ -659,7 +659,7 @@ public void Should_translate_indexOfCP() result.Value.Result.Should().Be(-1); } - [SkippableFact] + [Fact] public void Should_translate_intToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -691,7 +691,7 @@ public void Should_translate_less_than_or_equal() result.Value.Result.Should().BeFalse(); } - [SkippableFact] + [Fact] public void Should_translate_literal_when_a_constant_strings_begins_with_a_dollar() { RequireServer.Check(); @@ -703,7 +703,7 @@ public void Should_translate_literal_when_a_constant_strings_begins_with_a_dolla result.Value.Result.Should().BeFalse(); } - [SkippableFact] + [Fact] public void Should_translate_ln() { RequireServer.Check(); @@ -715,7 +715,7 @@ public void Should_translate_ln() result.Value.Result.Should().BeApproximately(2.39789527279837, .0001); } - [SkippableFact] + [Fact] public void Should_translate_log() { RequireServer.Check(); @@ -727,7 +727,7 @@ public void Should_translate_log() result.Value.Result.Should().Be(1); } - [SkippableFact] + [Fact] public void Should_translate_log10() { RequireServer.Check(); @@ -739,7 +739,7 @@ public void Should_translate_log10() result.Value.Result.Should().BeApproximately(1.0413928515823, .0001); } - [SkippableFact] + [Fact] public void Should_translate_longToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -751,7 +751,7 @@ public void Should_translate_longToString() result.Value.Result.Should().Be("9"); } - [SkippableFact] + [Fact] public void Should_translate_map_with_document() { RequireServer.Check(); @@ -763,7 +763,7 @@ public void Should_translate_map_with_document() result.Value.Result.Should().Equal("Don't0", "Dolphin0"); } - [SkippableFact] + [Fact] public void Should_translate_map_with_value() { RequireServer.Check(); @@ -775,7 +775,7 @@ public void Should_translate_map_with_value() result.Value.Result.Should().Equal("it0", "icky0"); } - [SkippableFact] + [Fact] public void Should_translate_max() { RequireServer.Check(); @@ -787,7 +787,7 @@ public void Should_translate_max() result.Value.Result.Should().Be(5); } - [SkippableFact] + [Fact] public void Should_translate_max_with_selector() { RequireServer.Check(); @@ -799,7 +799,7 @@ public void Should_translate_max_with_selector() result.Value.Result.Should().Be(55); } - [SkippableFact] + [Fact] public void Should_translate_millisecond() { RequireServer.Check(); @@ -811,7 +811,7 @@ public void Should_translate_millisecond() result.Value.Result.Should().Be(16); } - [SkippableFact] + [Fact] public void Should_translate_min() { RequireServer.Check(); @@ -823,7 +823,7 @@ public void Should_translate_min() result.Value.Result.Should().Be(2); } - [SkippableFact] + [Fact] public void Should_translate_min_with_selector() { RequireServer.Check(); @@ -885,7 +885,7 @@ public void Should_translate_multiply_flattened() result.Value.Result.Should().Be(2420); } - [SkippableFact] + [Fact] public void Should_translate_new_DateTime() { RequireServer.Check(); @@ -933,7 +933,7 @@ public void Should_translate_not_equals() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_objectIdToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -965,7 +965,7 @@ public void Should_translate_or_flattened() result.Value.Result.Should().BeFalse(); } - [SkippableFact] + [Fact] public void Should_translate_DateTime_parse() { RequireServer.Check(); @@ -977,7 +977,7 @@ public void Should_translate_DateTime_parse() result.Value.Result.Should().Be(new DateTime(2017, 2, 8, 12, 10, 40, 787, DateTimeKind.Utc)); } - [SkippableFact] + [Fact] public void Should_translate_pow() { RequireServer.Check(); @@ -989,7 +989,7 @@ public void Should_translate_pow() result.Value.Result.Should().Be(161051); } - [SkippableFact] + [Fact] public void Should_translate_range() { RequireServer.Check(); @@ -1001,7 +1001,7 @@ public void Should_translate_range() result.Value.Result.Should().BeEquivalentTo(11, 12, 13); } - [SkippableFact] + [Fact] public void Should_translate_reduce() { RequireServer.Check(); @@ -1025,7 +1025,7 @@ public void Should_translate_reduce() typeResult.Value.Result.y.Should().Be(5); } - [SkippableFact] + [Fact] public void Should_translate_reverse() { RequireServer.Check(); @@ -1047,7 +1047,7 @@ public void Should_translate_second() result.Value.Result.Should().Be(15); } - [SkippableFact] + [Fact] public void Should_translate_size_greater_than_zero_from_any() { RequireServer.Check(); @@ -1059,7 +1059,7 @@ public void Should_translate_size_greater_than_zero_from_any() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_size_from_an_array() { RequireServer.Check(); @@ -1071,7 +1071,7 @@ public void Should_translate_size_from_an_array() result.Value.Result.Should().Be(3); } - [SkippableFact] + [Fact] public void Should_translate_size_from_Count_extension_method() { RequireServer.Check(); @@ -1083,7 +1083,7 @@ public void Should_translate_size_from_Count_extension_method() result.Value.Result.Should().Be(3); } - [SkippableFact] + [Fact] public void Should_translate_size_from_LongCount_extension_method() { RequireServer.Check(); @@ -1095,7 +1095,7 @@ public void Should_translate_size_from_LongCount_extension_method() result.Value.Result.Should().Be(3); } - [SkippableFact] + [Fact] public void Should_translate_size_from_Count_property_on_Generic_ICollection() { RequireServer.Check(); @@ -1107,7 +1107,7 @@ public void Should_translate_size_from_Count_property_on_Generic_ICollection() result.Value.Result.Should().Be(3); } - [SkippableFact] + [Fact] public void Should_translate_set_difference() { RequireServer.Check(); @@ -1119,7 +1119,7 @@ public void Should_translate_set_difference() result.Value.Result.Should().Equal("icky"); } - [SkippableFact] + [Fact] public void Should_translate_set_difference_reversed() { RequireServer.Check(); @@ -1131,7 +1131,7 @@ public void Should_translate_set_difference_reversed() result.Value.Result.Should().Equal("not in here"); } - [SkippableFact] + [Fact] public void Should_translate_set_equals() { RequireServer.Check(); @@ -1143,7 +1143,7 @@ public void Should_translate_set_equals() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_set_equals_reversed() { RequireServer.Check(); @@ -1156,7 +1156,7 @@ public void Should_translate_set_equals_reversed() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_set_intersection() { RequireServer.Check(); @@ -1168,7 +1168,7 @@ public void Should_translate_set_intersection() result.Value.Result.Should().Equal("it"); } - [SkippableFact] + [Fact] public void Should_translate_set_intersection_reversed() { RequireServer.Check(); @@ -1180,7 +1180,7 @@ public void Should_translate_set_intersection_reversed() result.Value.Result.Should().Equal("it"); } - [SkippableFact] + [Fact] public void Should_translate_set_is_subset() { RequireServer.Check(); @@ -1192,7 +1192,7 @@ public void Should_translate_set_is_subset() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_set_is_subset_reversed() { RequireServer.Check(); @@ -1205,7 +1205,7 @@ public void Should_translate_set_is_subset_reversed() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_set_union() { RequireServer.Check(); @@ -1217,7 +1217,7 @@ public void Should_translate_set_union() result.Value.Result.Should().BeEquivalentTo("it", "icky", "not in here"); } - [SkippableFact] + [Fact] public void Should_translate_set_union_reversed() { RequireServer.Check(); @@ -1229,7 +1229,7 @@ public void Should_translate_set_union_reversed() result.Value.Result.Should().BeEquivalentTo("it", "icky", "not in here"); } - [SkippableFact] + [Fact] public void Should_translate_sqrt() { RequireServer.Check(); @@ -1241,7 +1241,7 @@ public void Should_translate_sqrt() result.Value.Result.Should().BeApproximately(3.31662479, .0001); } - [SkippableFact] + [Fact] public void Should_translate_stringToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -1253,7 +1253,7 @@ public void Should_translate_stringToString() result.Value.Result.Should().Be("Awesome"); } - [SkippableFact] + [Fact] public void Should_translate_trunc() { RequireServer.Check(); @@ -1265,7 +1265,7 @@ public void Should_translate_trunc() result.Value.Result.Should().Be(1); } - [SkippableFact] + [Fact] public void Should_translate_where_to_filter() { RequireServer.Check(); @@ -1278,7 +1278,7 @@ public void Should_translate_where_to_filter() result.Value.Result.Single().D.Should().Be("Don't"); } - [SkippableFact] + [Fact] public void Should_translate_where_then_select_to_filter_then_map() { RequireServer.Check(); @@ -1291,7 +1291,7 @@ public void Should_translate_where_then_select_to_filter_then_map() result.Value.Result.Single().Should().Be("Don't"); } - [SkippableFact] + [Fact] public void Should_translate_select_then_where_to_map_then_filter() { RequireServer.Check(); @@ -1304,7 +1304,7 @@ public void Should_translate_select_then_where_to_map_then_filter() result.Value.Result.Single().Should().Be("Don't"); } - [SkippableFact] + [Fact] public void Should_translate_select_with_an_anonymous_type_then_where_to_map_then_filter() { RequireServer.Check(); @@ -1318,7 +1318,7 @@ public void Should_translate_select_with_an_anonymous_type_then_where_to_map_the result.Value.Result.Single().F.Should().Be(33); } - [SkippableFact] + [Fact] public void Should_translate_strLenBytes() { RequireServer.Check(); @@ -1330,7 +1330,7 @@ public void Should_translate_strLenBytes() result.Value.Result.Should().Be(7); } - [SkippableFact] + [Fact] public void Should_translate_strLenCP() { RequireServer.Check(); @@ -1342,7 +1342,7 @@ public void Should_translate_strLenCP() result.Value.Result.Should().Be(7); } - [SkippableFact] + [Fact] public void Should_translate_split() { RequireServer.Check(); @@ -1368,7 +1368,7 @@ public void Should_translate_split() result4.Value.Result.Should().BeEquivalentTo("Aw", "ome"); } - [SkippableFact] + [Fact] public void Should_translate_stdDevPop() { RequireServer.Check(); @@ -1380,7 +1380,7 @@ public void Should_translate_stdDevPop() result.Value.Result.Should().BeApproximately(1.247219128924647, .0001); } - [SkippableFact] + [Fact] public void Should_translate_stdDevPop_with_selector() { RequireServer.Check(); @@ -1392,7 +1392,7 @@ public void Should_translate_stdDevPop_with_selector() result.Value.Result.Should().Be(11); } - [SkippableFact] + [Fact] public void Should_translate_stdDevSamp() { RequireServer.Check(); @@ -1404,7 +1404,7 @@ public void Should_translate_stdDevSamp() result.Value.Result.Should().BeApproximately(1.5275252316519468, .0001); } - [SkippableFact] + [Fact] public void Should_translate_stdDevSamp_with_selector() { RequireServer.Check(); @@ -1478,7 +1478,7 @@ public void Should_translate_substr() result.Value.Result.Should().Be("loon"); } - [SkippableFact] + [Fact] public void Should_translate_substrCP() { RequireServer.Check(); @@ -1510,7 +1510,7 @@ public void Should_translate_subtract_3_numbers() result.Value.Result.Should().Be(-23); } - [SkippableFact] + [Fact] public void Should_translate_slice_with_2_arguments() { RequireServer.Check(); @@ -1522,7 +1522,7 @@ public void Should_translate_slice_with_2_arguments() result.Value.Result.Should().BeEquivalentTo(2, 4); } - [SkippableFact] + [Fact] public void Should_translate_slice_with_3_arguments() { RequireServer.Check(); @@ -1534,7 +1534,7 @@ public void Should_translate_slice_with_3_arguments() result.Value.Result.Should().BeEquivalentTo(4, 5); } - [SkippableFact] + [Fact] public void Should_translate_sum() { RequireServer.Check(); @@ -1546,7 +1546,7 @@ public void Should_translate_sum() result.Value.Result.Should().Be(11); } - [SkippableFact] + [Fact] public void Should_translate_sum_with_selector() { RequireServer.Check(); @@ -1608,7 +1608,7 @@ public void Should_translate_year() result.Value.Result.Should().Be(2012); } - [SkippableFact] + [Fact] public void Should_translate_zip_with_operation() { RequireServer.Check(); @@ -1620,7 +1620,7 @@ public void Should_translate_zip_with_operation() result.Value.Result.Should().BeEquivalentTo(12L, 24L, 35L); } - [SkippableFact] + [Fact] public void Should_translate_zip_with_anonymous_type() { RequireServer.Check(); @@ -1657,7 +1657,7 @@ public void Should_translate_a_derived_class_projection() result.Value.DerivedProperty.Should().Be("Balloon"); } - [SkippableFact] + [Fact] public void Should_translate_array_projection_complex() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/Translators/PredicateTranslatorTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/Translators/PredicateTranslatorTests.cs index ceede91b1cf..21656133d03 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/Translators/PredicateTranslatorTests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTests/Translators/PredicateTranslatorTests.cs @@ -477,7 +477,7 @@ public void Any_with_a_predicate_on_scalars_legacy() "{ M : { $elemMatch : { $gt : 2, $lt : 6 } } }"); } - [SkippableFact] + [Fact] public void Any_with_a_predicate_on_scalars() { RequireServer.Check(); @@ -545,7 +545,7 @@ public void AsQueryable() "{ 'G' : { '$elemMatch' : { 'D' : \"Don't\" } } }"); } - [SkippableFact] + [Fact] public void BitsAllClear_with_bitwise_operators() { RequireServer.Check(); @@ -556,7 +556,7 @@ public void BitsAllClear_with_bitwise_operators() "{'C.E.F': { $bitsAllClear: 20 } }"); } - [SkippableFact] + [Fact] public void BitsAllSet_with_bitwise_operators() { RequireServer.Check(); @@ -567,7 +567,7 @@ public void BitsAllSet_with_bitwise_operators() "{'C.E.F': { $bitsAllSet: 7 } }"); } - [SkippableFact] + [Fact] public void BitsAllSet_with_HasFlag() { RequireServer.Check(); @@ -578,7 +578,7 @@ public void BitsAllSet_with_HasFlag() "{Q: { $bitsAllSet: 1 } }"); } - [SkippableFact] + [Fact] public void BitsAnyClear_with_bitwise_operators() { RequireServer.Check(); @@ -589,7 +589,7 @@ public void BitsAnyClear_with_bitwise_operators() "{'C.E.F': { $bitsAnyClear: 7 } }"); } - [SkippableFact] + [Fact] public void BitsAnySet_with_bitwise_operators() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/MongoQueryableTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/MongoQueryableTests.cs index 054d5df1405..a8ca9fecff6 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/MongoQueryableTests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/MongoQueryableTests.cs @@ -189,7 +189,7 @@ public async Task CountAsync_with_no_matches() result.Should().Be(0); } - [SkippableFact] + [Fact] public void Distinct_document_followed_by_where() { RequireServer.Check(); @@ -204,7 +204,7 @@ public void Distinct_document_followed_by_where() "{ $match: { A: 'Awesome' } }"); } - [SkippableFact] + [Fact] public void Distinct_document_preceded_by_select_where() { RequireServer.Check(); @@ -221,7 +221,7 @@ public void Distinct_document_preceded_by_select_where() "{ $replaceRoot : { newRoot : '$_id' } }"); } - [SkippableFact] + [Fact] public void Distinct_document_preceded_by_where_select() { RequireServer.Check(); @@ -238,7 +238,7 @@ public void Distinct_document_preceded_by_where_select() "{ $replaceRoot : { newRoot : '$_id' } }"); } - [SkippableFact] + [Fact] public void Distinct_field_preceded_by_where_select() { RequireServer.Check(); @@ -255,7 +255,7 @@ public void Distinct_field_preceded_by_where_select() "{ $replaceRoot : { newRoot : '$_id' } }"); } - [SkippableFact] + [Fact] public void Distinct_field_preceded_by_select_where() { RequireServer.Check(); @@ -549,7 +549,7 @@ public void GroupBy_with_resultSelector_anonymous_type_method2() "{ $project : { Key : '$_id', FirstB : '$__agg0', _id : 0 } }"); } - [SkippableFact] + [Fact] public void GroupJoin_method() { RequireServer.Check(); @@ -567,7 +567,7 @@ public void GroupJoin_method() "{ $project : { p : '$_outer', o : '$_inner', _id : 0 } }"); } - [SkippableFact] + [Fact] public void GroupJoinForeignField_method() { RequireServer.Check(); @@ -585,7 +585,7 @@ public void GroupJoinForeignField_method() "{ $project : { p : '$_outer', o : '$_inner', _id : 0 } }"); } - [SkippableFact] + [Fact] public void GroupJoin_syntax() { RequireServer.Check(); @@ -600,7 +600,7 @@ join o in CreateOtherQuery() on p.Id equals o.Id into joined "{ $project : { A : '$_outer.A', SumCEF : { $sum : '$_inner.CEF' }, _id : 0 } }"); } - [SkippableFact] + [Fact] public void GroupJoin_syntax_with_a_transparent_identifier() { RequireServer.Check(); @@ -618,7 +618,7 @@ orderby p.B "{ $project : { A : '$p.A', Joined : '$joined', _id : 0 } }"); } - [SkippableFact] + [Fact] public void GroupJoin_syntax_with_select_many() { RequireServer.Check(); @@ -637,7 +637,7 @@ from subo in joined "{ $unwind : '$_v' }"); } - [SkippableFact] + [Fact] public void GroupJoin_syntax_with_select_many_and_DefaultIfEmpty() { RequireServer.Check(); @@ -656,7 +656,7 @@ join o in otherCollection on p.Id equals o.Id into joined "{ $unwind : '$_v' }"); } - [SkippableFact] + [Fact] public void Join_method() { RequireServer.Check(); @@ -675,7 +675,7 @@ public void Join_method() "{ $project : { p : '$_outer', o : '$_inner', _id : 0 } }"); } - [SkippableFact] + [Fact] public void JoinForeignField_method() { RequireServer.Check(); @@ -694,7 +694,7 @@ public void JoinForeignField_method() "{ $project : { p : '$_outer', o : '$_inner', _id : 0 } }"); } - [SkippableFact] + [Fact] public void Join_syntax() { RequireServer.Check(); @@ -710,7 +710,7 @@ join o in CreateOtherQuery() on p.Id equals o.Id "{ $project : { A : '$_outer.A', CEF : '$_inner.CEF', _id : 0 } }"); } - [SkippableFact] + [Fact] public void Join_syntax_with_a_transparent_identifier() { RequireServer.Check(); @@ -961,7 +961,7 @@ public void OrderBy_ThenBy_ThenByDescending_with_redundant_fields_in_different_d act.ShouldThrow(); } - [SkippableFact] + [Fact] public void Sample() { RequireServer.Check(); @@ -972,7 +972,7 @@ public void Sample() "{ $sample: { size: 100 } }"); } - [SkippableFact] + [Fact] public void Sample_after_another_function() { RequireServer.Check(); @@ -1032,7 +1032,7 @@ public void Select_method_computed_scalar_followed_by_where() "{ $match : { _v : 'Awesome Balloon' } }"); } - [SkippableFact] + [Fact] public void Select_method_with_predicated_any() { RequireServer.Check(); @@ -1154,7 +1154,7 @@ public void Select_syntax_array() "{ $project : { _v : '$M', _id : 0 } }"); } - [SkippableFact] + [Fact] public void Select_method_array_index() { RequireServer.Check(); @@ -1165,7 +1165,7 @@ public void Select_method_array_index() "{ $project : { _v : { $arrayElemAt : ['$M', 0] }, _id : 0 } }"); } - [SkippableFact] + [Fact] public void Select_syntax_array_index() { RequireServer.Check(); @@ -1177,7 +1177,7 @@ public void Select_syntax_array_index() "{ $project : { _v : { $arrayElemAt : ['$M', 0] }, _id : 0 } }"); } - [SkippableFact] + [Fact] public void Select_method_embedded_pipeline() { RequireServer.Check(); @@ -1188,7 +1188,7 @@ public void Select_method_embedded_pipeline() "{ $project : { _v : { $arrayElemAt : ['$M', 0] }, _id : 0 } }"); } - [SkippableFact] + [Fact] public void Select_method_computed_array() { RequireServer.Check(); @@ -1200,7 +1200,7 @@ public void Select_method_computed_array() "{ $project : { _v : { $map : { input : '$M', as : 'i', in : { $add : ['$$i', 1] } } }, _id : 0 } }"); } - [SkippableFact] + [Fact] public void Select_syntax_computed_array() { RequireServer.Check(); @@ -1645,7 +1645,7 @@ public void Skip() "{ $skip: 10 }"); } - [SkippableFact] + [Fact] public void StandardDeviationPopulation() { RequireServer.Check(); @@ -1655,7 +1655,7 @@ public void StandardDeviationPopulation() result.Should().Be(50); } - [SkippableFact] + [Fact] public void StandardDeviationPopulation_with_selector() { RequireServer.Check(); @@ -1665,7 +1665,7 @@ public void StandardDeviationPopulation_with_selector() result.Should().Be(50); } - [SkippableFact] + [Fact] public async Task StandardDeviationPopulationAsync() { RequireServer.Check(); @@ -1675,7 +1675,7 @@ public async Task StandardDeviationPopulationAsync() result.Should().Be(50); } - [SkippableFact] + [Fact] public async Task StandardDeviationPopulationAsync_with_selector() { RequireServer.Check(); @@ -1685,7 +1685,7 @@ public async Task StandardDeviationPopulationAsync_with_selector() result.Should().Be(50); } - [SkippableFact] + [Fact] public void StandardDeviationSample() { RequireServer.Check(); @@ -1695,7 +1695,7 @@ public void StandardDeviationSample() result.Should().BeApproximately(70.7106781186548, .0001); } - [SkippableFact] + [Fact] public void StandardDeviationSample_with_selector() { RequireServer.Check(); @@ -1705,7 +1705,7 @@ public void StandardDeviationSample_with_selector() result.Should().BeApproximately(70.7106781186548, .0001); } - [SkippableFact] + [Fact] public async Task StandardDeviationSampleAsync() { RequireServer.Check(); @@ -1715,7 +1715,7 @@ public async Task StandardDeviationSampleAsync() result.Should().BeApproximately(70.7106781186548, .0001); } - [SkippableFact] + [Fact] public async Task StandardDeviationSampleAsync_with_selector() { RequireServer.Check(); @@ -1818,7 +1818,7 @@ public void Where_method_with_predicated_any() "{ $match : { 'G' : { '$elemMatch' : { 'D' : \"Don't\" } } } }"); } - [SkippableFact] + [Fact] public void AsQueryable_in_transaction() { RequireServer.Check().ClusterTypes(ClusterType.ReplicaSet, ClusterType.Sharded).Supports(Feature.Transactions); diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/Translators/AggregateGroupTranslatorTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/Translators/AggregateGroupTranslatorTests.cs index 1d2734c74fa..891be65801b 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/Translators/AggregateGroupTranslatorTests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/Translators/AggregateGroupTranslatorTests.cs @@ -387,7 +387,7 @@ public void Should_translate_push_with_ToList() result.Value.Result.Should().Equal(111); } - [SkippableFact] + [Fact] public void Should_translate_stdDevPop_with_embedded_projector() { RequireServer.Check(); @@ -402,7 +402,7 @@ public void Should_translate_stdDevPop_with_embedded_projector() result.Value.Result.Should().Be(50); } - [SkippableFact] + [Fact] public void Should_translate_stdDevPop_with_selected_projector() { RequireServer.Check(); @@ -417,7 +417,7 @@ public void Should_translate_stdDevPop_with_selected_projector() result.Value.Result.Should().Be(50); } - [SkippableFact] + [Fact] public void Should_translate_stdDevSamp_with_embedded_projector() { RequireServer.Check(); @@ -432,7 +432,7 @@ public void Should_translate_stdDevSamp_with_embedded_projector() result.Value.Result.Should().BeApproximately(70.7106781156545, .0001); } - [SkippableFact] + [Fact] public void Should_translate_stdDevSamp_with_selected_projector() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/Translators/AggregateProjectTranslatorTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/Translators/AggregateProjectTranslatorTests.cs index 5a3e43ddd72..197cd04eac2 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/Translators/AggregateProjectTranslatorTests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/Translators/AggregateProjectTranslatorTests.cs @@ -58,7 +58,7 @@ public void Should_translate_using_non_anonymous_type_with_parameterized_constru result.Value.Field.Should().Be("Balloon"); } - [SkippableFact] + [Fact] public void Should_translate_abs() { RequireServer.Check(); @@ -89,7 +89,7 @@ public void Should_translate_add_flattened() result.Value.Result.Should().Be(43); } - [SkippableFact] + [Fact] public void Should_translate_allElementsTrue() { RequireServer.Check(); @@ -101,7 +101,7 @@ public void Should_translate_allElementsTrue() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_anyElementTrue() { RequireServer.Check(); @@ -113,7 +113,7 @@ public void Should_translate_anyElementTrue() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_anyElementTrue_with_predicate() { RequireServer.Check(); @@ -125,7 +125,7 @@ public void Should_translate_anyElementTrue_with_predicate() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_anyElementTrue_using_Contains() { RequireServer.Check(); @@ -137,7 +137,7 @@ public void Should_translate_anyElementTrue_using_Contains() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_anyElementTrue_using_Contains_on_a_local_collection() { RequireServer.Check(); @@ -170,7 +170,7 @@ public void Should_translate_and_flattened() result.Value.Result.Should().BeFalse(); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_constant_ElementAt() { RequireServer.Check(); @@ -182,7 +182,7 @@ public void Should_translate_arrayElemAt_using_a_constant_ElementAt() result.Value.Result.Should().Be(4); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_constant_indexer() { RequireServer.Check(); @@ -194,7 +194,7 @@ public void Should_translate_arrayElemAt_using_a_constant_indexer() result.Value.Result.Should().Be(4); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_constant_get_Item() { RequireServer.Check(); @@ -206,7 +206,7 @@ public void Should_translate_arrayElemAt_using_a_constant_get_Item() result.Value.Result.Should().Be(20); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_variable_ElementAt() { RequireServer.Check(); @@ -218,7 +218,7 @@ public void Should_translate_arrayElemAt_using_a_variable_ElementAt() result.Value.Result.Should().Be(4); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_variable_indexer() { RequireServer.Check(); @@ -230,7 +230,7 @@ public void Should_translate_arrayElemAt_using_a_variable_indexer() result.Value.Result.Should().Be(4); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_variable_get_Item() { RequireServer.Check(); @@ -242,7 +242,7 @@ public void Should_translate_arrayElemAt_using_a_variable_get_Item() result.Value.Result.Should().Be(20); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_constant_ElementAt_followed_by_a_field() { RequireServer.Check(); @@ -254,7 +254,7 @@ public void Should_translate_arrayElemAt_using_a_constant_ElementAt_followed_by_ result.Value.Result.Should().Be("Dolphin"); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_a_variable_ElementAt_followed_by_a_field() { RequireServer.Check(); @@ -266,7 +266,7 @@ public void Should_translate_arrayElemAt_using_a_variable_ElementAt_followed_by_ result.Value.Result.Should().Be("Dolphin"); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_First() { RequireServer.Check(); @@ -278,7 +278,7 @@ public void Should_translate_arrayElemAt_using_First() result.Value.Result.Should().Be(2); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_First_followed_by_a_field() { RequireServer.Check(); @@ -290,7 +290,7 @@ public void Should_translate_arrayElemAt_using_First_followed_by_a_field() result.Value.Result.Should().Be("Don't"); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_Last() { RequireServer.Check(); @@ -302,7 +302,7 @@ public void Should_translate_arrayElemAt_using_Last() result.Value.Result.Should().Be(5); } - [SkippableFact] + [Fact] public void Should_translate_arrayElemAt_using_Last_followed_by_a_field() { RequireServer.Check(); @@ -314,7 +314,7 @@ public void Should_translate_arrayElemAt_using_Last_followed_by_a_field() result.Value.Result.Should().Be("Dolphin"); } - [SkippableFact] + [Fact] public void Should_translate_avg() { RequireServer.Check(); @@ -326,7 +326,7 @@ public void Should_translate_avg() result.Value.Result.Should().BeApproximately(3.66666667, .0001); } - [SkippableFact] + [Fact] public void Should_translate_avg_with_selector() { RequireServer.Check(); @@ -338,7 +338,7 @@ public void Should_translate_avg_with_selector() result.Value.Result.Should().Be(44); } - [SkippableFact] + [Fact] public void Should_translate_boolToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -350,7 +350,7 @@ public void Should_translate_boolToString() result.Value.Result.Should().Be("true"); } - [SkippableFact] + [Fact] public void Should_translate_ceil() { RequireServer.Check(); @@ -382,7 +382,7 @@ public void Should_translate_compare() result.Value.Result.Should().Be(0); } - [SkippableFact] + [Fact] public void Should_translate_concat() { RequireServer.Check(); @@ -394,7 +394,7 @@ public void Should_translate_concat() result.Value.Result.Should().Be("AwesomeBalloon"); } - [SkippableFact] + [Fact] public void Should_translate_concat_flattened() { RequireServer.Check(); @@ -406,7 +406,7 @@ public void Should_translate_concat_flattened() result.Value.Result.Should().Be("Awesome Balloon"); } - [SkippableFact] + [Fact] public void Should_translate_concatArrays() { RequireServer.Check(); @@ -428,7 +428,7 @@ public void Should_translate_condition() result.Value.Result.Should().Be("b"); } - [SkippableFact] + [Fact] public void Should_translate_dateTimeToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -440,7 +440,7 @@ public void Should_translate_dateTimeToString() result.Value.Result.Should().Be("2012-12-01T13:14:15.016Z"); } - [SkippableFact] + [Fact] public void Should_translate_dateToString() { RequireServer.Check(); @@ -482,7 +482,7 @@ public void Should_translate_day_of_year() result.Value.Result.Should().Be(336); } - [SkippableFact] + [Fact] public void Should_translate_decimalToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -514,7 +514,7 @@ public void Should_translate_divide_3_numbers() result.Value.Result.Should().BeApproximately(0.04, .01); } - [SkippableFact] + [Fact] public void Should_translate_doubleToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -546,7 +546,7 @@ public void Should_translate_equals_as_a_method_call() result.Value.Result.Should().BeFalse(); } - [SkippableFact] + [Fact] public void Should_translate_exp() { RequireServer.Check(); @@ -558,7 +558,7 @@ public void Should_translate_exp() result.Value.Result.Should().BeApproximately(59874.1417151978, .0001); } - [SkippableFact] + [Fact] public void Should_translate_floor() { RequireServer.Check(); @@ -600,7 +600,7 @@ public void Should_translate_hour() result.Value.Result.Should().Be(13); } - [SkippableFact] + [Fact] public void Should_translate_indexOfBytes() { RequireServer.Check(); @@ -618,7 +618,7 @@ public void Should_translate_indexOfBytes() result.Value.Result.Should().Be(-1); } - [SkippableFact] + [Fact] public void Should_translate_indexOfCP() { RequireServer.Check(); @@ -648,7 +648,7 @@ public void Should_translate_indexOfCP() result.Value.Result.Should().Be(-1); } - [SkippableFact] + [Fact] public void Should_translate_intToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -680,7 +680,7 @@ public void Should_translate_less_than_or_equal() result.Value.Result.Should().BeFalse(); } - [SkippableFact] + [Fact] public void Should_translate_literal_when_a_constant_strings_begins_with_a_dollar() { RequireServer.Check(); @@ -692,7 +692,7 @@ public void Should_translate_literal_when_a_constant_strings_begins_with_a_dolla result.Value.Result.Should().BeFalse(); } - [SkippableFact] + [Fact] public void Should_translate_ln() { RequireServer.Check(); @@ -704,7 +704,7 @@ public void Should_translate_ln() result.Value.Result.Should().BeApproximately(2.39789527279837, .0001); } - [SkippableFact] + [Fact] public void Should_translate_log() { RequireServer.Check(); @@ -716,7 +716,7 @@ public void Should_translate_log() result.Value.Result.Should().Be(1); } - [SkippableFact] + [Fact] public void Should_translate_log10() { RequireServer.Check(); @@ -728,7 +728,7 @@ public void Should_translate_log10() result.Value.Result.Should().BeApproximately(1.0413928515823, .0001); } - [SkippableFact] + [Fact] public void Should_translate_longToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -740,7 +740,7 @@ public void Should_translate_longToString() result.Value.Result.Should().Be("9"); } - [SkippableFact] + [Fact] public void Should_translate_map_with_document() { RequireServer.Check(); @@ -752,7 +752,7 @@ public void Should_translate_map_with_document() result.Value.Result.Should().Equal("Don't0", "Dolphin0"); } - [SkippableFact] + [Fact] public void Should_translate_map_with_value() { RequireServer.Check(); @@ -764,7 +764,7 @@ public void Should_translate_map_with_value() result.Value.Result.Should().Equal("it0", "icky0"); } - [SkippableFact] + [Fact] public void Should_translate_max() { RequireServer.Check(); @@ -776,7 +776,7 @@ public void Should_translate_max() result.Value.Result.Should().Be(5); } - [SkippableFact] + [Fact] public void Should_translate_max_with_selector() { RequireServer.Check(); @@ -788,7 +788,7 @@ public void Should_translate_max_with_selector() result.Value.Result.Should().Be(55); } - [SkippableFact] + [Fact] public void Should_translate_millisecond() { RequireServer.Check(); @@ -800,7 +800,7 @@ public void Should_translate_millisecond() result.Value.Result.Should().Be(16); } - [SkippableFact] + [Fact] public void Should_translate_min() { RequireServer.Check(); @@ -812,7 +812,7 @@ public void Should_translate_min() result.Value.Result.Should().Be(2); } - [SkippableFact] + [Fact] public void Should_translate_min_with_selector() { RequireServer.Check(); @@ -874,7 +874,7 @@ public void Should_translate_multiply_flattened() result.Value.Result.Should().Be(2420); } - [SkippableFact] + [Fact] public void Should_translate_new_DateTime() { RequireServer.Check(); @@ -922,7 +922,7 @@ public void Should_translate_not_equals() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_objectIdToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -954,7 +954,7 @@ public void Should_translate_or_flattened() result.Value.Result.Should().BeFalse(); } - [SkippableFact] + [Fact] public void Should_translate_DateTime_parse() { RequireServer.Check(); @@ -966,7 +966,7 @@ public void Should_translate_DateTime_parse() result.Value.Result.Should().Be(new DateTime(2017, 2, 8, 12, 10, 40, 787, DateTimeKind.Utc)); } - [SkippableFact] + [Fact] public void Should_translate_pow() { RequireServer.Check(); @@ -978,7 +978,7 @@ public void Should_translate_pow() result.Value.Result.Should().Be(161051); } - [SkippableFact] + [Fact] public void Should_translate_range() { RequireServer.Check(); @@ -990,7 +990,7 @@ public void Should_translate_range() result.Value.Result.Should().BeEquivalentTo(11, 12, 13); } - [SkippableFact] + [Fact] public void Should_translate_reduce() { RequireServer.Check(); @@ -1111,7 +1111,7 @@ public void Should_translate_reduce() typeResult.Value.Result.y.Should().Be(5); } - [SkippableFact] + [Fact] public void Should_translate_reverse() { RequireServer.Check(); @@ -1133,7 +1133,7 @@ public void Should_translate_second() result.Value.Result.Should().Be(15); } - [SkippableFact] + [Fact] public void Should_translate_size_greater_than_zero_from_any() { RequireServer.Check(); @@ -1145,7 +1145,7 @@ public void Should_translate_size_greater_than_zero_from_any() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_size_from_an_array() { RequireServer.Check(); @@ -1157,7 +1157,7 @@ public void Should_translate_size_from_an_array() result.Value.Result.Should().Be(3); } - [SkippableFact] + [Fact] public void Should_translate_size_from_Count_extension_method() { RequireServer.Check(); @@ -1169,7 +1169,7 @@ public void Should_translate_size_from_Count_extension_method() result.Value.Result.Should().Be(3); } - [SkippableFact] + [Fact] public void Should_translate_size_from_LongCount_extension_method() { RequireServer.Check(); @@ -1181,7 +1181,7 @@ public void Should_translate_size_from_LongCount_extension_method() result.Value.Result.Should().Be(3); } - [SkippableFact] + [Fact] public void Should_translate_size_from_Count_property_on_Generic_ICollection() { RequireServer.Check(); @@ -1193,7 +1193,7 @@ public void Should_translate_size_from_Count_property_on_Generic_ICollection() result.Value.Result.Should().Be(3); } - [SkippableFact] + [Fact] public void Should_translate_set_difference() { RequireServer.Check(); @@ -1205,7 +1205,7 @@ public void Should_translate_set_difference() result.Value.Result.Should().Equal("icky"); } - [SkippableFact] + [Fact] public void Should_translate_set_difference_reversed() { RequireServer.Check(); @@ -1217,7 +1217,7 @@ public void Should_translate_set_difference_reversed() result.Value.Result.Should().Equal("not in here"); } - [SkippableFact] + [Fact] public void Should_translate_set_equals() { RequireServer.Check(); @@ -1229,7 +1229,7 @@ public void Should_translate_set_equals() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_set_equals_reversed() { RequireServer.Check(); @@ -1242,7 +1242,7 @@ public void Should_translate_set_equals_reversed() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_set_intersection() { RequireServer.Check(); @@ -1254,7 +1254,7 @@ public void Should_translate_set_intersection() result.Value.Result.Should().Equal("it"); } - [SkippableFact] + [Fact] public void Should_translate_set_intersection_reversed() { RequireServer.Check(); @@ -1266,7 +1266,7 @@ public void Should_translate_set_intersection_reversed() result.Value.Result.Should().Equal("it"); } - [SkippableFact] + [Fact] public void Should_translate_set_is_subset() { RequireServer.Check(); @@ -1278,7 +1278,7 @@ public void Should_translate_set_is_subset() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_set_is_subset_reversed() { RequireServer.Check(); @@ -1291,7 +1291,7 @@ public void Should_translate_set_is_subset_reversed() result.Value.Result.Should().BeTrue(); } - [SkippableFact] + [Fact] public void Should_translate_set_union() { RequireServer.Check(); @@ -1303,7 +1303,7 @@ public void Should_translate_set_union() result.Value.Result.Should().BeEquivalentTo("it", "icky", "not in here"); } - [SkippableFact] + [Fact] public void Should_translate_set_union_reversed() { RequireServer.Check(); @@ -1315,7 +1315,7 @@ public void Should_translate_set_union_reversed() result.Value.Result.Should().BeEquivalentTo("it", "icky", "not in here"); } - [SkippableFact] + [Fact] public void Should_translate_sqrt() { RequireServer.Check(); @@ -1327,7 +1327,7 @@ public void Should_translate_sqrt() result.Value.Result.Should().BeApproximately(3.31662479, .0001); } - [SkippableFact] + [Fact] public void Should_translate_stringToString() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -1339,7 +1339,7 @@ public void Should_translate_stringToString() result.Value.Result.Should().Be("Awesome"); } - [SkippableFact] + [Fact] public void Should_translate_trunc() { RequireServer.Check(); @@ -1351,7 +1351,7 @@ public void Should_translate_trunc() result.Value.Result.Should().Be(1); } - [SkippableFact] + [Fact] public void Should_translate_where_to_filter() { RequireServer.Check(); @@ -1364,7 +1364,7 @@ public void Should_translate_where_to_filter() result.Value.Result.Single().D.Should().Be("Don't"); } - [SkippableFact] + [Fact] public void Should_translate_where_then_select_to_filter_then_map() { RequireServer.Check(); @@ -1377,7 +1377,7 @@ public void Should_translate_where_then_select_to_filter_then_map() result.Value.Result.Single().Should().Be("Don't"); } - [SkippableFact] + [Fact] public void Should_translate_select_then_where_to_map_then_filter() { RequireServer.Check(); @@ -1390,7 +1390,7 @@ public void Should_translate_select_then_where_to_map_then_filter() result.Value.Result.Single().Should().Be("Don't"); } - [SkippableFact] + [Fact] public void Should_translate_select_with_an_anonymous_type_then_where_to_map_then_filter() { RequireServer.Check(); @@ -1404,7 +1404,7 @@ public void Should_translate_select_with_an_anonymous_type_then_where_to_map_the result.Value.Result.Single().F.Should().Be(33); } - [SkippableFact] + [Fact] public void Should_translate_strLenBytes() { RequireServer.Check(); @@ -1416,7 +1416,7 @@ public void Should_translate_strLenBytes() result.Value.Result.Should().Be(7); } - [SkippableFact] + [Fact] public void Should_translate_strLenCP() { RequireServer.Check(); @@ -1428,7 +1428,7 @@ public void Should_translate_strLenCP() result.Value.Result.Should().Be(7); } - [SkippableFact] + [Fact] public void Should_translate_split() { RequireServer.Check(); @@ -1454,7 +1454,7 @@ public void Should_translate_split() result4.Value.Result.Should().BeEquivalentTo("Aw", "ome"); } - [SkippableFact] + [Fact] public void Should_translate_stdDevPop() { RequireServer.Check(); @@ -1466,7 +1466,7 @@ public void Should_translate_stdDevPop() result.Value.Result.Should().BeApproximately(1.247219128924647, .0001); } - [SkippableFact] + [Fact] public void Should_translate_stdDevPop_with_selector() { RequireServer.Check(); @@ -1478,7 +1478,7 @@ public void Should_translate_stdDevPop_with_selector() result.Value.Result.Should().Be(11); } - [SkippableFact] + [Fact] public void Should_translate_stdDevSamp() { RequireServer.Check(); @@ -1490,7 +1490,7 @@ public void Should_translate_stdDevSamp() result.Value.Result.Should().BeApproximately(1.5275252316519468, .0001); } - [SkippableFact] + [Fact] public void Should_translate_stdDevSamp_with_selector() { RequireServer.Check(); @@ -1562,7 +1562,7 @@ public void Should_translate_substr() result.Value.Result.Should().Be("loon"); } - [SkippableFact] + [Fact] public void Should_translate_substrBytes() { RequireServer.Check(); @@ -1594,7 +1594,7 @@ public void Should_translate_subtract_3_numbers() result.Value.Result.Should().Be(-23); } - [SkippableFact] + [Fact] public void Should_translate_slice_with_2_arguments() { RequireServer.Check(); @@ -1606,7 +1606,7 @@ public void Should_translate_slice_with_2_arguments() result.Value.Result.Should().BeEquivalentTo(2, 4); } - [SkippableFact] + [Fact] public void Should_translate_slice_with_3_arguments() { RequireServer.Check(); @@ -1618,7 +1618,7 @@ public void Should_translate_slice_with_3_arguments() result.Value.Result.Should().BeEquivalentTo(4, 5); } - [SkippableFact] + [Fact] public void Should_translate_sum() { RequireServer.Check(); @@ -1630,7 +1630,7 @@ public void Should_translate_sum() result.Value.Result.Should().Be(11); } - [SkippableFact] + [Fact] public void Should_translate_sum_with_selector() { RequireServer.Check(); @@ -1692,7 +1692,7 @@ public void Should_translate_year() result.Value.Result.Should().Be(2012); } - [SkippableFact] + [Fact] public void Should_translate_zip_with_operation() { RequireServer.Check(); @@ -1704,7 +1704,7 @@ public void Should_translate_zip_with_operation() result.Value.Result.Should().BeEquivalentTo(12L, 24L, 35L); } - [SkippableFact] + [Fact] public void Should_translate_zip_with_anonymous_type() { RequireServer.Check(); @@ -1741,7 +1741,7 @@ public void Should_translate_a_derived_class_projection() result.Value.DerivedProperty.Should().Be("Balloon"); } - [SkippableFact] + [Fact] public void Should_translate_array_projection_complex() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/Translators/PredicateTranslatorTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/Translators/PredicateTranslatorTests.cs index e77c83ccb84..9df49eb2bd7 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/Translators/PredicateTranslatorTests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq2ImplementationTestsOnLinq3/Translators/PredicateTranslatorTests.cs @@ -479,7 +479,7 @@ public void Any_with_a_predicate_on_scalars_legacy() "{ M : { $elemMatch : { $gt : 2, $lt : 6 } } }"); } - [SkippableFact] + [Fact] public void Any_with_a_predicate_on_scalars() { RequireServer.Check(); @@ -551,7 +551,7 @@ public void AsQueryable() exception.Should().BeOfType(); } - [SkippableFact] + [Fact] public void BitsAllClear_with_bitwise_operators() { RequireServer.Check(); @@ -562,7 +562,7 @@ public void BitsAllClear_with_bitwise_operators() "{'C.E.F': { $bitsAllClear: 20 } }"); } - [SkippableFact] + [Fact] public void BitsAllSet_with_bitwise_operators() { RequireServer.Check(); @@ -573,7 +573,7 @@ public void BitsAllSet_with_bitwise_operators() "{'C.E.F': { $bitsAllSet: 7 } }"); } - [SkippableFact] + [Fact] public void BitsAllSet_with_HasFlag() { RequireServer.Check(); @@ -584,7 +584,7 @@ public void BitsAllSet_with_HasFlag() "{Q: { $bitsAllSet: 1 } }"); } - [SkippableFact] + [Fact] public void BitsAnyClear_with_bitwise_operators() { RequireServer.Check(); @@ -595,7 +595,7 @@ public void BitsAnyClear_with_bitwise_operators() "{'C.E.F': { $bitsAnyClear: 7 } }"); } - [SkippableFact] + [Fact] public void BitsAnySet_with_bitwise_operators() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2422Tests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2422Tests.cs index 55d2953a783..0b0830f21a3 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2422Tests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2422Tests.cs @@ -16,7 +16,7 @@ using System; using System.Linq; using System.Linq.Expressions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Tests.Linq.Linq3ImplementationTests.Jira diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2471Tests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2471Tests.cs index eb5ff8b6733..955db82f8b8 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2471Tests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2471Tests.cs @@ -26,7 +26,7 @@ namespace MongoDB.Driver.Tests.Linq.Linq3ImplementationTests.Jira { public class CSharp2471Tests : Linq3IntegrationTest { - [SkippableTheory] + [Theory] [InlineData("$acos", 1.0, 0.0)] #if NETCOREAPP3_1_OR_GREATER [InlineData("$acosh", 1.0, 0.0)] @@ -88,7 +88,7 @@ public void Trig_method_should_work(string trigOperator, double x, double expect result.Should().Be(expectedResult); } - [SkippableFact] + [Fact] public void Atan2_should_work() { RequireServer.Check().Supports(Feature.TrigOperators); diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2472Tests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2472Tests.cs index e2e3aa43afd..469b9f301aa 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2472Tests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2472Tests.cs @@ -25,7 +25,7 @@ namespace MongoDB.Driver.Tests.Linq.Linq3ImplementationTests.Jira { public class CSharp2472Tests : Linq3IntegrationTest { - [SkippableFact] + [Fact] public void Numeric_casts_should_work() { RequireServer.Check().Supports(Feature.ToConversionOperators); diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2727Tests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2727Tests.cs index 4d44e3dc079..a86863f8a36 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2727Tests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp2727Tests.cs @@ -27,7 +27,7 @@ namespace MongoDB.Driver.Tests.Linq.Linq3ImplementationTests.Jira { public class CSharp2727Tests : Linq3IntegrationTest { - [SkippableFact] + [Fact] public void Find_with_predicate_on_Body_should_work() { RequireServer.Check().Supports(Feature.AggregateToString); @@ -64,7 +64,7 @@ public void Find_with_predicate_on_Caption_should_work() results.Select(x => x.Id).Should().Equal(1, 2); } - [SkippableFact] + [Fact] public void Where_with_predicate_on_Body_should_work() { RequireServer.Check().Supports(Feature.AggregateToString); diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp3136Tests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp3136Tests.cs index 1c8777585bc..bb392e08c06 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp3136Tests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp3136Tests.cs @@ -26,7 +26,7 @@ namespace MongoDB.Driver.Tests.Linq.Linq3ImplementationTests.Jira public class CSharp3136Tests : Linq3IntegrationTest { - [SkippableFact] + [Fact] public void DateTime_ToString_with_no_arguments_should_work() { RequireServer.Check().Supports(Feature.ToConversionOperators); @@ -68,7 +68,7 @@ public void DateTime_ToString_with_format_should_work() results.Should().Equal("03:04:05", "03:04:05"); } - [SkippableTheory] + [Theory] [InlineData(null, null, "{ $project : { _v : { $dateToString : { date : '$D' } }, _id : 0 } }", new[] { "2021-01-02T03:04:05.123Z", "2021-01-02T03:04:05.123Z" })] [InlineData("%H:%M:%S", null, "{ $project : { _v : { $dateToString : { date : '$D', format : '%H:%M:%S' } }, _id : 0 } }", new[] { "03:04:05", "03:04:05" })] [InlineData(null, "-04:00", "{ $project : { _v : { $dateToString : { date : '$D', timezone : '-04:00' } }, _id : 0 } }", new[] { "2021-01-01T23:04:05.123Z", "2021-01-01T23:04:05.123Z" })] @@ -97,7 +97,7 @@ public void DateTime_ToString_with_format_and_timezone_constants_should_work(str results.Should().Equal(expectedResults); } - [SkippableTheory] + [Theory] [InlineData(false, false, "{ $project : { _v : { $dateToString : { date : '$D' } }, _id : 0 } }", new[] { "2021-01-02T03:04:05.123Z", "2021-01-02T03:04:05.123Z" })] [InlineData(true, false, "{ $project : { _v : { $dateToString : { date : '$D', format : '$Format' } }, _id : 0 } }", new[] { "03:04:05", "03:04:05" })] [InlineData(false, true, "{ $project : { _v : { $dateToString : { date : '$D', timezone : '$Timezone' } }, _id : 0 } }", new[] { "2021-01-01T23:04:05.123Z", "2021-01-01T23:04:05.123Z" })] @@ -131,7 +131,7 @@ public void DateTime_ToString_with_format_and_timezone_expressions_should_work(b results.Should().Equal(expectedResults); } - [SkippableFact] + [Fact] public void NullableDateTime_ToString_with_no_arguments_should_work() { RequireServer.Check().Supports(Feature.ToConversionOperators); @@ -153,7 +153,7 @@ public void NullableDateTime_ToString_with_no_arguments_should_work() results.Should().Equal("2021-01-02T03:04:05.123Z", null); } - [SkippableTheory] + [Theory] [InlineData(null, null, null, "{ $project : { _v : { $dateToString : { date : '$N' } }, _id : 0 } }", new[] { "2021-01-02T03:04:05.123Z", null })] [InlineData(null, null, "xx", "{ $project : { _v : { $dateToString : { date : '$N', onNull : 'xx' } }, _id : 0 } }", new[] { "2021-01-02T03:04:05.123Z", "xx" })] [InlineData("%H:%M:%S", null, null, "{ $project : { _v : { $dateToString : { date : '$N', format : '%H:%M:%S' } }, _id : 0 } }", new[] { "03:04:05", null })] @@ -186,7 +186,7 @@ public void NullableDateTime_ToString_with_format_and_timezone_and_onNull_consta results.Should().Equal(expectedResults); } - [SkippableTheory] + [Theory] [InlineData(false, false, false, "{ $project : { _v : { $dateToString : { date : '$N' } }, _id : 0 } }", new[] { "2021-01-02T03:04:05.123Z", null })] [InlineData(false, false, true, "{ $project : { _v : { $dateToString : { date : '$N', onNull : '$OnNull' } }, _id : 0 } }", new[] { "2021-01-02T03:04:05.123Z", "missing" })] [InlineData(false, true, false, "{ $project : { _v : { $dateToString : { date : '$N', timezone : '$Timezone' } }, _id : 0 } }", new[] { "2021-01-01T23:04:05.123Z", null })] diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp3933Tests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp3933Tests.cs index ab279de2f1c..422fc3f4f3b 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp3933Tests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp3933Tests.cs @@ -18,7 +18,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Linq; using MongoDB.Driver.Linq.Linq3Implementation.Serializers; using Xunit; diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4079Tests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4079Tests.cs index 5a7a29df111..babd22cbe2e 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4079Tests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4079Tests.cs @@ -17,7 +17,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.Serialization; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Linq; using Xunit; diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4220Tests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4220Tests.cs index 197a42897a5..54592dd93e6 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4220Tests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4220Tests.cs @@ -20,7 +20,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using Xunit; diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4234Tests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4234Tests.cs index 02c635a983f..2ad1802e53b 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4234Tests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4234Tests.cs @@ -16,7 +16,7 @@ using System.Linq; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Linq; using Xunit; diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4244Tests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4244Tests.cs index 6b43ddee881..86bbb1c5f48 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4244Tests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationTests/Jira/CSharp4244Tests.cs @@ -23,7 +23,7 @@ namespace MongoDB.Driver.Tests.Linq.Linq3ImplementationTests.Jira { public class CSharp4244Tests : Linq3IntegrationTest { - [SkippableFact] + [Fact] public void Where_with_root_should_work() { RequireServer.Check().VersionGreaterThanOrEqualTo("6.0"); diff --git a/tests/MongoDB.Driver.Tests/ListDatabasesTests.cs b/tests/MongoDB.Driver.Tests/ListDatabasesTests.cs index de1418c0da0..b4922954423 100644 --- a/tests/MongoDB.Driver.Tests/ListDatabasesTests.cs +++ b/tests/MongoDB.Driver.Tests/ListDatabasesTests.cs @@ -16,7 +16,7 @@ using System; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using Xunit; @@ -30,7 +30,7 @@ public class ListDatabasesTests private string _roleName = $"listDatabases{Guid.NewGuid()}"; private string _userName = $"authorizedDatabases{Guid.NewGuid()}"; - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Execute_should_return_the_expected_result_when_AuthorizedDatabases_is_used( [Values(null, false, true)] bool? authorizedDatabases) diff --git a/tests/MongoDB.Driver.Tests/MongoClientSettingsTests.cs b/tests/MongoDB.Driver.Tests/MongoClientSettingsTests.cs index 1a8fb031a5f..ed64f7d05ea 100644 --- a/tests/MongoDB.Driver.Tests/MongoClientSettingsTests.cs +++ b/tests/MongoDB.Driver.Tests/MongoClientSettingsTests.cs @@ -24,7 +24,7 @@ using Microsoft.Extensions.Logging; using MongoDB.Bson; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Compression; using MongoDB.Driver.Core.Configuration; @@ -1265,7 +1265,7 @@ public void TestServersWithSrvMaxHosts() settings.Servers.Should().HaveCount(2); } - [SkippableFact] + [Fact] public void TestSocketConfigurator() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/MongoClientTests.cs b/tests/MongoDB.Driver.Tests/MongoClientTests.cs index 2a943640a98..e20ade4d073 100644 --- a/tests/MongoDB.Driver.Tests/MongoClientTests.cs +++ b/tests/MongoDB.Driver.Tests/MongoClientTests.cs @@ -21,7 +21,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Clusters.ServerSelectors; diff --git a/tests/MongoDB.Driver.Tests/MongoCollectionImplTests.cs b/tests/MongoDB.Driver.Tests/MongoCollectionImplTests.cs index c3ceaba7e4b..d26bac52729 100644 --- a/tests/MongoDB.Driver.Tests/MongoCollectionImplTests.cs +++ b/tests/MongoDB.Driver.Tests/MongoCollectionImplTests.cs @@ -24,7 +24,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Connections; @@ -3721,7 +3721,7 @@ public void Watch_should_throw_when_pipeline_is_null( e.ParamName.Should().Be("pipeline"); } - [SkippableFact] + [Fact] public void Watch_should_support_full_document_with_duplicate_elements() { RequireServer.Check().ClusterTypes(ClusterType.ReplicaSet, ClusterType.Sharded); diff --git a/tests/MongoDB.Driver.Tests/MongoDBRefTests.cs b/tests/MongoDB.Driver.Tests/MongoDBRefTests.cs index 2d9753d4aee..04faef99397 100644 --- a/tests/MongoDB.Driver.Tests/MongoDBRefTests.cs +++ b/tests/MongoDB.Driver.Tests/MongoDBRefTests.cs @@ -19,7 +19,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Tests diff --git a/tests/MongoDB.Driver.Tests/MongoDatabaseImplTests.cs b/tests/MongoDB.Driver.Tests/MongoDatabaseImplTests.cs index 90710661ccf..b9cfbdba878 100644 --- a/tests/MongoDB.Driver.Tests/MongoDatabaseImplTests.cs +++ b/tests/MongoDB.Driver.Tests/MongoDatabaseImplTests.cs @@ -22,7 +22,7 @@ using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Misc; @@ -897,7 +897,7 @@ public void ListCollectionNames_should_execute_a_ListCollectionsOperation( op.RetryRequested.Should().BeTrue(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void ListCollectionNames_should_return_expected_result( [Values(0, 1, 2, 10)] int numberOfCollections, diff --git a/tests/MongoDB.Driver.Tests/MongoIndexManagerTests.cs b/tests/MongoDB.Driver.Tests/MongoIndexManagerTests.cs index 8b34b415117..ac5fbef4289 100644 --- a/tests/MongoDB.Driver.Tests/MongoIndexManagerTests.cs +++ b/tests/MongoDB.Driver.Tests/MongoIndexManagerTests.cs @@ -15,7 +15,7 @@ using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.Operations; using Xunit; diff --git a/tests/MongoDB.Driver.Tests/MongoUrlBuilderTests.cs b/tests/MongoDB.Driver.Tests/MongoUrlBuilderTests.cs index a44a8dededf..9b16920c6e7 100644 --- a/tests/MongoDB.Driver.Tests/MongoUrlBuilderTests.cs +++ b/tests/MongoDB.Driver.Tests/MongoUrlBuilderTests.cs @@ -19,7 +19,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Compression; using MongoDB.Driver.Core.Configuration; diff --git a/tests/MongoDB.Driver.Tests/MongoUrlTests.cs b/tests/MongoDB.Driver.Tests/MongoUrlTests.cs index 961daae3850..3f2c5759ba8 100644 --- a/tests/MongoDB.Driver.Tests/MongoUrlTests.cs +++ b/tests/MongoDB.Driver.Tests/MongoUrlTests.cs @@ -19,7 +19,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Compression; using MongoDB.Driver.Core.Configuration; diff --git a/tests/MongoDB.Driver.Tests/MongocryptdFactoryTests.cs b/tests/MongoDB.Driver.Tests/MongocryptdFactoryTests.cs index 885c7cbc579..5364e974b1c 100644 --- a/tests/MongoDB.Driver.Tests/MongocryptdFactoryTests.cs +++ b/tests/MongoDB.Driver.Tests/MongocryptdFactoryTests.cs @@ -63,7 +63,7 @@ public void ShouldMongocryptdBeSpawned_should_correctly_handle_bypassQueryAnalys shouldMongocryptdBeSpawned.Should().Be(shouldBeSpawned); } - [SkippableTheory] + [Theory] [InlineData("{ mongocryptdBypassSpawn : true }", null, null, false)] [InlineData(null, "mongocryptd#extension#", "--idleShutdownTimeoutSecs 60 --logpath #logpath# --logappend", true)] [InlineData("{ mongocryptdBypassSpawn : false }", "mongocryptd#extension#", "--idleShutdownTimeoutSecs 60 --logpath #logpath# --logappend", true)] diff --git a/tests/MongoDB.Driver.Tests/OcspIntegrationTests.cs b/tests/MongoDB.Driver.Tests/OcspIntegrationTests.cs index 9438b1b9f9e..9518f0c10f1 100644 --- a/tests/MongoDB.Driver.Tests/OcspIntegrationTests.cs +++ b/tests/MongoDB.Driver.Tests/OcspIntegrationTests.cs @@ -16,7 +16,7 @@ using System; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.TestHelpers.Logging; using MongoDB.Driver.TestHelpers; using Xunit; @@ -47,7 +47,7 @@ public OcspIntegrationTests(ITestOutputHelper testOutputHelper) * When testing on Windows, the certificate should be added to the trust store prior to each run in order to * reduce the chances of Windows pruning the certificate from the trust store prior to the test running. */ - [SkippableFact] + [Fact] public void MongoClientShouldRespectCertificateStatusAndTlsInsecure() { /* We cannot call RequireServer.Check() because this would result in a connection being made to the mongod diff --git a/tests/MongoDB.Driver.Tests/OfTypeMongoCollectionTests.cs b/tests/MongoDB.Driver.Tests/OfTypeMongoCollectionTests.cs index 6883067a401..725764b2a0f 100644 --- a/tests/MongoDB.Driver.Tests/OfTypeMongoCollectionTests.cs +++ b/tests/MongoDB.Driver.Tests/OfTypeMongoCollectionTests.cs @@ -22,7 +22,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Bindings; using MongoDB.Driver.Core.Events; @@ -1130,7 +1130,7 @@ public void ReplaceOne_should_match_document_of_right_type( }); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void UpdateOne_should_match_document_of_right_type( [Values(false, true)] bool upsert, diff --git a/tests/MongoDB.Driver.Tests/PasswordEvidenceTests.cs b/tests/MongoDB.Driver.Tests/PasswordEvidenceTests.cs index 1232fb7d9af..99ae74cea61 100644 --- a/tests/MongoDB.Driver.Tests/PasswordEvidenceTests.cs +++ b/tests/MongoDB.Driver.Tests/PasswordEvidenceTests.cs @@ -16,7 +16,7 @@ using System; using System.Security; using FluentAssertions; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; namespace MongoDB.Driver.Tests diff --git a/tests/MongoDB.Driver.Tests/PinnedShardRouterTests.cs b/tests/MongoDB.Driver.Tests/PinnedShardRouterTests.cs index 696f0953274..0395102d27b 100644 --- a/tests/MongoDB.Driver.Tests/PinnedShardRouterTests.cs +++ b/tests/MongoDB.Driver.Tests/PinnedShardRouterTests.cs @@ -18,7 +18,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Events; @@ -56,7 +56,7 @@ public PinnedShardRouterTests(ITestOutputHelper output) : base(output) /// Test that starting a new transaction on a pinned ClientSession unpins the /// session and normal server selection is performed for the next operation. /// - [SkippableTheory] + [Theory] [ParameterAttributeData] public async void Test_Unpin_For_Next_Transaction([Values(false, true)] bool async) { @@ -116,7 +116,7 @@ public async void Test_Unpin_For_Next_Transaction([Values(false, true)] bool asy /// Test non-transaction operations using a pinned ClientSession unpins the /// session and normal server selection is performed. /// - [SkippableTheory] + [Theory] [ParameterAttributeData] public async void Test_Unpin_For_Non_Transaction_Operation([Values(false, true)] bool async) { diff --git a/tests/MongoDB.Driver.Tests/PipelineDefinitionBuilderTests.cs b/tests/MongoDB.Driver.Tests/PipelineDefinitionBuilderTests.cs index 0d3b38123e9..90a25603231 100644 --- a/tests/MongoDB.Driver.Tests/PipelineDefinitionBuilderTests.cs +++ b/tests/MongoDB.Driver.Tests/PipelineDefinitionBuilderTests.cs @@ -82,7 +82,7 @@ public void ChangeStream_should_throw_when_pipeline_is_null() argumentNullException.ParamName.Should().Be("pipeline"); } - [SkippableFact] + [Fact] public void Lookup_should_throw_when_pipeline_is_null() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/PipelineStageDefinitionBuilderTests.cs b/tests/MongoDB.Driver.Tests/PipelineStageDefinitionBuilderTests.cs index f54a2c34902..bb1596dff10 100644 --- a/tests/MongoDB.Driver.Tests/PipelineStageDefinitionBuilderTests.cs +++ b/tests/MongoDB.Driver.Tests/PipelineStageDefinitionBuilderTests.cs @@ -124,7 +124,7 @@ public void ChangeStream_should_return_the_expected_result_when_options_isNull() stage.Document.Should().Be("{ $changeStream : { } }"); } - [SkippableFact] + [Fact] public void GraphLookup_with_many_to_one_parameters_should_return_expected_result() { RequireServer.Check(); @@ -150,7 +150,7 @@ public void GraphLookup_with_many_to_one_parameters_should_return_expected_resul }"); } - [SkippableFact] + [Fact] public void GraphLookup_with_one_to_many_parameters_should_return_expected_result() { RequireServer.Check(); @@ -176,7 +176,7 @@ public void GraphLookup_with_one_to_many_parameters_should_return_expected_resul }"); } - [SkippableFact] + [Fact] public void GraphLookup_with_one_to_one_parameters_should_return_expected_result() { RequireServer.Check(); @@ -202,7 +202,7 @@ public void GraphLookup_with_one_to_one_parameters_should_return_expected_result }"); } - [SkippableFact] + [Fact] public void Lookup_with_let_should_return_the_expected_result() { RequireServer.Check(); @@ -261,7 +261,7 @@ public void Lookup_with_let_should_return_the_expected_result() }"); } - [SkippableFact] + [Fact] public void Lookup_without_optional_let_should_return_the_expected_result() { RequireServer.Check(); @@ -403,7 +403,7 @@ public class StockData public int Instock { get; set; } } - [SkippableFact] + [Fact] public void Lookup_with_entity_generic_params_should_return_the_expected_result() { RequireServer.Check(); @@ -461,7 +461,7 @@ public void Lookup_with_entity_generic_params_should_return_the_expected_result( }"); } - [SkippableFact] + [Fact] public void Lookup_with_empty_required_params_should_throw_expected_exception() { RequireServer.Check(); diff --git a/tests/MongoDB.Driver.Tests/Properties/AssemblyInfo.cs b/tests/MongoDB.Driver.Tests/Properties/AssemblyInfo.cs index 8990b3d975f..d9eef727857 100644 --- a/tests/MongoDB.Driver.Tests/Properties/AssemblyInfo.cs +++ b/tests/MongoDB.Driver.Tests/Properties/AssemblyInfo.cs @@ -14,11 +14,11 @@ */ using System.Runtime.InteropServices; -using MongoDB.Driver.Core.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using Xunit; [assembly: ComVisible(false)] [assembly: CollectionBehavior(DisableTestParallelization = true)] -[assembly: TestFramework(XunitExtensionsConsts.TimeoutEnforcingXunitFramework, XunitExtensionsConsts.TimeoutEnforcingFrameworkAssembly)] +[assembly: TestFramework(XunitExtensionsConstants.TimeoutEnforcingXunitFramework, XunitExtensionsConstants.TimeoutEnforcingFrameworkAssembly)] diff --git a/tests/MongoDB.Driver.Tests/ReadPreferenceOnStandaloneTests.cs b/tests/MongoDB.Driver.Tests/ReadPreferenceOnStandaloneTests.cs index 5b6ec286fc1..14bd9987fca 100644 --- a/tests/MongoDB.Driver.Tests/ReadPreferenceOnStandaloneTests.cs +++ b/tests/MongoDB.Driver.Tests/ReadPreferenceOnStandaloneTests.cs @@ -18,7 +18,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Events; diff --git a/tests/MongoDB.Driver.Tests/RetryableWritesTests.cs b/tests/MongoDB.Driver.Tests/RetryableWritesTests.cs index e087c9ad28a..6472458726e 100644 --- a/tests/MongoDB.Driver.Tests/RetryableWritesTests.cs +++ b/tests/MongoDB.Driver.Tests/RetryableWritesTests.cs @@ -40,7 +40,7 @@ public RetryableWritesTests(ITestOutputHelper output) : } // public methods - [SkippableFact] + [Fact] public void Insert_with_RetryWrites_true_should_work_whether_retryable_writes_are_supported_or_not() { RequireServer.Check(); @@ -54,7 +54,7 @@ public void Insert_with_RetryWrites_true_should_work_whether_retryable_writes_ar } } - [SkippableFact] + [Fact] public void Retryable_write_errorlabel_should_not_be_added_with_retryWrites_false() { if (CoreTestConfiguration.Cluster.Description.Type == ClusterType.Sharded) @@ -96,7 +96,7 @@ public void Retryable_write_errorlabel_should_not_be_added_with_retryWrites_fals } } - [SkippableFact] + [Fact] public void Retryable_write_operation_should_throw_custom_exception_on_servers_using_mmapv1() { RequireSupportForRetryableWrites(); @@ -116,7 +116,7 @@ public void Retryable_write_operation_should_throw_custom_exception_on_servers_u } } - [SkippableFact] + [Fact] public void TxnNumber_should_be_included_with_FindOneAndDelete() { RequireSupportForRetryableWrites(); @@ -135,7 +135,7 @@ public void TxnNumber_should_be_included_with_FindOneAndDelete() } } - [SkippableFact] + [Fact] public void TxnNumber_should_be_included_with_FindOneAndReplace() { RequireSupportForRetryableWrites(); @@ -154,7 +154,7 @@ public void TxnNumber_should_be_included_with_FindOneAndReplace() } } - [SkippableFact] + [Fact] public void TxnNumber_should_be_included_with_FindOneAndUpdate() { RequireSupportForRetryableWrites(); @@ -173,7 +173,7 @@ public void TxnNumber_should_be_included_with_FindOneAndUpdate() } } - [SkippableFact] + [Fact] public void TxnNumber_should_be_included_with_DeleteOne() { RequireSupportForRetryableWrites(); @@ -192,7 +192,7 @@ public void TxnNumber_should_be_included_with_DeleteOne() } } - [SkippableFact] + [Fact] public void TxnNumber_should_be_included_with_InsertOne() { RequireSupportForRetryableWrites(); @@ -211,7 +211,7 @@ public void TxnNumber_should_be_included_with_InsertOne() } } - [SkippableFact] + [Fact] public void TxnNumber_should_be_included_with_ReplaceOne() { RequireSupportForRetryableWrites(); @@ -230,7 +230,7 @@ public void TxnNumber_should_be_included_with_ReplaceOne() } } - [SkippableFact] + [Fact] public void TxnNumber_should_be_included_with_UpdateOne() { RequireSupportForRetryableWrites(); diff --git a/tests/MongoDB.Driver.Tests/Specifications/Runner/MongoClientJsonDrivenTestRunnerBase.cs b/tests/MongoDB.Driver.Tests/Specifications/Runner/MongoClientJsonDrivenTestRunnerBase.cs index 0f960caa2ee..3999f48070d 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/Runner/MongoClientJsonDrivenTestRunnerBase.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/Runner/MongoClientJsonDrivenTestRunnerBase.cs @@ -35,8 +35,9 @@ using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using MongoDB.Driver.TestHelpers; using MongoDB.Driver.Tests.JsonDrivenTests; -using Xunit; using Xunit.Abstractions; +using Xunit.Sdk; +using Reflector = MongoDB.Bson.TestHelpers.Reflector; namespace MongoDB.Driver.Tests.Specifications.Runner { diff --git a/tests/MongoDB.Driver.Tests/Specifications/atlas-data-lake-testing/AtlasDataLakeTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/atlas-data-lake-testing/AtlasDataLakeTestRunner.cs index d1fc7916ba7..dfe92b4d497 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/atlas-data-lake-testing/AtlasDataLakeTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/atlas-data-lake-testing/AtlasDataLakeTestRunner.cs @@ -16,7 +16,7 @@ using System.Collections.Generic; using MongoDB.Bson; using MongoDB.Bson.TestHelpers.JsonDrivenTests; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Tests.Specifications.Runner; using Xunit; using Xunit.Abstractions; @@ -35,7 +35,7 @@ public AtlasDataLakeTestRunner(ITestOutputHelper testOutputHelper) { } - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseFactory))] public void Run(JsonDrivenTestCase testCase) { diff --git a/tests/MongoDB.Driver.Tests/Specifications/atlas-data-lake-testing/prose-tests/AtlasDataLakeProseTests.cs b/tests/MongoDB.Driver.Tests/Specifications/atlas-data-lake-testing/prose-tests/AtlasDataLakeProseTests.cs index 4fb28c4498a..f9c806259c3 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/atlas-data-lake-testing/prose-tests/AtlasDataLakeProseTests.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/atlas-data-lake-testing/prose-tests/AtlasDataLakeProseTests.cs @@ -16,7 +16,7 @@ using System.Linq; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Events; using MongoDB.Driver.Core.Misc; @@ -28,7 +28,7 @@ namespace MongoDB.Driver.Tests.Specifications.atlas_data_lake_testing.prose_test [Trait("Category", "AtlasDataLake")] public class AtlasDataLakeProseTests { - [SkippableFact] + [Fact] public void Driver_should_connect_to_AtlasDataLake_without_authentication() { RequireEnvironment.Check().EnvironmentVariable("ATLAS_DATA_LAKE_TESTS_ENABLED"); @@ -39,7 +39,7 @@ public void Driver_should_connect_to_AtlasDataLake_without_authentication() } } - [SkippableFact] + [Fact] public void Driver_should_connect_to_AtlasDataLake_with_SCRAM_SHA_1() { RequireEnvironment.Check().EnvironmentVariable("ATLAS_DATA_LAKE_TESTS_ENABLED"); @@ -59,7 +59,7 @@ public void Driver_should_connect_to_AtlasDataLake_with_SCRAM_SHA_1() } } - [SkippableFact] + [Fact] public void Driver_should_connect_to_AtlasDataLake_with_SCRAM_SHA_256() { RequireEnvironment.Check().EnvironmentVariable("ATLAS_DATA_LAKE_TESTS_ENABLED"); @@ -79,7 +79,7 @@ public void Driver_should_connect_to_AtlasDataLake_with_SCRAM_SHA_256() } } - [SkippableFact] + [Fact] public void KillCursors_should_return_expected_result() { RequireEnvironment.Check().EnvironmentVariable("ATLAS_DATA_LAKE_TESTS_ENABLED"); diff --git a/tests/MongoDB.Driver.Tests/Specifications/auth/AuthTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/auth/AuthTestRunner.cs index 069b3c218a9..d7b2e735127 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/auth/AuthTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/auth/AuthTestRunner.cs @@ -20,7 +20,7 @@ using MongoDB.Bson; using MongoDB.Bson.TestHelpers; using MongoDB.Bson.TestHelpers.JsonDrivenTests; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Authentication; using Xunit; @@ -28,7 +28,7 @@ namespace MongoDB.Driver.Tests.Specifications.auth { public class AuthTestRunner { - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseFactory))] public void RunTestDefinition(JsonDrivenTestCase testCase) { diff --git a/tests/MongoDB.Driver.Tests/Specifications/bson-corpus/BsonCorpusTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/bson-corpus/BsonCorpusTestRunner.cs index b8f775d0636..be2120cbb3e 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/bson-corpus/BsonCorpusTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/bson-corpus/BsonCorpusTestRunner.cs @@ -30,7 +30,7 @@ namespace MongoDB.Driver.Tests.Specifications.bson_corpus { public class BsonCorpusTestRunner { - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseFactory))] public void RunTestDefinition(JsonDrivenTestCase testCase) { diff --git a/tests/MongoDB.Driver.Tests/Specifications/change-streams/ChangeStreamUnifiedTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/change-streams/ChangeStreamUnifiedTestRunner.cs index 186d74bf6ce..2a09759e909 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/change-streams/ChangeStreamUnifiedTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/change-streams/ChangeStreamUnifiedTestRunner.cs @@ -33,7 +33,7 @@ public ChangeStreamUnifiedTestRunner(ITestOutputHelper testOutputHelper) } // public methods - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseFactory))] public void Run(JsonDrivenTestCase testCase) { diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/ClientSideEncryptionTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/ClientSideEncryptionTestRunner.cs index f5c7e657a5e..d1e71a04f3a 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/ClientSideEncryptionTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/ClientSideEncryptionTestRunner.cs @@ -19,7 +19,7 @@ using System.Linq; using MongoDB.Bson; using MongoDB.Bson.TestHelpers.JsonDrivenTests; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Events; using MongoDB.Driver.Encryption; using MongoDB.Driver.TestHelpers; @@ -43,7 +43,7 @@ public ClientSideEncryptionTestRunner(ITestOutputHelper testOutputHelper) { } - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseFactory))] public void Run(JsonDrivenTestCase testCase) { diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/ClientSideEncryptionUnifiedTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/ClientSideEncryptionUnifiedTestRunner.cs index 460f2dad3cf..f64d6e74713 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/ClientSideEncryptionUnifiedTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/ClientSideEncryptionUnifiedTestRunner.cs @@ -16,7 +16,7 @@ using System.Collections.Generic; using MongoDB.Bson; using MongoDB.Bson.TestHelpers.JsonDrivenTests; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.TestHelpers.Logging; using MongoDB.Driver.TestHelpers; using MongoDB.Driver.Tests.UnifiedTestOperations; @@ -35,7 +35,7 @@ public ClientSideEncryptionUnifiedTestRunner(ITestOutputHelper testOutputHelper) } // public methods - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseFactory))] public void Run(JsonDrivenTestCase testCase) { diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs index fd44d9e683b..36eecdcd55b 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs @@ -30,7 +30,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers.JsonDrivenTests; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Authentication.External; using MongoDB.Driver.Core.Bindings; @@ -85,7 +85,7 @@ public ClientEncryptionProseTests(ITestOutputHelper testOutputHelper) } // public methods - [SkippableTheory] + [Theory] [ParameterAttributeData] public void BsonSizeLimitAndBatchSizeSplittingTest( [Values(false, true)] bool async) @@ -250,7 +250,7 @@ public void BsonSizeLimitAndBatchSizeSplittingTest( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void BypassMongocryptdClientWhenSharedLibraryTest( [Values(false, true)] bool async) @@ -319,7 +319,7 @@ void ThreadStart(object param) } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void BypassSpawningMongocryptdViaMongocryptdBypassSpawnTest( [Values(false, true)] bool async) @@ -354,7 +354,7 @@ public enum BypassSpawningMongocryptd SharedLibrary } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void BypassSpawningMongocryptdTest( [Values(BypassSpawningMongocryptd.BypassQueryAnalysis, BypassSpawningMongocryptd.BypassAutoEncryption, BypassSpawningMongocryptd.SharedLibrary)] BypassSpawningMongocryptd bypassSpawning, @@ -411,7 +411,7 @@ DisposableMongoClient EnsureEnvironmentAndConfigureTestClientEncrypted() } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void CorpusTest( [Values(false, true)] bool useLocalSchema, @@ -581,7 +581,7 @@ EncryptOptions CreateEncryptOptions(string algorithm, string identifier, string }; } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void CreateDataKeyAndDoubleEncryptionTest( [Values("local", "aws", "azure", "gcp", "kmip")] string kmsProvider, @@ -657,7 +657,7 @@ public void CreateDataKeyAndDoubleEncryptionTest( } } - [SkippableTheory] + [Theory] // aws [InlineData("aws", null, null, null)] [InlineData("aws", "kms.us-east-1.amazonaws.com", null, null)] @@ -819,7 +819,7 @@ void TestCase(ClientEncryption testCaseClientEncription, BsonDocument masterKey, } } - [SkippableTheory] + [Theory] [MemberData(nameof(DeadlockTest_MemberData))] public void DeadlockTest( string _, @@ -1022,7 +1022,7 @@ IEnumerable CasesWithAsync( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void DecryptionEvents( [Range(1, 4)] int testCase, @@ -1135,7 +1135,7 @@ BsonDocument Aggregate(IMongoCollection collection, bool async) } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void ExplicitEncryptionTest( [Range(1, 5)] int testCase, @@ -1264,7 +1264,7 @@ void RunTestCase(IMongoCollection explicitCollectionFromEncryptedC } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void ExternalKeyVaultTest( [Values(false, true)] bool withExternalKeyVault, @@ -1315,7 +1315,7 @@ public void ExternalKeyVaultTest( } } - [SkippableTheory] + [Theory] [ParameterAttributeData] public void KmsTlsOptionsTest( [Values("aws", "azure", "gcp", "kmip")] string kmsProvider, @@ -1632,7 +1632,7 @@ void KmsProviderEndpointConfigurator(string kmsProviderName, Dictionary(); @@ -76,7 +76,7 @@ public void Heartbeat_should_work_as_expected() } } - [SkippableFact] + [Fact] public void Monitor_sleep_at_least_minHeartbeatFreqencyMS_between_checks() { var minVersion = new SemanticVersion(4, 9, 0, ""); @@ -120,7 +120,7 @@ public void Monitor_sleep_at_least_minHeartbeatFreqencyMS_between_checks() sw.ElapsedMilliseconds.Should().BeInRange(2000, 3500); } - [SkippableFact] + [Fact] public void RoundTimeTrip_test() { RequireServer.Check().Supports(Feature.StreamingHello); @@ -172,7 +172,7 @@ public void RoundTimeTrip_test() } } - [SkippableFact] + [Fact] public void ConnectionPool_cleared_on_failed_hello() { var minVersion = new SemanticVersion(4, 9, 0, ""); diff --git a/tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/prose-tests/ServerDiscoveryProseTests.cs b/tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/prose-tests/ServerDiscoveryProseTests.cs index 14b61086e63..05f7a3dda79 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/prose-tests/ServerDiscoveryProseTests.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/server-discovery-and-monitoring/prose-tests/ServerDiscoveryProseTests.cs @@ -19,7 +19,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Clusters; using MongoDB.Driver.Core.Configuration; using MongoDB.Driver.Core.Misc; @@ -41,7 +41,7 @@ public ServerDiscoveryProseTests(ITestOutputHelper testOutputHelper) } // public methods - [SkippableTheory] + [Theory] [ParameterAttributeData] public void Topology_secondary_discovery_with_directConnection_false_should_work_as_expected([Values(false, true, null)] bool? directConnection) { diff --git a/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsProseTests.cs b/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsProseTests.cs index de6da82636f..33627757869 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsProseTests.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsProseTests.cs @@ -20,7 +20,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Events; using MongoDB.Driver.Core.TestHelpers.Logging; @@ -37,7 +37,7 @@ public SessionsProseTests(ITestOutputHelper output) : base(output) { } - [SkippableFact] + [Fact] public void Snapshot_and_causal_consistent_session_is_not_allowed() { RequireServer.Check(); @@ -54,7 +54,7 @@ public void Snapshot_and_causal_consistent_session_is_not_allowed() exception.Should().BeOfType(); } - [SkippableTheory] + [Theory] [ParameterAttributeData] public async Task Ensure_server_session_are_allocated_only_on_connection_checkout([Values(true, false)]bool async) { @@ -189,7 +189,7 @@ await ThreadingUtilities.ExecuteTasksOnNewThreads(operationsCount, async i => singleSessionUsed.Should().BeTrue("At least one iteration should use single session"); } - [SkippableFact] + [Fact] public async Task Ensure_server_session_are_allocated_only_on_connection_checkout_deterministic() { var eventCapturer = new EventCapturer() diff --git a/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsTestRunner.cs index a9b15477bee..cbebc6a67d7 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsTestRunner.cs @@ -34,7 +34,7 @@ public SessionsTestRunner(ITestOutputHelper testOutputHelper) { } - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseFactory))] public void RunTestDefinition(JsonDrivenTestCase testCase) { diff --git a/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsUnifiedTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsUnifiedTestRunner.cs index 453fe8427e0..2b235945789 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsUnifiedTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsUnifiedTestRunner.cs @@ -33,7 +33,7 @@ public SessionsUnifiedTestRunner(ITestOutputHelper testOutputHelper) } // public methods - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseFactory))] public void Run(JsonDrivenTestCase testCase) { diff --git a/tests/MongoDB.Driver.Tests/Specifications/transactions-convenient-api/TransactionsConvenientApiTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/transactions-convenient-api/TransactionsConvenientApiTestRunner.cs index cbc2a4b3204..befc9945a57 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/transactions-convenient-api/TransactionsConvenientApiTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/transactions-convenient-api/TransactionsConvenientApiTestRunner.cs @@ -31,7 +31,7 @@ public TransactionsConvenientApiTestRunner(ITestOutputHelper testOutputHelper) { } - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseFactory))] public void Run(JsonDrivenTestCase testCase) { diff --git a/tests/MongoDB.Driver.Tests/Specifications/transactions/TransactionTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/transactions/TransactionTestRunner.cs index 3dfc44078a0..b7c94d1ebfa 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/transactions/TransactionTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/transactions/TransactionTestRunner.cs @@ -38,6 +38,7 @@ using MongoDB.Driver.Tests.JsonDrivenTests; using Xunit; using Xunit.Abstractions; +using Xunit.Sdk; namespace MongoDB.Driver.Tests.Specifications.transactions { @@ -97,7 +98,7 @@ public async Task ConfigureFailPointAsync(IServer server, ICoreSessionHandle ses _disposables.Add(failPoint); } - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseFactory))] public void Run(JsonDrivenTestCase testCase) { diff --git a/tests/MongoDB.Driver.Tests/Specifications/transactions/TransactionUnifiedTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/transactions/TransactionUnifiedTestRunner.cs index ad67108169e..a09003f0407 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/transactions/TransactionUnifiedTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/transactions/TransactionUnifiedTestRunner.cs @@ -34,7 +34,7 @@ public TransactionUnifiedTestRunner(ITestOutputHelper testOutputHelper) } // public methods - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseFactory))] public void Run(JsonDrivenTestCase testCase) { diff --git a/tests/MongoDB.Driver.Tests/Specifications/unified-test-format/UnifiedTestFormatValidFailTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/unified-test-format/UnifiedTestFormatValidFailTestRunner.cs index acc69ecf7a2..06990b94579 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/unified-test-format/UnifiedTestFormatValidFailTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/unified-test-format/UnifiedTestFormatValidFailTestRunner.cs @@ -17,7 +17,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers.JsonDrivenTests; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.TestHelpers.Logging; using MongoDB.Driver.Tests.UnifiedTestOperations; using Xunit; @@ -34,7 +34,7 @@ public UnifiedTestFormatValidFailTestRunner(ITestOutputHelper testOutputHelper) } // public methods - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseFactory))] public void Run(JsonDrivenTestCase testCase) { diff --git a/tests/MongoDB.Driver.Tests/Specifications/unified-test-format/UnifiedTestFormatValidPassTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/unified-test-format/UnifiedTestFormatValidPassTestRunner.cs index a1454661a83..662040c06c2 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/unified-test-format/UnifiedTestFormatValidPassTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/unified-test-format/UnifiedTestFormatValidPassTestRunner.cs @@ -17,7 +17,7 @@ using System.Linq; using MongoDB.Bson; using MongoDB.Bson.TestHelpers.JsonDrivenTests; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.TestHelpers.Logging; using MongoDB.Driver.Tests.UnifiedTestOperations; using Xunit; @@ -34,7 +34,7 @@ public UnifiedTestFormatValidPassTestRunner(ITestOutputHelper testOutputHelper) } // public methods - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseFactory))] public void Run(JsonDrivenTestCase testCase) { diff --git a/tests/MongoDB.Driver.Tests/Specifications/versioned-api/VersionedApiUnifiedTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/versioned-api/VersionedApiUnifiedTestRunner.cs index 21e5a20d79a..3a449ab2288 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/versioned-api/VersionedApiUnifiedTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/versioned-api/VersionedApiUnifiedTestRunner.cs @@ -34,7 +34,7 @@ public VersionedApiUnifiedTestRunner(ITestOutputHelper testOutputHelper) } // public methods - [SkippableTheory] + [Theory] [ClassData(typeof(TestCaseFactory))] public void Run(JsonDrivenTestCase testCase) { diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/Matchers/UnifiedErrorMatcher.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/Matchers/UnifiedErrorMatcher.cs index 7e30a51322d..d9dc77a4d57 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/Matchers/UnifiedErrorMatcher.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/Matchers/UnifiedErrorMatcher.cs @@ -18,7 +18,7 @@ using System.Linq; using FluentAssertions; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; namespace MongoDB.Driver.Tests.UnifiedTestOperations.Matchers { diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/Matchers/UnifiedEventMatcher.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/Matchers/UnifiedEventMatcher.cs index b73f6f04a39..3b178d900f4 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/Matchers/UnifiedEventMatcher.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/Matchers/UnifiedEventMatcher.cs @@ -20,7 +20,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Connections; using MongoDB.Driver.Core.Events; using Xunit.Sdk; diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/Matchers/UnifiedValueMatcher.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/Matchers/UnifiedValueMatcher.cs index a143e26ebe2..7c033913638 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/Matchers/UnifiedValueMatcher.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/Matchers/UnifiedValueMatcher.cs @@ -19,7 +19,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.IO; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver; using Xunit.Sdk; diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedLoopOperation.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedLoopOperation.cs index 417b4bf3b65..78daf3870fb 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedLoopOperation.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedLoopOperation.cs @@ -19,7 +19,7 @@ using System.Threading; using System.Threading.Tasks; using MongoDB.Bson; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core.Misc; namespace MongoDB.Driver.Tests.UnifiedTestOperations diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedTestRunner.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedTestRunner.cs index 6d83c5043a2..92ec76e001d 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedTestRunner.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedTestRunner.cs @@ -21,7 +21,7 @@ using Microsoft.Extensions.Logging; using MongoDB.Bson; using MongoDB.Bson.TestHelpers.JsonDrivenTests; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Core; using MongoDB.Driver.Core.Logging; using MongoDB.Driver.Core.Misc; @@ -29,7 +29,7 @@ using MongoDB.Driver.Core.TestHelpers.Logging; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using MongoDB.Driver.Tests.UnifiedTestOperations.Matchers; -using Xunit; +using Xunit.Sdk; namespace MongoDB.Driver.Tests.UnifiedTestOperations { diff --git a/tests/MongoDB.Driver.Tests/UpdateDefinitionBuilderTests.cs b/tests/MongoDB.Driver.Tests/UpdateDefinitionBuilderTests.cs index 29d461f9715..47cfbdb4c51 100644 --- a/tests/MongoDB.Driver.Tests/UpdateDefinitionBuilderTests.cs +++ b/tests/MongoDB.Driver.Tests/UpdateDefinitionBuilderTests.cs @@ -21,7 +21,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Attributes; -using MongoDB.Bson.TestHelpers.XunitExtensions; +using MongoDB.TestHelpers.XunitExtensions; using MongoDB.Driver.Linq; using Xunit; diff --git a/tests/MongoDB.TestHelpers/MongoDB.TestHelpers.csproj b/tests/MongoDB.TestHelpers/MongoDB.TestHelpers.csproj new file mode 100644 index 00000000000..ade074a59f1 --- /dev/null +++ b/tests/MongoDB.TestHelpers/MongoDB.TestHelpers.csproj @@ -0,0 +1,15 @@ + + + + + $(StandardTargetFrameworks) + ..\..\MongoDBLegacyTest.ruleset + + + + MongoDB.TestHelpers + MongoDB.TestHelpers + Helper classes applicable to all test projects. + + + diff --git a/tests/MongoDB.TestHelpers/Properties/AssemblyInfo.cs b/tests/MongoDB.TestHelpers/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..cc39fd111c9 --- /dev/null +++ b/tests/MongoDB.TestHelpers/Properties/AssemblyInfo.cs @@ -0,0 +1,18 @@ +/* Copyright 2010-present MongoDB Inc. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System.Runtime.InteropServices; + +[assembly: ComVisible(false)] diff --git a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/AssertionException.cs b/tests/MongoDB.TestHelpers/XunitExtensions/AssertionException.cs similarity index 90% rename from tests/MongoDB.Bson.TestHelpers/XunitExtensions/AssertionException.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/AssertionException.cs index a5c3a27be25..1499b69ac56 100644 --- a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/AssertionException.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/AssertionException.cs @@ -1,4 +1,4 @@ -/* Copyright 2016-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ using System; using Xunit.Sdk; -namespace MongoDB.Bson.TestHelpers.XunitExtensions +namespace MongoDB.TestHelpers.XunitExtensions { public class AssertionException : XunitException { diff --git a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/ClassValuesAttribute.cs b/tests/MongoDB.TestHelpers/XunitExtensions/ClassValuesAttribute.cs similarity index 93% rename from tests/MongoDB.Bson.TestHelpers/XunitExtensions/ClassValuesAttribute.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/ClassValuesAttribute.cs index 7925a0f05d2..64298bc2a1d 100644 --- a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/ClassValuesAttribute.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/ClassValuesAttribute.cs @@ -1,4 +1,4 @@ -/* Copyright 2020-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ using System; -namespace MongoDB.Bson.TestHelpers.XunitExtensions +namespace MongoDB.TestHelpers.XunitExtensions { [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] public class ClassValuesAttribute : Attribute, IValueGeneratorAttribute diff --git a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/IValueGenerator.cs b/tests/MongoDB.TestHelpers/XunitExtensions/IValueGenerator.cs similarity index 87% rename from tests/MongoDB.Bson.TestHelpers/XunitExtensions/IValueGenerator.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/IValueGenerator.cs index d1b0ad98cf8..b15f3f295be 100644 --- a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/IValueGenerator.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/IValueGenerator.cs @@ -1,4 +1,4 @@ -/* Copyright 2020-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * limitations under the License. */ -namespace MongoDB.Bson.TestHelpers.XunitExtensions +namespace MongoDB.TestHelpers.XunitExtensions { public interface IValueGenerator { diff --git a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/IValueGeneratorAttribute.cs b/tests/MongoDB.TestHelpers/XunitExtensions/IValueGeneratorAttribute.cs similarity index 87% rename from tests/MongoDB.Bson.TestHelpers/XunitExtensions/IValueGeneratorAttribute.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/IValueGeneratorAttribute.cs index d9bfaffe386..0f35a840c42 100644 --- a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/IValueGeneratorAttribute.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/IValueGeneratorAttribute.cs @@ -1,4 +1,4 @@ -/* Copyright 2016-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * limitations under the License. */ -namespace MongoDB.Bson.TestHelpers.XunitExtensions +namespace MongoDB.TestHelpers.XunitExtensions { internal interface IValueGeneratorAttribute { diff --git a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/ParameterAttributeDataAttribute.cs b/tests/MongoDB.TestHelpers/XunitExtensions/ParameterAttributeDataAttribute.cs similarity index 96% rename from tests/MongoDB.Bson.TestHelpers/XunitExtensions/ParameterAttributeDataAttribute.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/ParameterAttributeDataAttribute.cs index 63136fb24e6..bc18fa1823a 100644 --- a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/ParameterAttributeDataAttribute.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/ParameterAttributeDataAttribute.cs @@ -1,4 +1,4 @@ -/* Copyright 2016-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ using System.Reflection; using Xunit.Sdk; -namespace MongoDB.Bson.TestHelpers.XunitExtensions +namespace MongoDB.TestHelpers.XunitExtensions { public class ParameterAttributeDataAttribute : DataAttribute { diff --git a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/RandomSeedAttribute.cs b/tests/MongoDB.TestHelpers/XunitExtensions/RandomSeedAttribute.cs similarity index 92% rename from tests/MongoDB.Bson.TestHelpers/XunitExtensions/RandomSeedAttribute.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/RandomSeedAttribute.cs index 194e851fce6..94dcf9341f4 100644 --- a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/RandomSeedAttribute.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/RandomSeedAttribute.cs @@ -1,4 +1,4 @@ -/* Copyright 2021-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,8 @@ using System; using System.Diagnostics; using System.Linq; -using MongoDB.Bson.TestHelpers.XunitExtensions; -namespace MongoDB.Bson.TestHelpers +namespace MongoDB.TestHelpers.XunitExtensions { [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] public class RandomSeedAttribute : Attribute, IValueGeneratorAttribute diff --git a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/RangeAttribute.cs b/tests/MongoDB.TestHelpers/XunitExtensions/RangeAttribute.cs similarity index 94% rename from tests/MongoDB.Bson.TestHelpers/XunitExtensions/RangeAttribute.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/RangeAttribute.cs index 670398e8d81..daca4517998 100644 --- a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/RangeAttribute.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/RangeAttribute.cs @@ -1,4 +1,4 @@ -/* Copyright 2016-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ using System; using System.Collections.Generic; -namespace MongoDB.Bson.TestHelpers.XunitExtensions +namespace MongoDB.TestHelpers.XunitExtensions { [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] public sealed class RangeAttribute : Attribute, IValueGeneratorAttribute diff --git a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/RequireEnvironment.cs b/tests/MongoDB.TestHelpers/XunitExtensions/RequireEnvironment.cs similarity index 95% rename from tests/MongoDB.Bson.TestHelpers/XunitExtensions/RequireEnvironment.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/RequireEnvironment.cs index 26b8aa29343..476dd3dc540 100644 --- a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/RequireEnvironment.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/RequireEnvironment.cs @@ -1,4 +1,4 @@ -/* Copyright 2016-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,9 @@ using System.Diagnostics; using System.Net; using System.Net.Sockets; -using Xunit; +using Xunit.Sdk; -namespace MongoDB.Bson.TestHelpers.XunitExtensions +namespace MongoDB.TestHelpers.XunitExtensions { public class RequireEnvironment { diff --git a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/RequireProcess.cs b/tests/MongoDB.TestHelpers/XunitExtensions/RequireProcess.cs similarity index 91% rename from tests/MongoDB.Bson.TestHelpers/XunitExtensions/RequireProcess.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/RequireProcess.cs index a575ad5f282..87d447dc5b6 100644 --- a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/RequireProcess.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/RequireProcess.cs @@ -1,4 +1,4 @@ -/* Copyright 2016-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ */ using System; -using Xunit; +using Xunit.Sdk; -namespace MongoDB.Bson.TestHelpers.XunitExtensions +namespace MongoDB.TestHelpers.XunitExtensions { public class RequireProcess { diff --git a/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/ITestExceptionHandler.cs b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/ITestExceptionHandler.cs new file mode 100644 index 00000000000..2383cff3e6b --- /dev/null +++ b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/ITestExceptionHandler.cs @@ -0,0 +1,24 @@ +/* Copyright 2010-present MongoDB Inc. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; + +namespace MongoDB.TestHelpers.XunitExtensions.TimeoutEnforcing +{ + public interface ITestExceptionHandler + { + void HandleException(Exception ex); + } +} diff --git a/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/SkippableTestMessageBus.cs b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/SkippableTestMessageBus.cs new file mode 100644 index 00000000000..733ee106159 --- /dev/null +++ b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/SkippableTestMessageBus.cs @@ -0,0 +1,61 @@ +/* Copyright 2010-present MongoDB Inc. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; +using System.Linq; +using Xunit.Abstractions; +using Xunit.Sdk; + +namespace MongoDB.TestHelpers.XunitExtensions.TimeoutEnforcing +{ + internal sealed class SkippableTestMessageBus : IMessageBus + { + private readonly static string __skippableExceptionName = typeof(SkipException).FullName; + + private readonly IMessageBus _messageBus; + private int _skippedCount; + + public SkippableTestMessageBus(IMessageBus messageBus) + { + if (messageBus == null) + { + throw new ArgumentNullException(nameof(messageBus)); + } + + _messageBus = messageBus; + } + + public int SkippedCount => _skippedCount; + + public void Dispose() + { + _messageBus.Dispose(); + } + + /// + public bool QueueMessage(IMessageSinkMessage message) + { + var failed = message as TestFailed; + if (message is TestFailed testFailed && + testFailed.ExceptionTypes.FirstOrDefault() == __skippableExceptionName) + { + _skippedCount++; + return _messageBus.QueueMessage(new TestSkipped(failed.Test, failed.Messages[0])); + } + + return _messageBus.QueueMessage(message); + } + } +} diff --git a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingTestInvoker.cs b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingTestInvoker.cs similarity index 59% rename from tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingTestInvoker.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingTestInvoker.cs index 351ca9c6b5f..69c16fc24d8 100644 --- a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingTestInvoker.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingTestInvoker.cs @@ -1,4 +1,4 @@ -/* Copyright 2021-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,18 +17,46 @@ using System.Collections.Generic; using System.Diagnostics; using System.Reflection; +using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; -using MongoDB.Driver.Core.TestHelpers.Logging; -using Xunit; using Xunit.Abstractions; using Xunit.Sdk; -namespace MongoDB.Driver.Core.TestHelpers.XunitExtensions.TimeoutEnforcing +namespace MongoDB.TestHelpers.XunitExtensions.TimeoutEnforcing { [DebuggerStepThrough] internal sealed class TimeoutEnforcingTestInvoker : XunitTestInvoker { + // This is a copy of MongoDB.Driver.Core.Misc.TaskExtensions.YieldNoContextAwaitable struct + // Remove this copy when moving TaskExtensions to BSON level. + private struct YieldNoContextAwaitable + { + public YieldNoContextAwaiter GetAwaiter() { return new YieldNoContextAwaiter(); } + + public struct YieldNoContextAwaiter : ICriticalNotifyCompletion + { + /// Gets whether a yield is not required. + /// This property is intended for compiler user rather than use directly in code. + public bool IsCompleted { get { return false; } } // yielding is always required for YieldNoContextAwaiter, hence false + + public void OnCompleted(Action continuation) + { + Task.Factory.StartNew(continuation, default, TaskCreationOptions.PreferFairness, TaskScheduler.Default); + } + + public void UnsafeOnCompleted(Action continuation) + { + Task.Factory.StartNew(continuation, default, TaskCreationOptions.PreferFairness, TaskScheduler.Default); + } + + public void GetResult() + { + // no op + } + } + } + public TimeoutEnforcingTestInvoker( ITest test, IMessageBus messageBus, @@ -45,7 +73,7 @@ public TimeoutEnforcingTestInvoker( private async Task InvokeBaseOnTaskScheduler(object testClassInstance) { - await Misc.TaskExtensions.YieldNoContext(); + await new YieldNoContextAwaitable(); return await base.InvokeTestMethodAsync(testClassInstance); } @@ -56,10 +84,10 @@ protected override async Task InvokeTestMethodAsync(object testClassIns var timeoutMS = xUnitTestCase?.Timeout ?? 0; var timeout = Debugger.IsAttached ? Timeout.InfiniteTimeSpan // allow more flexible debugging expirience - : timeoutMS <= 0 ? CoreTestConfiguration.DefaultTestTimeout : TimeSpan.FromMilliseconds(timeoutMS); + : timeoutMS <= 0 ? XunitExtensionsConstants.DefaultTestTimeout : TimeSpan.FromMilliseconds(timeoutMS); - var testLoggable = testClassInstance as LoggableTestClass; + var testExceptionHandler = testClassInstance as ITestExceptionHandler; decimal result; try @@ -72,13 +100,13 @@ protected override async Task InvokeTestMethodAsync(object testClassIns throw new TestTimeoutException((int)timeout.TotalMilliseconds); } - if (Aggregator.HasExceptions && testLoggable != null) + if (Aggregator.HasExceptions && testExceptionHandler != null) { var exception = Aggregator.ToException(); if (exception is not SkipException) { - testLoggable.OnException(exception); + testExceptionHandler.HandleException(exception); } } @@ -86,7 +114,7 @@ protected override async Task InvokeTestMethodAsync(object testClassIns } catch (Exception exception) { - testLoggable?.OnException(exception); + testExceptionHandler?.HandleException(exception); throw; } diff --git a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingTestRunner.cs b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingTestRunner.cs similarity index 93% rename from tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingTestRunner.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingTestRunner.cs index 0100333a3ab..23602b4e7b5 100644 --- a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingTestRunner.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingTestRunner.cs @@ -1,4 +1,4 @@ -/* Copyright 2021-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ using Xunit.Abstractions; using Xunit.Sdk; -namespace MongoDB.Driver.Core.TestHelpers.XunitExtensions.TimeoutEnforcing +namespace MongoDB.TestHelpers.XunitExtensions.TimeoutEnforcing { [DebuggerStepThrough] internal sealed class TimeoutEnforcingTestRunner : XunitTestRunner diff --git a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestAssemblyRunner.cs b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestAssemblyRunner.cs similarity index 93% rename from tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestAssemblyRunner.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestAssemblyRunner.cs index 553758b5dcf..7719fe7500e 100644 --- a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestAssemblyRunner.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestAssemblyRunner.cs @@ -1,4 +1,4 @@ -/* Copyright 2021-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ using Xunit.Abstractions; using Xunit.Sdk; -namespace MongoDB.Driver.Core.TestHelpers.XunitExtensions.TimeoutEnforcing +namespace MongoDB.TestHelpers.XunitExtensions.TimeoutEnforcing { [DebuggerStepThrough] internal sealed class TimeoutEnforcingXunitTestAssemblyRunner : XunitTestAssemblyRunner diff --git a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestCaseRunner.cs b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestCaseRunner.cs similarity index 94% rename from tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestCaseRunner.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestCaseRunner.cs index 9707b9b2466..b590b275d7b 100644 --- a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestCaseRunner.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestCaseRunner.cs @@ -1,4 +1,4 @@ -/* Copyright 2021-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ using Xunit.Abstractions; using Xunit.Sdk; -namespace MongoDB.Driver.Core.TestHelpers.XunitExtensions.TimeoutEnforcing +namespace MongoDB.TestHelpers.XunitExtensions.TimeoutEnforcing { [DebuggerStepThrough] internal sealed class TimeoutEnforcingXunitTestCaseRunner : XunitTestCaseRunner diff --git a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestClassRunner.cs b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestClassRunner.cs similarity index 93% rename from tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestClassRunner.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestClassRunner.cs index 15f6ea90f3f..95080257f2e 100644 --- a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestClassRunner.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestClassRunner.cs @@ -1,4 +1,4 @@ -/* Copyright 2021-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ using Xunit.Abstractions; using Xunit.Sdk; -namespace MongoDB.Driver.Core.TestHelpers.XunitExtensions.TimeoutEnforcing +namespace MongoDB.TestHelpers.XunitExtensions.TimeoutEnforcing { [DebuggerStepThrough] internal sealed class TimeoutEnforcingXunitTestClassRunner : XunitTestClassRunner diff --git a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestCollectionRunner.cs b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestCollectionRunner.cs similarity index 93% rename from tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestCollectionRunner.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestCollectionRunner.cs index c6c43384f9c..fe429789841 100644 --- a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestCollectionRunner.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestCollectionRunner.cs @@ -1,4 +1,4 @@ -/* Copyright 2021-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ using Xunit.Abstractions; using Xunit.Sdk; -namespace MongoDB.Driver.Core.TestHelpers.XunitExtensions.TimeoutEnforcing +namespace MongoDB.TestHelpers.XunitExtensions.TimeoutEnforcing { [DebuggerStepThrough] internal sealed class TimeoutEnforcingXunitTestCollectionRunner : XunitTestCollectionRunner diff --git a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestFramework.cs b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestFramework.cs similarity index 90% rename from tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestFramework.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestFramework.cs index f7b035f70e9..47c7ab5b85d 100644 --- a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestFramework.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestFramework.cs @@ -1,4 +1,4 @@ -/* Copyright 2021-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ using Xunit.Abstractions; using Xunit.Sdk; -namespace MongoDB.Driver.Core.TestHelpers.XunitExtensions.TimeoutEnforcing +namespace MongoDB.TestHelpers.XunitExtensions.TimeoutEnforcing { [DebuggerStepThrough] public sealed class TimeoutEnforcingXunitTestFramework : XunitTestFramework diff --git a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestFrameworkExecutor.cs b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestFrameworkExecutor.cs similarity index 92% rename from tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestFrameworkExecutor.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestFrameworkExecutor.cs index 31e734bc7c6..4b724557d75 100644 --- a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestFrameworkExecutor.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestFrameworkExecutor.cs @@ -1,4 +1,4 @@ -/* Copyright 2021-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ using Xunit.Abstractions; using Xunit.Sdk; -namespace MongoDB.Driver.Core.TestHelpers.XunitExtensions.TimeoutEnforcing +namespace MongoDB.TestHelpers.XunitExtensions.TimeoutEnforcing { [DebuggerStepThrough] internal sealed class TimeoutEnforcingXunitTestFrameworkExecutor : XunitTestFrameworkExecutor diff --git a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestMethodRunner.cs b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestMethodRunner.cs similarity index 90% rename from tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestMethodRunner.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestMethodRunner.cs index bbd95e563be..67f45241ff5 100644 --- a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestMethodRunner.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTestMethodRunner.cs @@ -1,4 +1,4 @@ -/* Copyright 2021-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,17 +17,14 @@ using System.Diagnostics; using System.Threading; using System.Threading.Tasks; -using Xunit; using Xunit.Abstractions; using Xunit.Sdk; -namespace MongoDB.Driver.Core.TestHelpers.XunitExtensions.TimeoutEnforcing +namespace MongoDB.TestHelpers.XunitExtensions.TimeoutEnforcing { [DebuggerStepThrough] internal sealed class TimeoutEnforcingXunitTestMethodRunner : XunitTestMethodRunner { - private static string[] __skippingExceptionNames = new string[] { typeof(SkipException).FullName }; - private readonly object[] _constructorArguments; private readonly IMessageSink _diagnosticMessageSink; @@ -39,7 +36,7 @@ public TimeoutEnforcingXunitTestMethodRunner(ITestMethod testMethod, IReflection protected override async Task RunTestCaseAsync(IXunitTestCase originalTestCase) { - var messageBusInterceptor = new SkippableTestMessageBus(MessageBus, __skippingExceptionNames); + var messageBusInterceptor = new SkippableTestMessageBus(MessageBus); var isTheory = originalTestCase is XunitTheoryTestCase; XunitTestCaseRunner testRunner = isTheory ? diff --git a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTheoryTestCaseRunner.cs b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTheoryTestCaseRunner.cs similarity index 94% rename from tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTheoryTestCaseRunner.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTheoryTestCaseRunner.cs index bf2a952c6f8..fe4433bf366 100644 --- a/tests/MongoDB.Driver.Core.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTheoryTestCaseRunner.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/TimeoutEnforcing/TimeoutEnforcingXunitTheoryTestCaseRunner.cs @@ -1,4 +1,4 @@ -/* Copyright 2021-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ using Xunit.Abstractions; using Xunit.Sdk; -namespace MongoDB.Driver.Core.TestHelpers.XunitExtensions.TimeoutEnforcing +namespace MongoDB.TestHelpers.XunitExtensions.TimeoutEnforcing { [DebuggerStepThrough] internal sealed class TimeoutEnforcingXunitTheoryTestCaseRunner : XunitTheoryTestCaseRunner diff --git a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/ValuesAttribute.cs b/tests/MongoDB.TestHelpers/XunitExtensions/ValuesAttribute.cs similarity index 91% rename from tests/MongoDB.Bson.TestHelpers/XunitExtensions/ValuesAttribute.cs rename to tests/MongoDB.TestHelpers/XunitExtensions/ValuesAttribute.cs index a18d9931139..18a949b0eed 100644 --- a/tests/MongoDB.Bson.TestHelpers/XunitExtensions/ValuesAttribute.cs +++ b/tests/MongoDB.TestHelpers/XunitExtensions/ValuesAttribute.cs @@ -1,4 +1,4 @@ -/* Copyright 2016-present MongoDB Inc. +/* Copyright 2010-present MongoDB Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ using System; using System.Linq; -namespace MongoDB.Bson.TestHelpers.XunitExtensions +namespace MongoDB.TestHelpers.XunitExtensions { [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] public sealed class ValuesAttribute : Attribute, IValueGeneratorAttribute diff --git a/tests/MongoDB.TestHelpers/XunitExtensions/XunitExtensionsConstants.cs b/tests/MongoDB.TestHelpers/XunitExtensions/XunitExtensionsConstants.cs new file mode 100644 index 00000000000..6eef51ed01e --- /dev/null +++ b/tests/MongoDB.TestHelpers/XunitExtensions/XunitExtensionsConstants.cs @@ -0,0 +1,27 @@ +/* Copyright 2010-present MongoDB Inc. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; + +namespace MongoDB.TestHelpers.XunitExtensions +{ + public static class XunitExtensionsConstants + { + public const string TimeoutEnforcingXunitFramework = "MongoDB.TestHelpers.XunitExtensions.TimeoutEnforcing.TimeoutEnforcingXunitTestFramework"; + public const string TimeoutEnforcingFrameworkAssembly = "MongoDB.TestHelpers"; + + public static readonly TimeSpan DefaultTestTimeout = TimeSpan.FromMinutes(3); + } +} diff --git a/tests/SkippableTests/FactTests.cs b/tests/SkippableTests/FactTests.cs deleted file mode 100644 index 3eebcf138a3..00000000000 --- a/tests/SkippableTests/FactTests.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using FluentAssertions; -using Xunit; - -namespace SkippableTests -{ - public class FactTests - { - [Fact] - public void Fact_should_fail() - { - true.Should().BeFalse(); - } - - [Fact] - public void Fact_should_pass() - { - true.Should().BeTrue(); - } - } -} diff --git a/tests/SkippableTests/SkippableFactTests.cs b/tests/SkippableTests/SkippableFactTests.cs deleted file mode 100644 index 9369907874c..00000000000 --- a/tests/SkippableTests/SkippableFactTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using FluentAssertions; -using Xunit; - -namespace SkippableTests -{ - public class SkippableFactTests - { - [SkippableFact] - public void SkippableFact_should_fail() - { - true.Should().BeFalse(); - } - - [SkippableFact] - public void SkippableFact_should_pass() - { - true.Should().BeTrue(); - } - - [SkippableFact] - public void SkippableFact_should_be_skipped() - { - throw new SkipException("test"); - } - } -} diff --git a/tests/SkippableTests/SkippableTests.csproj b/tests/SkippableTests/SkippableTests.csproj deleted file mode 100644 index b2068f846cf..00000000000 --- a/tests/SkippableTests/SkippableTests.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - - ..\..\MongoDBLegacyTest.ruleset - - - - TRACE - - - - - - - - - - - - - - Always - - - - diff --git a/tests/SkippableTests/SkippableTheoryTests.cs b/tests/SkippableTests/SkippableTheoryTests.cs deleted file mode 100644 index 9e66bcba3ed..00000000000 --- a/tests/SkippableTests/SkippableTheoryTests.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using FluentAssertions; -using Xunit; - -namespace SkippableTests -{ - public class SkippableTheoryTests - { - [SkippableTheory] - [InlineData(0)] - public void SkippableTheory_should_fail(int x) - { - x.Should().Be(1); - } - - [SkippableTheory] - [InlineData(0)] - public void SkippableTheory_should_pass(int x) - { - x.Should().Be(0); - } - - [SkippableTheory] - [InlineData(0)] - public void SkippableTheory_should_be_skipped(int x) - { - if (x == 0) - { - throw new SkipException("test"); - } - } - } -} diff --git a/tests/SkippableTests/TheoryTests.cs b/tests/SkippableTests/TheoryTests.cs deleted file mode 100644 index a8655b2be8b..00000000000 --- a/tests/SkippableTests/TheoryTests.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using FluentAssertions; -using Xunit; - -namespace SkippableTests -{ - public class TheoryTests - { - [Theory] - [InlineData(0)] - public void Theory_should_fail(int x) - { - x.Should().Be(1); - } - - [Theory] - [InlineData(0)] - public void Theory_should_pass(int x) - { - x.Should().Be(0); - } - } -} diff --git a/tests/SkippableTests/xunit.runner.json b/tests/SkippableTests/xunit.runner.json deleted file mode 100644 index 3b86d1533b9..00000000000 --- a/tests/SkippableTests/xunit.runner.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "longRunningTestSeconds": 10, - "parallelizeAssembly": false, - "parallelizeTestCollections": false -} \ No newline at end of file diff --git a/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/MongoDB.Driver.SmokeTests.Sdk.csproj b/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/MongoDB.Driver.SmokeTests.Sdk.csproj index 9f28db5e30f..8c56b707d69 100644 --- a/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/MongoDB.Driver.SmokeTests.Sdk.csproj +++ b/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/MongoDB.Driver.SmokeTests.Sdk.csproj @@ -21,7 +21,7 @@ - +