Skip to content

Commit d3ae919

Browse files
mihail-vladovmihail-vladov
authored
Merge pull request #118 from telerik/stoilov/fix-xunit-assert-throws
Trying to use Telerik.JustMock.Xunit.AssertFailedException fails to compile
2 parents 359bf4f + 6a33116 commit d3ae919

36 files changed

+90
-217
lines changed

‎Telerik.JustMock.Tests/AfterAllFixture.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,7 @@ limitations under the License.
3636
using TestMethod = Xunit.FactAttribute;
3737
using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute;
3838
using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute;
39-
#if XUNIT2
40-
using AssertionException = Xunit.Sdk.XunitException;
41-
#else
42-
using AssertionException = Xunit.Sdk.AssertException;
43-
#endif
39+
using AssertionException = Telerik.JustMock.XUnit.AssertFailedException;
4440
#elif VSTEST_PORTABLE
4541
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
4642
using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException;

‎Telerik.JustMock.Tests/AssertionFixture.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ limitations under the License.
4040
using TestMethod = Xunit.FactAttribute;
4141
using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute;
4242
using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute;
43-
#if XUNIT2
44-
using AssertionException = Xunit.Sdk.XunitException;
45-
#else
46-
using AssertionException = Xunit.Sdk.AssertException;
47-
#endif
43+
using AssertionException = Telerik.JustMock.XUnit.AssertFailedException;
4844
#elif VSTEST_PORTABLE
4945
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
5046
using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException;

‎Telerik.JustMock.Tests/AsyncFixture.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@
1919
using TestMethod = Xunit.FactAttribute;
2020
using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute;
2121
using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute;
22-
#if XUNIT2
23-
using AssertionException = Xunit.Sdk.XunitException;
24-
#else
25-
using AssertionException = Xunit.Sdk.AssertException;
26-
#endif
22+
using AssertionException = Telerik.JustMock.XUnit.AssertFailedException;
2723
#elif VSTEST_PORTABLE
2824
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
2925
using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException;

‎Telerik.JustMock.Tests/BehaviorFixture.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ limitations under the License.
4040
using TestMethod = Xunit.FactAttribute;
4141
using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute;
4242
using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute;
43-
#if XUNIT2
44-
using AssertionException = Xunit.Sdk.XunitException;
45-
#else
46-
using AssertionException = Xunit.Sdk.AssertException;
47-
#endif
43+
using AssertionException = Telerik.JustMock.XUnit.AssertFailedException;
4844
#elif VSTEST_PORTABLE
4945
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
5046
using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException;

‎Telerik.JustMock.Tests/ConstructorFixture.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ limitations under the License.
3434
using TestMethod = Xunit.FactAttribute;
3535
using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute;
3636
using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute;
37-
#if XUNIT2
38-
using AssertionException = Xunit.Sdk.XunitException;
39-
#else
40-
using AssertionException = Xunit.Sdk.AssertException;
41-
#endif
37+
using AssertionException = Telerik.JustMock.XUnit.AssertFailedException;
4238
#elif VSTEST_PORTABLE
4339
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
4440
using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException;

‎Telerik.JustMock.Tests/Coverage/DoInsteadFixture.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ limitations under the License.
3939
using TestMethod = Xunit.FactAttribute;
4040
using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute;
4141
using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute;
42-
#if XUNIT2
43-
using AssertionException = Xunit.Sdk.XunitException;
44-
#else
45-
using AssertionException = Xunit.Sdk.AssertException;
46-
#endif
42+
using AssertionException = Telerik.JustMock.XUnit.AssertFailedException;
4743
#elif VSTEST_PORTABLE
4844
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
4945
using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException;
@@ -257,4 +253,4 @@ public interface IFoo
257253

258254
}
259255
}
260-
}
256+
}

‎Telerik.JustMock.Tests/Coverage/DoInsteadFixture.tt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,7 @@ using TestClass = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestClassAttribute
4141
using TestMethod = Xunit.FactAttribute;
4242
using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute;
4343
using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute;
44-
#if XUNIT2
45-
using AssertionException = Xunit.Sdk.XunitException;
46-
#else
47-
using AssertionException = Xunit.Sdk.AssertException;
48-
#endif
44+
using AssertionException = Telerik.JustMock.XUnit.AssertFailedException;
4945
#elif VSTEST_PORTABLE
5046
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
5147
using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException;

‎Telerik.JustMock.Tests/Coverage/MatchersFixture.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ limitations under the License.
3737
using TestMethod = Xunit.FactAttribute;
3838
using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute;
3939
using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute;
40-
#if XUNIT2
41-
using AssertionException = Xunit.Sdk.XunitException;
42-
#else
43-
using AssertionException = Xunit.Sdk.AssertException;
44-
#endif
40+
using AssertionException = Telerik.JustMock.XUnit.AssertFailedException;
4541
#elif VSTEST_PORTABLE
4642
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
4743
using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException;

‎Telerik.JustMock.Tests/Coverage/MatchersFixture.tt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ using TestClass = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestClassAttribute
3737
using TestMethod = Xunit.FactAttribute;
3838
using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute;
3939
using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute;
40-
#if XUNIT2
41-
using AssertionException = Xunit.Sdk.XunitException;
42-
#else
43-
using AssertionException = Xunit.Sdk.AssertException;
44-
#endif
40+
using AssertionException = Telerik.JustMock.XUnit.AssertFailedException;
4541
#elif VSTEST_PORTABLE
4642
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
4743
using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException;

‎Telerik.JustMock.Tests/Coverage/ReturnsFixture.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ limitations under the License.
3838
using TestMethod = Xunit.FactAttribute;
3939
using TestInitialize = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestInitializeAttribute;
4040
using TestCleanup = Telerik.JustMock.XUnit.Test.Attributes.EmptyTestCleanupAttribute;
41-
#if XUNIT2
42-
using AssertionException = Xunit.Sdk.XunitException;
43-
#else
44-
using AssertionException = Xunit.Sdk.AssertException;
45-
#endif
41+
using AssertionException = Telerik.JustMock.XUnit.AssertFailedException;
4642
#elif VSTEST_PORTABLE
4743
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
4844
using AssertionException = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.AssertFailedException;
@@ -245,4 +241,4 @@ public interface IFoo
245241

246242
}
247243
}
248-
}
244+
}

0 commit comments

Comments
 (0)