diff options
| author | Marcos Henrich <marcos.henrich@xamarin.com> | 2016-08-01 12:27:37 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-10-29 15:09:33 +0300 |
| commit | 863dc73d1984175cb52734e1cb755c9d57de53bd (patch) | |
| tree | 064bd05b59629fd58d317b6853334de013607b4e /mcs/class/Mono.Posix | |
| parent | 01c9543e084d1196a051c4a980b255b0f8b399d5 (diff) | |
[bcl] Add NUnitHelper.cs with API not in nunit-lite
NUnitHelper.cs adds CollectionAssert, FileAssert, StringAssert.
Also adds AssertHelper class with methods that are not part of nunitlite
Assert class.
Diffstat (limited to 'mcs/class/Mono.Posix')
4 files changed, 8 insertions, 13 deletions
diff --git a/mcs/class/Mono.Posix/Mono.Posix_test.dll.sources b/mcs/class/Mono.Posix/Mono.Posix_test.dll.sources index a2f290f8656..55773333f78 100644 --- a/mcs/class/Mono.Posix/Mono.Posix_test.dll.sources +++ b/mcs/class/Mono.Posix/Mono.Posix_test.dll.sources @@ -1,3 +1,4 @@ +../../test-helpers/NunitHelpers.cs Mono.Unix/ReadlinkTest.cs Mono.Unix/StdioFileStreamTest.cs Mono.Unix/UnixEncodingTest.cs diff --git a/mcs/class/Mono.Posix/Test/Mono.Unix.Native/RealTimeSignumTests.cs b/mcs/class/Mono.Posix/Test/Mono.Unix.Native/RealTimeSignumTests.cs index f68fe53b8ce..4a8f26ae17d 100644 --- a/mcs/class/Mono.Posix/Test/Mono.Unix.Native/RealTimeSignumTests.cs +++ b/mcs/class/Mono.Posix/Test/Mono.Unix.Native/RealTimeSignumTests.cs @@ -8,9 +8,7 @@ // using NUnit.Framework; -#if !MONODROID -using NUnit.Framework.SyntaxHelpers; -#endif + using System; using System.Text; using System.Threading; diff --git a/mcs/class/Mono.Posix/Test/Mono.Unix/ReadlinkTest.cs b/mcs/class/Mono.Posix/Test/Mono.Unix/ReadlinkTest.cs index 608127b568c..c968f5e7657 100644 --- a/mcs/class/Mono.Posix/Test/Mono.Unix/ReadlinkTest.cs +++ b/mcs/class/Mono.Posix/Test/Mono.Unix/ReadlinkTest.cs @@ -173,7 +173,7 @@ namespace MonoTests.Mono.Unix long r = Syscall.readlink (link, buf); if (r < 0) UnixMarshal.ThrowExceptionForLastError (); - Assert.GreaterOrEqual (buf.Length, r); + AssertHelper.GreaterOrEqual (buf.Length, r); if (r == buf.Length) buf = new byte[checked (buf.Length * 2)]; else @@ -199,7 +199,7 @@ namespace MonoTests.Mono.Unix long r = Syscall.readlinkat (TempFD, "link", buf); if (r < 0) UnixMarshal.ThrowExceptionForLastError (); - Assert.GreaterOrEqual (buf.Length, r); + AssertHelper.GreaterOrEqual (buf.Length, r); if (r == buf.Length) buf = new byte[checked (buf.Length * 2)]; else @@ -226,7 +226,7 @@ namespace MonoTests.Mono.Unix if (r < 0) UnixMarshal.ThrowExceptionForLastError (); Assert.AreEqual (r, sb.Length); - Assert.GreaterOrEqual (sb.Capacity, r); + AssertHelper.GreaterOrEqual (sb.Capacity, r); if (r == sb.Capacity) checked { sb.Capacity *= 2; } else @@ -255,7 +255,7 @@ namespace MonoTests.Mono.Unix if (r < 0) UnixMarshal.ThrowExceptionForLastError (); Assert.AreEqual (r, sb.Length); - Assert.GreaterOrEqual (sb.Capacity, r); + AssertHelper.GreaterOrEqual (sb.Capacity, r); if (r == sb.Capacity) checked { sb.Capacity *= 2; } else diff --git a/mcs/class/Mono.Posix/Test/Mono.Unix/UnixSignalTest.cs b/mcs/class/Mono.Posix/Test/Mono.Unix/UnixSignalTest.cs index 9abc27094c9..2b7ef95dae3 100644 --- a/mcs/class/Mono.Posix/Test/Mono.Unix/UnixSignalTest.cs +++ b/mcs/class/Mono.Posix/Test/Mono.Unix/UnixSignalTest.cs @@ -8,18 +8,14 @@ // using NUnit.Framework; -#if !MONODROID -using NUnit.Framework.SyntaxHelpers; -#endif + using System; using System.Text; using System.Threading; using Mono.Unix; using Mono.Unix.Android; using Mono.Unix.Native; -#if !MONODROID -namespace NUnit.Framework.SyntaxHelpers { class Dummy {} } -#endif + namespace MonoTests.Mono.Unix { [TestFixture] |