diff --git a/Telerik.JustMock.Tests/AfterAllFixture.cs b/Telerik.JustMock.Tests/AfterAllFixture.cs index b1c33572..36fc95f3 100644 --- a/Telerik.JustMock.Tests/AfterAllFixture.cs +++ b/Telerik.JustMock.Tests/AfterAllFixture.cs @@ -36,11 +36,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/AssertionFixture.cs b/Telerik.JustMock.Tests/AssertionFixture.cs index 1ab72e2f..87851f8a 100644 --- a/Telerik.JustMock.Tests/AssertionFixture.cs +++ b/Telerik.JustMock.Tests/AssertionFixture.cs @@ -40,11 +40,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/AsyncFixture.cs b/Telerik.JustMock.Tests/AsyncFixture.cs index 0f9d2c13..505c946f 100644 --- a/Telerik.JustMock.Tests/AsyncFixture.cs +++ b/Telerik.JustMock.Tests/AsyncFixture.cs @@ -19,11 +19,7 @@ using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/BehaviorFixture.cs b/Telerik.JustMock.Tests/BehaviorFixture.cs index 09cd5802..a9ff0fd5 100644 --- a/Telerik.JustMock.Tests/BehaviorFixture.cs +++ b/Telerik.JustMock.Tests/BehaviorFixture.cs @@ -40,11 +40,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/ConstructorFixture.cs b/Telerik.JustMock.Tests/ConstructorFixture.cs index cbd6f087..3f129c95 100644 --- a/Telerik.JustMock.Tests/ConstructorFixture.cs +++ b/Telerik.JustMock.Tests/ConstructorFixture.cs @@ -34,11 +34,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/Coverage/DoInsteadFixture.cs b/Telerik.JustMock.Tests/Coverage/DoInsteadFixture.cs index b420d9fe..495775c7 100644 --- a/Telerik.JustMock.Tests/Coverage/DoInsteadFixture.cs +++ b/Telerik.JustMock.Tests/Coverage/DoInsteadFixture.cs @@ -39,11 +39,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; @@ -257,4 +253,4 @@ public interface IFoo } } -} \ No newline at end of file +} diff --git a/Telerik.JustMock.Tests/Coverage/DoInsteadFixture.tt b/Telerik.JustMock.Tests/Coverage/DoInsteadFixture.tt index 60f5e911..ee07f094 100644 --- a/Telerik.JustMock.Tests/Coverage/DoInsteadFixture.tt +++ b/Telerik.JustMock.Tests/Coverage/DoInsteadFixture.tt @@ -41,11 +41,7 @@ using TestClass = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestClassAttribute using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/Coverage/MatchersFixture.cs b/Telerik.JustMock.Tests/Coverage/MatchersFixture.cs index fcf98ff8..ea9b2ef8 100644 --- a/Telerik.JustMock.Tests/Coverage/MatchersFixture.cs +++ b/Telerik.JustMock.Tests/Coverage/MatchersFixture.cs @@ -37,11 +37,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/Coverage/MatchersFixture.tt b/Telerik.JustMock.Tests/Coverage/MatchersFixture.tt index eecd7f36..f9845d06 100644 --- a/Telerik.JustMock.Tests/Coverage/MatchersFixture.tt +++ b/Telerik.JustMock.Tests/Coverage/MatchersFixture.tt @@ -37,11 +37,7 @@ using TestClass = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestClassAttribute using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/Coverage/ReturnsFixture.cs b/Telerik.JustMock.Tests/Coverage/ReturnsFixture.cs index bf74e204..2975fc8e 100644 --- a/Telerik.JustMock.Tests/Coverage/ReturnsFixture.cs +++ b/Telerik.JustMock.Tests/Coverage/ReturnsFixture.cs @@ -38,11 +38,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; @@ -245,4 +241,4 @@ public interface IFoo } } -} \ No newline at end of file +} diff --git a/Telerik.JustMock.Tests/Coverage/ReturnsFixture.tt b/Telerik.JustMock.Tests/Coverage/ReturnsFixture.tt index 9c92affc..307c8735 100644 --- a/Telerik.JustMock.Tests/Coverage/ReturnsFixture.tt +++ b/Telerik.JustMock.Tests/Coverage/ReturnsFixture.tt @@ -40,11 +40,7 @@ using TestClass = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestClassAttribute using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/Coverage/WhenFixture.cs b/Telerik.JustMock.Tests/Coverage/WhenFixture.cs index 480ba264..0fdec505 100644 --- a/Telerik.JustMock.Tests/Coverage/WhenFixture.cs +++ b/Telerik.JustMock.Tests/Coverage/WhenFixture.cs @@ -39,11 +39,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/Coverage/WhenFixture.tt b/Telerik.JustMock.Tests/Coverage/WhenFixture.tt index 8aa0394d..a6de620a 100644 --- a/Telerik.JustMock.Tests/Coverage/WhenFixture.tt +++ b/Telerik.JustMock.Tests/Coverage/WhenFixture.tt @@ -43,11 +43,7 @@ using TestClass = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestClassAttribute using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/DelegateFixture.cs b/Telerik.JustMock.Tests/DelegateFixture.cs index 19ebb275..753f7948 100644 --- a/Telerik.JustMock.Tests/DelegateFixture.cs +++ b/Telerik.JustMock.Tests/DelegateFixture.cs @@ -36,11 +36,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/DynamicFixture.cs b/Telerik.JustMock.Tests/DynamicFixture.cs index 5d1ce57a..9b19c997 100644 --- a/Telerik.JustMock.Tests/DynamicFixture.cs +++ b/Telerik.JustMock.Tests/DynamicFixture.cs @@ -38,11 +38,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/EventsFixture.cs b/Telerik.JustMock.Tests/EventsFixture.cs index b58d5e5e..193f0797 100644 --- a/Telerik.JustMock.Tests/EventsFixture.cs +++ b/Telerik.JustMock.Tests/EventsFixture.cs @@ -39,11 +39,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/FluentFixture.cs b/Telerik.JustMock.Tests/FluentFixture.cs index b880c737..615a29b4 100644 --- a/Telerik.JustMock.Tests/FluentFixture.cs +++ b/Telerik.JustMock.Tests/FluentFixture.cs @@ -35,11 +35,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/FuncSpecFixture.cs b/Telerik.JustMock.Tests/FuncSpecFixture.cs index be0c7b03..5f49aa2e 100644 --- a/Telerik.JustMock.Tests/FuncSpecFixture.cs +++ b/Telerik.JustMock.Tests/FuncSpecFixture.cs @@ -37,11 +37,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/InOrderFixture.cs b/Telerik.JustMock.Tests/InOrderFixture.cs index cdaf82e4..83da5f40 100644 --- a/Telerik.JustMock.Tests/InOrderFixture.cs +++ b/Telerik.JustMock.Tests/InOrderFixture.cs @@ -34,11 +34,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/InteropFixture.cs b/Telerik.JustMock.Tests/InteropFixture.cs index 2fcf1eaf..56a7b918 100644 --- a/Telerik.JustMock.Tests/InteropFixture.cs +++ b/Telerik.JustMock.Tests/InteropFixture.cs @@ -17,11 +17,7 @@ using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/MarshalByRefFixture.cs b/Telerik.JustMock.Tests/MarshalByRefFixture.cs index 8bfa8e8e..90543723 100644 --- a/Telerik.JustMock.Tests/MarshalByRefFixture.cs +++ b/Telerik.JustMock.Tests/MarshalByRefFixture.cs @@ -17,11 +17,7 @@ using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/MatchersFixture.cs b/Telerik.JustMock.Tests/MatchersFixture.cs index 20a72da9..2fff2a05 100644 --- a/Telerik.JustMock.Tests/MatchersFixture.cs +++ b/Telerik.JustMock.Tests/MatchersFixture.cs @@ -36,11 +36,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/MiscFixture.cs b/Telerik.JustMock.Tests/MiscFixture.cs index e311729c..a57542d6 100644 --- a/Telerik.JustMock.Tests/MiscFixture.cs +++ b/Telerik.JustMock.Tests/MiscFixture.cs @@ -43,11 +43,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/MockFixture.cs b/Telerik.JustMock.Tests/MockFixture.cs index b7867f49..0fb6dfb5 100644 --- a/Telerik.JustMock.Tests/MockFixture.cs +++ b/Telerik.JustMock.Tests/MockFixture.cs @@ -48,11 +48,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/NinjectAutoMockFixture.cs b/Telerik.JustMock.Tests/NinjectAutoMockFixture.cs index 2a812ce7..e2923f70 100644 --- a/Telerik.JustMock.Tests/NinjectAutoMockFixture.cs +++ b/Telerik.JustMock.Tests/NinjectAutoMockFixture.cs @@ -40,11 +40,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/NonPublicFixture.cs b/Telerik.JustMock.Tests/NonPublicFixture.cs index 97b1b514..09466949 100644 --- a/Telerik.JustMock.Tests/NonPublicFixture.cs +++ b/Telerik.JustMock.Tests/NonPublicFixture.cs @@ -39,11 +39,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/OccurrenceFixture.cs b/Telerik.JustMock.Tests/OccurrenceFixture.cs index 15c50397..30ed4525 100644 --- a/Telerik.JustMock.Tests/OccurrenceFixture.cs +++ b/Telerik.JustMock.Tests/OccurrenceFixture.cs @@ -35,11 +35,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/OutRefFixure.cs b/Telerik.JustMock.Tests/OutRefFixure.cs index 27626f7d..ab065e1d 100644 --- a/Telerik.JustMock.Tests/OutRefFixure.cs +++ b/Telerik.JustMock.Tests/OutRefFixure.cs @@ -35,11 +35,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/PropertiesFixture.cs b/Telerik.JustMock.Tests/PropertiesFixture.cs index 45b2e1d9..63103ef1 100644 --- a/Telerik.JustMock.Tests/PropertiesFixture.cs +++ b/Telerik.JustMock.Tests/PropertiesFixture.cs @@ -37,11 +37,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/RecursiveFixture.cs b/Telerik.JustMock.Tests/RecursiveFixture.cs index 68a22014..abdbb735 100644 --- a/Telerik.JustMock.Tests/RecursiveFixture.cs +++ b/Telerik.JustMock.Tests/RecursiveFixture.cs @@ -38,11 +38,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/ReturnsFixture.cs b/Telerik.JustMock.Tests/ReturnsFixture.cs index 1775cbc9..e32a44ba 100644 --- a/Telerik.JustMock.Tests/ReturnsFixture.cs +++ b/Telerik.JustMock.Tests/ReturnsFixture.cs @@ -38,11 +38,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/SequenceFixture.cs b/Telerik.JustMock.Tests/SequenceFixture.cs index b0c761b0..74eeaec3 100644 --- a/Telerik.JustMock.Tests/SequenceFixture.cs +++ b/Telerik.JustMock.Tests/SequenceFixture.cs @@ -35,11 +35,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/SerializableFixture.cs b/Telerik.JustMock.Tests/SerializableFixture.cs index 5d19a7b4..2dbf7de9 100644 --- a/Telerik.JustMock.Tests/SerializableFixture.cs +++ b/Telerik.JustMock.Tests/SerializableFixture.cs @@ -36,11 +36,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock.Tests/WaitEventFixture.cs b/Telerik.JustMock.Tests/WaitEventFixture.cs index 6f049e04..73edc50a 100644 --- a/Telerik.JustMock.Tests/WaitEventFixture.cs +++ b/Telerik.JustMock.Tests/WaitEventFixture.cs @@ -34,11 +34,7 @@ limitations under the License. using TestMethod = Xunit.FactAttribute; using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute; using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute; -#if XUNIT2 -using AssertionException = Xunit.Sdk.XunitException; -#else -using AssertionException = Xunit.Sdk.AssertException; -#endif +using AssertionException = Telerik.JustMock.XUnit.AssertFailedException; #elif VSTEST_PORTABLE using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException; diff --git a/Telerik.JustMock/Core/Context/XUnitMockingContextResolver.cs b/Telerik.JustMock/Core/Context/XUnitMockingContextResolver.cs index ff6d8922..5203ab66 100644 --- a/Telerik.JustMock/Core/Context/XUnitMockingContextResolver.cs +++ b/Telerik.JustMock/Core/Context/XUnitMockingContextResolver.cs @@ -25,7 +25,7 @@ namespace Telerik.JustMock.Core.Context { internal abstract class XUnitMockingContextResolver : HierarchicalTestFrameworkContextResolver { - private Type exceptionType; + private Type exceptionType = typeof(XUnit.AssertFailedException); protected XUnitMockingContextResolver(string exceptionName) : base(exceptionName) @@ -34,34 +34,7 @@ protected XUnitMockingContextResolver(string exceptionName) protected override Expression> CreateExceptionFactory() { - if (exceptionType == null) - { - CreateExceptionType(); - } - return exceptionType != null ? this.CreateExceptionFactory(this.exceptionType) : null; - } - - protected abstract Type GetExceptionType(); - - private void CreateExceptionType() - { - var baseType = GetExceptionType(); - if (baseType == null) - return; - var typeBuilder = MockingUtil.ModuleBuilder.DefineType( - "Telerik.JustMock.Xunit.AssertFailedException", TypeAttributes.Public, baseType); - - var signature = new[] { typeof(string), typeof(Exception) }; - var ctor = typeBuilder.DefineConstructor(MethodAttributes.Public, CallingConventions.HasThis, signature); - var il = ctor.GetILGenerator(); - il.Emit(OpCodes.Ldarg_0); - il.Emit(OpCodes.Ldarg_1); - il.Emit(OpCodes.Ldarg_2); - il.Emit(OpCodes.Call, baseType.GetConstructor( - BindingFlags.NonPublic | BindingFlags.Instance, Type.DefaultBinder, signature, null)); - il.Emit(OpCodes.Ret); - - this.exceptionType = typeBuilder.CreateType(); + return this.CreateExceptionFactory(this.exceptionType); } } @@ -82,17 +55,6 @@ public XUnit1xMockingContextResolver() null, null, null, FixtureConstuctorSemantics.InstanceConstructorCalledOncePerTest); } - - protected override Type GetExceptionType() - { - var exceptionType = FindType(this.AssertFailedExceptionTypeName, false); - if (exceptionType != null) - { - exceptionType = exceptionType.BaseType; - } - - return exceptionType; - } } internal class XUnit2xMockingContextResolver : XUnitMockingContextResolver @@ -112,10 +74,5 @@ public XUnit2xMockingContextResolver() null, null, null, FixtureConstuctorSemantics.InstanceConstructorCalledOncePerTest); } - - protected override Type GetExceptionType() - { - return FindType(this.AssertFailedExceptionTypeName, false, true); - } } } diff --git a/Telerik.JustMock/Xunit/AssertFailedException.cs b/Telerik.JustMock/Xunit/AssertFailedException.cs new file mode 100644 index 00000000..c303be76 --- /dev/null +++ b/Telerik.JustMock/Xunit/AssertFailedException.cs @@ -0,0 +1,52 @@ +/* + JustMock Lite + Copyright © 2020 Progress Software Corporation + + 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; +#if !PORTABLE +using System.ComponentModel; +#endif + +namespace Telerik.JustMock.XUnit +{ + /// + /// Represents common assertion failure exception across 1.x and 2.x xUnit versions + /// +#if !PORTABLE + [Browsable(false)] + [EditorBrowsable(EditorBrowsableState.Never)] +#endif + public class AssertFailedException : Exception + { + public AssertFailedException() + : base() + { + + } + + public AssertFailedException(string message) + : base(message) + { + + } + + public AssertFailedException(string message, Exception innerException) + : base(message, innerException) + { + + } + } +}