[bcl] Add NUnitHelper.cs with API not in nunit-lite
authorMarcos Henrich <marcos.henrich@xamarin.com>
Mon, 1 Aug 2016 09:27:37 +0000 (10:27 +0100)
committerAlexander Köplinger <alex.koeplinger@outlook.com>
Sat, 29 Oct 2016 12:09:33 +0000 (14:09 +0200)
NUnitHelper.cs adds CollectionAssert, FileAssert, StringAssert.

Also adds AssertHelper class with methods that are not part of nunitlite
Assert class.

88 files changed:
mcs/class/Microsoft.Build/Microsoft.Build_test.dll.sources
mcs/class/Mono.CodeContracts/Mono.CodeContracts_test.dll.sources
mcs/class/Mono.Parallel/Mono.Parallel_test.dll.sources
mcs/class/Mono.Posix/Mono.Posix_test.dll.sources
mcs/class/Mono.Posix/Test/Mono.Unix.Native/RealTimeSignumTests.cs
mcs/class/Mono.Posix/Test/Mono.Unix/ReadlinkTest.cs
mcs/class/Mono.Posix/Test/Mono.Unix/UnixSignalTest.cs
mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks_test.dll.sources
mcs/class/System.Configuration/Test/System.Configuration/ConfigurationSaveTest.cs
mcs/class/System.Core/Test/System.Linq/EnumerableFixture.cs
mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/DataContext.cs
mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/DynamicLinqTest.cs
mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/ExecuteCommand_Test.cs
mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/ExecuteQuery_Test.cs
mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/Linq_101_Samples/Advanced.cs
mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/ReadTest.cs
mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/ReadTest_Complex.cs
mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/ReadTest_GroupBy.cs
mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/ReadTests_AnyCountFirst.cs
mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/ReadTests_DateTimeFunctions.cs
mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/ReadTests_EntitySet.cs
mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/StoredProcTest.cs
mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/Table.cs
mcs/class/System.Data.Linq/src/DbLinq/Test/Providers/WriteTest.cs
mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest.cs
mcs/class/System.Data/Test/System.Data/ConstraintTest.cs
mcs/class/System.Data/Test/System.Data/DataRelationCollectionTest.cs
mcs/class/System.Data/Test/System.Data/DataRelationTest.cs
mcs/class/System.Data/Test/System.Data/UniqueConstraintTest.cs
mcs/class/System.Drawing/System.Drawing_test.dll.sources
mcs/class/System.Drawing/Test/DrawingTest/Test/Graphics.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting_test.dll.sources
mcs/class/System.Runtime.Remoting/Test/IpcChannelTest.cs
mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/CollectionSerialization.cs
mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractExporterTest2.cs
mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest2.cs
mcs/class/System.ServiceModel/System.ServiceModel_test.dll.sources
mcs/class/System.ServiceModel/Test/MetadataTests/BindingTestAssertions.cs
mcs/class/System.ServiceModel/Test/MetadataTests/ExportTests.cs
mcs/class/System.ServiceModel/Test/MetadataTests/ImportTests.cs
mcs/class/System.ServiceModel/Test/MetadataTests/ImportTests_LoadMetadata.cs
mcs/class/System.ServiceModel/Test/MetadataTests/MiscImportTests.cs
mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/MessageEncoderTest.cs
mcs/class/System.ServiceProcess/System.ServiceProcess_test.dll.sources
mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow_test.dll.sources
mcs/class/System.Threading.Tasks.Dataflow/Test/System.Threading.Tasks.Dataflow/BoundedCapacityTest.cs
mcs/class/System.Threading.Tasks.Dataflow/Test/System.Threading.Tasks.Dataflow/OptionsTest.cs
mcs/class/System.Web.DynamicData/System.Web.DynamicData_test.dll.sources
mcs/class/System.Web.DynamicData/Test/System.Web.DynamicData/FieldTemplateFactoryTest.cs
mcs/class/System.Web/System.Web_standalone_test.dll.sources
mcs/class/System.Web/System.Web_test.dll.sources
mcs/class/System.Web/Test/System.Web.Hosting/HostingEnvironmentTest.cs
mcs/class/System.Web/Test/System.Web/HttpResponseTest.cs
mcs/class/System.Web/Test/System.Web/XmlSiteMapProviderTest.cs
mcs/class/System.Windows.Forms/System.Windows.Forms_test.dll.sources
mcs/class/System.Windows.Forms/Test/System.Resources/ResXDataNodeFileRefGetValueTests.cs
mcs/class/System.Windows.Forms/Test/System.Resources/ResXDataNodeSerialisedGetValueTypeNameTests.cs
mcs/class/System.Windows.Forms/Test/System.Resources/ResXDataNodeSerializedGetValueTests.cs
mcs/class/System.Windows.Forms/Test/System.Resources/ResXDataNodeTest.cs
mcs/class/System.Windows.Forms/Test/System.Resources/ResXDataNodeWriteBehavior.cs
mcs/class/System.Windows.Forms/Test/System.Windows.Forms/TableLayoutTest.cs
mcs/class/System.Xml.Linq/System.Xml.Linq_test.dll.sources
mcs/class/System.Xml.Linq/Test/System.Xml.Schema/ExtensionsTest.cs
mcs/class/System/System_test.dll.sources
mcs/class/System/Test/System.CodeDom.Compiler/CodeGeneratorGenerateFromCompileUnitTest.cs
mcs/class/System/Test/System.Collections.Generic/SortedListTest.cs
mcs/class/System/Test/System.Diagnostics/SourceSwitchTest.cs
mcs/class/System/Test/System.Diagnostics/SwitchesTest.cs
mcs/class/WebMatrix.Data/WebMatrix.Data_test.dll.sources
mcs/class/WindowsBase/WindowsBase_test.dll.sources
mcs/class/corlib/Test/Mono/DataConvertTest.cs
mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs
mcs/class/corlib/Test/System.Collections.Concurrent/PartitionerTests.cs
mcs/class/corlib/Test/System.Security.AccessControl/RawSecurityDescriptorTest.cs
mcs/class/corlib/Test/System.Text/ASCIIEncodingTest.cs
mcs/class/corlib/Test/System.Threading.Tasks/TaskCompletionSourceTests.cs
mcs/class/corlib/Test/System.Threading.Tasks/TaskFactoryTest.cs
mcs/class/corlib/Test/System.Threading.Tasks/TaskFactoryTest_T.cs
mcs/class/corlib/Test/System.Threading.Tasks/TaskSchedulerTest.cs
mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs
mcs/class/corlib/Test/System.Threading/ThreadLocalTests.cs
mcs/class/corlib/Test/System/SingleTest.cs
mcs/class/corlib/corlib_test.dll.sources
mcs/class/monodoc/Test/Monodoc.Generators/RawGeneratorTests.cs
mcs/class/monodoc/Test/Monodoc/HelpSourceTests.cs
mcs/class/monodoc/Test/Monodoc/SettingsTest.cs
mcs/class/monodoc/monodoc_test.dll.sources
mcs/class/test-helpers/NunitHelpers.cs [new file with mode: 0644]

index 7b65749c86afd94b360d4eb80d6e619590998359..28c4af1277abbcb7a31cdd66a5310bc2b315498b 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 FunctionalTest.cs
 Microsoft.Build.Construction/ProjectItemElementTest.cs
 Microsoft.Build.Construction/ProjectRootElementTest.cs
index 984809180a1ea283051576f8071c219b890182a5..9e77c38bdf12f6e1000da5833db06f75588354cc 100644 (file)
@@ -1,2 +1,3 @@
+../../test-helpers/NunitHelpers.cs
 RewriteAndLoad.cs
 TestCCRewrite.cs
index 1eb8276dbde5a7eae4bf842def1b68edff5afaea..c187abfe371c2a2309625f06d481169d4f1a32b7 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 Mono.Collections.Concurrent/CollectionStressTestHelper.cs
 Mono.Collections.Concurrent/ConcurrentSkipListTests.cs
 Mono.Threading/ParallelTestHelper.cs
index a2f290f8656ed6bd2f002f6c1d1f468e9007ea15..55773333f78b9a554cc45b94c2698868d4f26fdf 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 Mono.Unix/ReadlinkTest.cs
 Mono.Unix/StdioFileStreamTest.cs
 Mono.Unix/UnixEncodingTest.cs
index f68fe53b8ce70b896dbb603a9530042fddae1885..4a8f26ae17d4aac06c11980eb25c26bd3c6751d9 100644 (file)
@@ -8,9 +8,7 @@
 //
 
 using NUnit.Framework;
-#if !MONODROID
-using NUnit.Framework.SyntaxHelpers;
-#endif
+
 using System;
 using System.Text;
 using System.Threading;
index 608127b568c81272027312ca22a7629841e02e3a..c968f5e7657e63e81b4f938581d6b53280f66131 100644 (file)
@@ -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
index 9abc27094c9d0fe4c8fb8610e8b767386a4e0e8e..2b7ef95dae37d5bd792b568eeef7d1b8ca56977e 100644 (file)
@@ -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]
index 0dbb1260ba9b06120690e6ce8b91397243621c1c..902f1ac16296e1358a959ce77aca605e4cbe1ade 100644 (file)
@@ -1 +1,2 @@
+../../test-helpers/NunitHelpers.cs
 Mono.XBuild.Tasks/PcFileCacheTest.cs
index 4d0e369b414a45eebbdad975446df6e8e7c584f7..2bb7723f7a0dc37d6d8e8f64c455b583a10ce16f 100644 (file)
@@ -37,7 +37,6 @@ using SysConfig = System.Configuration.Configuration;
 
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace MonoTests.System.Configuration {
        using Util;
index a9389f9b49710d088c2f7baf64b566d424566a2c..ceef4c02157565a3e3ce4f4f0e0ef046e8ffd06f 100644 (file)
@@ -34,12 +34,9 @@ using System.Text;
 using System.Threading;
 using NUnit.Framework;
 using System.Linq;
-using NUnit.Framework.SyntaxHelpers;
 using NUnit.Framework.Constraints;
 using System.Diagnostics;
 
-namespace NUnit.Framework.SyntaxHelpers { class Dummy {} }
-
 namespace MonoTests.System.Linq
 {
        [TestFixture]
index c9bea8ea40c594e715c35af32ad3789c10603f76..f2b6d3ede66e1a19fd2a1812c53784df489fce70 100644 (file)
@@ -71,7 +71,7 @@ using MsNorthwind;
             \r
 \r
             Assert.IsNotNull(dbCommand.CommandText);\r
-            Assert.Greater(dbCommand.Parameters.Count, 0);\r
+            AssertHelper.Greater(dbCommand.Parameters.Count, 0);\r
         }\r
     }\r
 }\r
index 5ea0dbc7d761f83e6eac880c174482a1c55ce012..9bd6aac50f90e6faa0e01157d6969f38d354f2a9 100644 (file)
@@ -186,7 +186,7 @@ using nwind;
             Northwind db = CreateDB();\r
             Expression<Func<Customer, bool>> predicate = c => c.City == "Paris";\r
             int count = db.Customers.Count(predicate);\r
-            Assert.Greater(count, 0); // Some databases have more than 1 customer in Paris\r
+            AssertHelper.Greater(count, 0); // Some databases have more than 1 customer in Paris\r
         }\r
 \r
         /// <summary>\r
index 87bf3d8cdeee9b5e7347f7df43ca47a0d2ec07cc..b8a1c728d8eea9ff9dcbaf6a9787ab24d910c074 100644 (file)
@@ -68,7 +68,7 @@ using nwind;
         {\r
             Northwind db = CreateDB();\r
             int result = db.ExecuteCommand("SELECT count(*) FROM \"Products\"");\r
-            Assert.Greater(result, 0, "Expecting some rows in Products table, got:" + result);\r
+            AssertHelper.Greater(result, 0, "Expecting some rows in Products table, got:" + result);\r
         }\r
 \r
         /// <summary>\r
@@ -85,7 +85,7 @@ using nwind;
             Northwind db = CreateDB();\r
             int result = db.ExecuteCommand("SELECT count(*) FROM [Products] WHERE [ProductID]>{0}", 3);\r
             //long iResult = base.ExecuteScalar(sql);\r
-            Assert.Greater(result, 0, "Expecting some rows in Products table, got:" + result);\r
+            AssertHelper.Greater(result, 0, "Expecting some rows in Products table, got:" + result);\r
         }\r
 \r
     }\r
index ea375055d7eff42f3f25fbcd002a30e9d7d6f16d..fac3d615da592c19bc60a65c3790046525a07c6a 100644 (file)
@@ -67,7 +67,7 @@ using nwind;
             string beforecountry = character.Country;\r
             character.Country = "Burmuda";\r
 \r
-            Assert.Greater(db.GetChangeSet().Updates.Count, 0);\r
+            AssertHelper.Greater(db.GetChangeSet().Updates.Count, 0);\r
             db.SubmitChanges();\r
 \r
             var character2 = db.Customers.First(c=>c.CustomerID==character.CustomerID);\r
index e420e84f6bbbf621550f8192920040ce02954382..dd976666e05742c322045241a451dc14c98f2613 100644 (file)
@@ -159,7 +159,7 @@ using nwind;
 \r
             var q3 = q1.Union(q2);\r
 \r
-            Assert.Greater(q1.Count(), 0);\r
+            AssertHelper.Greater(q1.Count(), 0);\r
             Assert.IsTrue(q1.Count() + q2.Count() >= q3.Count());\r
 \r
         }\r
index 1f443c32ac66030d295c8a83b74bbbef11f0b92b..717623450022a1120e40dec3db05e528996ed08a 100644 (file)
@@ -234,7 +234,7 @@ namespace nwind
             var q = from p in db.Products select p;\r
             List<Product> products = q.ToList();\r
             int productCount = products.Count;\r
-            Assert.Greater(productCount, 0, "Expected some products, got none");\r
+            AssertHelper.Greater(productCount, 0, "Expected some products, got none");\r
         }\r
 \r
 #if !DEBUG && SQLITE\r
@@ -572,7 +572,7 @@ namespace nwind
                         .Join(db.GetTable<EmployeeTerritory>(), t => t.TerritoryID, l => l.TerritoryID, (t, l) => l)\r
                         .Join(db.GetTable<Employee>().Where(e => e.EmployeeID > 0), l => l.EmployeeID, e => e.EmployeeID, (l, e) => e);\r
             var employeeCount = q.Count();\r
-            Assert.Greater(employeeCount, 0, "Expected any employees, got count=" + employeeCount);\r
+            AssertHelper.Greater(employeeCount, 0, "Expected any employees, got count=" + employeeCount);\r
         }\r
 \r
         /// <summary>\r
@@ -839,7 +839,7 @@ namespace nwind
 \r
             var q = from p in db.Products where p.ProductName == "Chai" select p.ProductID;\r
             var productID = q.First();\r
-            Assert.Greater(productID, 0, "Expected penID>0, got " + productID);\r
+            AssertHelper.Greater(productID, 0, "Expected penID>0, got " + productID);\r
         }\r
 \r
 \r
@@ -880,7 +880,7 @@ namespace nwind
 \r
             var q = from p in db.Products where p.ProductName == "Chai" select p.ProductID;\r
             var productID = q.Last();\r
-            Assert.Greater(productID, 0, "Expected penID>0, got " + productID);\r
+            AssertHelper.Greater(productID, 0, "Expected penID>0, got " + productID);\r
         }\r
 \r
 #if !DEBUG && (POSTGRES || (MSSQL && !L2SQL))\r
@@ -906,7 +906,7 @@ namespace nwind
                 }\r
                 prevProductName = p.ProductName;\r
             }\r
-            //Assert.Greater(productID,0,"Expected penID>0, got "+productID);\r
+            //AssertHelper.Greater(productID,0,"Expected penID>0, got "+productID);\r
         }\r
 \r
         [Test]\r
@@ -915,7 +915,7 @@ namespace nwind
             Northwind db = CreateDB();\r
             //var q = from p in db.Products where "Chai"==p.ProductName select p.Order;\r
             //List<Order> penOrders = q.ToList();\r
-            //Assert.Greater(penOrders.Count,0,"Expected some orders for product 'Chai'");\r
+            //AssertHelper.Greater(penOrders.Count,0,"Expected some orders for product 'Chai'");\r
 \r
             var q =\r
                 from o in db.Orders\r
@@ -929,7 +929,7 @@ namespace nwind
                 Assert.IsNotNull(co.c.City, "Expected non-null customer city");\r
                 Assert.IsNotNull(co.o, "Expected non-null order");\r
             }\r
-            Assert.Greater(list1.Count, 0, "Expected some orders for London customers");\r
+            AssertHelper.Greater(list1.Count, 0, "Expected some orders for London customers");\r
         }\r
 \r
         [Test]\r
@@ -947,7 +947,7 @@ namespace nwind
                 Assert.IsNotNull(co.c, "Expected non-null customer");\r
                 Assert.IsNotNull(co.o, "Expected non-null order");\r
             }\r
-            Assert.Greater(list1.Count, 0, "Expected some orders for London customers");\r
+            AssertHelper.Greater(list1.Count, 0, "Expected some orders for London customers");\r
         }\r
 \r
         [Test]\r
@@ -962,7 +962,7 @@ namespace nwind
                 where c.City == "London"\r
                 select new { c, o };\r
 \r
-            Assert.Greater(q.ToList().Count, 0, "Expected some orders for London customers");\r
+            AssertHelper.Greater(q.ToList().Count, 0, "Expected some orders for London customers");\r
         }\r
 \r
         [Test]\r
@@ -987,7 +987,7 @@ namespace nwind
 #else\r
             int expectedCount = 2; //Oracle, Mysql: 'Toilet Paper' and 'iPod'\r
 #endif\r
-            Assert.Greater(prods.Count, expectedCount, "Expected couple of products with letter 'p'");\r
+            AssertHelper.Greater(prods.Count, expectedCount, "Expected couple of products with letter 'p'");\r
         }\r
 \r
         [Test]\r
@@ -1002,11 +1002,11 @@ namespace nwind
             ).Take(5);\r
             //var q = db.Products.Where( p=>p.ProductName.Contains("p")).Take(5);\r
             List<Product> prods = q.ToList();\r
-            Assert.Greater(prods.Count, 2, "Expected couple of products with letter 'p'");\r
+            AssertHelper.Greater(prods.Count, 2, "Expected couple of products with letter 'p'");\r
 \r
             var prodID0 = prods[0].ProductID;\r
             var prodID1 = prods[1].ProductID;\r
-            Assert.Greater(prodID0, prodID1, "Sorting is broken");\r
+            AssertHelper.Greater(prodID0, prodID1, "Sorting is broken");\r
         }\r
 \r
         [Test]\r
index 8d8c325cbec773aba06c7b293d75553ace8c292b..fe7a675318132bfcbb66b452cc5e859e594b00b1 100644 (file)
@@ -136,7 +136,7 @@ using Id = System.Int32;
         {\r
             var q = from p in db.Products select p;\r
             int productCount = q.Count();\r
-            Assert.Greater(productCount, 0, "Expected non-zero product count");\r
+            AssertHelper.Greater(productCount, 0, "Expected non-zero product count");\r
         }\r
 \r
         [Test]\r
@@ -144,7 +144,7 @@ using Id = System.Int32;
         {\r
             var q = from p in db.Products select p.ProductID;\r
             int productCount = q.Count();\r
-            Assert.Greater(productCount, 0, "Expected non-zero product count");\r
+            AssertHelper.Greater(productCount, 0, "Expected non-zero product count");\r
             Console.WriteLine();\r
         }\r
         [Test]\r
@@ -152,7 +152,7 @@ using Id = System.Int32;
         {\r
             var q = from p in db.Products select p.ProductID;\r
             int productCount = q.Count(i => i < 3);\r
-            Assert.Greater(productCount, 0, "Expected non-zero product count");\r
+            AssertHelper.Greater(productCount, 0, "Expected non-zero product count");\r
             Assert.IsTrue(productCount < 4, "Expected product count < 3");\r
         }\r
 \r
@@ -161,7 +161,7 @@ using Id = System.Int32;
         {\r
             var q = from p in db.Products select p.ProductID;\r
             var maxID = q.Max();\r
-            Assert.Greater(maxID, 0, "Expected non-zero product count");\r
+            AssertHelper.Greater(maxID, 0, "Expected non-zero product count");\r
         }\r
 \r
         [Test]\r
@@ -169,7 +169,7 @@ using Id = System.Int32;
         {\r
             var q = from p in db.Products select p.ProductID;\r
             var minID = q.Min();\r
-            Assert.Greater(minID, 0, "Expected non-zero product count");\r
+            AssertHelper.Greater(minID, 0, "Expected non-zero product count");\r
         }\r
 \r
 #if !ORACLE // picrap: this test causes an internal buffer overflow when marshaling with oracle win32 driver\r
@@ -179,7 +179,7 @@ using Id = System.Int32;
         {\r
             var q = from p in db.Products select p.ProductID;\r
             double avg = q.Average();\r
-            Assert.Greater(avg, 0, "Expected non-zero productID average");\r
+            AssertHelper.Greater(avg, 0, "Expected non-zero productID average");\r
         }\r
 \r
 #endif\r
@@ -268,7 +268,7 @@ using Id = System.Int32;
             var q4 = from p in db.Products select p.ProductName + p.ProductID;\r
             //var q4 = from p in db.Products select p.ProductID;\r
             var q5 = q4.ToList();\r
-            Assert.Greater(q5.Count, 2, "Expected to see some concat strings");\r
+            AssertHelper.Greater(q5.Count, 2, "Expected to see some concat strings");\r
             foreach (string s0 in q5)\r
             {\r
                 bool startWithLetter = Char.IsLetter(s0[0]);\r
@@ -288,7 +288,7 @@ using Id = System.Int32;
                      select p.ProductName+p.ProductID;\r
             //var q4 = from p in db.Products select p.ProductID;\r
             //var q5 = q4.ToList();\r
-            Assert.Greater( q4.Count(), 2, "Expected to see some concat strings");\r
+            AssertHelper.Greater( q4.Count(), 2, "Expected to see some concat strings");\r
             foreach(string s0 in q4)\r
             {\r
                 bool startWithLetter = Char.IsLetter(s0[0]);\r
@@ -312,8 +312,8 @@ using Id = System.Int32;
                                           CustomerID = c.CustomerID\r
                                       });\r
             var list = q.ToList();\r
-            Assert.Greater(list.Count(), 0, "Expected list");\r
-            //Assert.Greater(list.Count(), 0, "Expected list");\r
+            AssertHelper.Greater(list.Count(), 0, "Expected list");\r
+            //AssertHelper.Greater(list.Count(), 0, "Expected list");\r
             Assert.Ignore("test passed but: theoretically constructions of entity types are not allowed");\r
         }\r
 \r
@@ -331,8 +331,8 @@ using Id = System.Int32;
             //this OrderBy clause messes up the SQL statement\r
             var q2 = q.OrderBy(c => c.CustomerID);\r
             var list = q2.ToList();\r
-            Assert.Greater(list.Count(), 0, "Expected list");\r
-            //Assert.Greater(list.Count(), 0, "Expected list");\r
+            AssertHelper.Greater(list.Count(), 0, "Expected list");\r
+            //AssertHelper.Greater(list.Count(), 0, "Expected list");\r
         }\r
 \r
 \r
@@ -344,7 +344,7 @@ using Id = System.Int32;
                     orderby c.ContactName ?? ""\r
                     select c;\r
             var list = q.ToList();\r
-            Assert.Greater(list.Count(), 0, "Expected list");\r
+            AssertHelper.Greater(list.Count(), 0, "Expected list");\r
         }\r
 \r
         [Test(Description = "Non-dynamic version of DL5_NestedObjectSelect")]\r
index 4d87952ed79e63e09cf587601e842cb2db2a6728..9ff4496ee8bbb3dd413af5a111b6ac3d835a8087 100644 (file)
@@ -231,10 +231,10 @@ using nwind;
                      select new { g.Key, OrderCount = g.Count() };\r
 \r
             var lst = q2.ToList();\r
-            Assert.Greater(lst.Count, 0, "Expected some grouped order results");\r
+            AssertHelper.Greater(lst.Count, 0, "Expected some grouped order results");\r
             var result0 = lst[0];\r
             Assert.IsTrue(result0.Key != null, "Key must be non-null");\r
-            Assert.Greater(result0.OrderCount, 0, "Count must be > 0");\r
+            AssertHelper.Greater(result0.OrderCount, 0, "Count must be > 0");\r
             //select new { g.Key , SumPerCustomer = g.Sum(o2=>o2.OrderID) };\r
         }\r
 \r
@@ -252,10 +252,10 @@ using nwind;
                      select new { g.Key, OrderCount = g.Count() };\r
 \r
             var lst = q2.ToList();\r
-            Assert.Greater(lst.Count, 0, "Expected some grouped order results");\r
+            AssertHelper.Greater(lst.Count, 0, "Expected some grouped order results");\r
             var result0 = lst[0];\r
             Assert.IsTrue(result0.Key != null, "Key must be non-null");\r
-            Assert.Greater(result0.OrderCount, 0, "Count must be > 0");\r
+            AssertHelper.Greater(result0.OrderCount, 0, "Count must be > 0");\r
             //select new { g.Key , SumPerCustomer = g.Sum(o2=>o2.OrderID) };\r
         }\r
 \r
@@ -272,12 +272,12 @@ using nwind;
                      //where g.Count()>1\r
                      select new { g.Key, OrderSum = g.Sum(o => o.OrderID) };\r
             var lst = q2.ToList();\r
-            Assert.Greater(lst.Count, 0, "Expected some grouped order results");\r
+            AssertHelper.Greater(lst.Count, 0, "Expected some grouped order results");\r
             foreach (var result in lst)\r
             {\r
                 Console.WriteLine("  Result: custID=" + result.Key + " sum=" + result.OrderSum);\r
                 Assert.IsTrue(result.Key != null, "Key must be non-null");\r
-                Assert.Greater(result.OrderSum, 0, "OrderSum must be > 0");\r
+                AssertHelper.Greater(result.OrderSum, 0, "OrderSum must be > 0");\r
             }\r
             //select new { g.Key , SumPerCustomer = g.Sum(o2=>o2.OrderID) };\r
         }\r
index 0c58ea44d4cbefd5efec0dffd7a9f2b588702477..48e0020e30fc8e9cb3334fc7167ff4e0619e0773 100644 (file)
@@ -331,7 +331,7 @@ using nwind;
             decimal[] d = new decimal[] { 1, 4, 5, 6, 10248, 10255 };\r
             var q = db.OrderDetails.Where(o => d.Contains(o.OrderID));\r
 \r
-            Assert.Greater(q.Count(), 0);\r
+            AssertHelper.Greater(q.Count(), 0);\r
         }\r
 \r
 \r
index 3d1981a405db66e0839c904a66b8ae41945fdf60..dabe2f12a7819a833252d38b3ec60a713d51995a 100644 (file)
@@ -265,7 +265,7 @@ using DbLinq.Data.Linq;
 \r
 \r
             var list = query.ToList();\r
-            Assert.Greater(list.Count, 0);\r
+            AssertHelper.Greater(list.Count, 0);\r
         }\r
 \r
 #if !DEBUG && SQLITE\r
@@ -299,7 +299,7 @@ using DbLinq.Data.Linq;
 \r
 \r
             var list = query.ToList();\r
-            Assert.Greater(list.Count, 0);\r
+            AssertHelper.Greater(list.Count, 0);\r
         }\r
 \r
 \r
@@ -334,7 +334,7 @@ using DbLinq.Data.Linq;
 \r
 \r
             var list = query.ToList();\r
-            Assert.Greater(list.Count, 0);\r
+            AssertHelper.Greater(list.Count, 0);\r
         }\r
 \r
 #if !DEBUG && (SQLITE || MSSQL)\r
@@ -354,7 +354,7 @@ using DbLinq.Data.Linq;
             \r
 \r
             var list = query.ToList();\r
-            Assert.Greater(list.Count, 0);\r
+            AssertHelper.Greater(list.Count, 0);\r
         }\r
 \r
 #if !DEBUG && SQLITE\r
@@ -388,7 +388,7 @@ using DbLinq.Data.Linq;
 \r
 \r
             var list = query.ToList();\r
-            Assert.Greater(list.Count, 0);\r
+            AssertHelper.Greater(list.Count, 0);\r
         }\r
 \r
 #if !DEBUG && SQLITE\r
@@ -410,7 +410,7 @@ using DbLinq.Data.Linq;
 \r
             var list = query.ToList();\r
 \r
-            Assert.Greater(list.Count, 0);\r
+            AssertHelper.Greater(list.Count, 0);\r
         }\r
 \r
 #if !DEBUG && POSTGRES\r
@@ -443,7 +443,7 @@ using DbLinq.Data.Linq;
 \r
                 var list = query.ToList();\r
 \r
-                Assert.Greater(list.Count, 0);\r
+                AssertHelper.Greater(list.Count, 0);\r
             }\r
             finally\r
             {\r
@@ -481,7 +481,7 @@ using DbLinq.Data.Linq;
 \r
                 var list = query.ToList();\r
 \r
-                Assert.Greater(list.Count, 0);\r
+                AssertHelper.Greater(list.Count, 0);\r
             }\r
             finally\r
             {\r
index 40503fed4f534d09174c598ac28f34299f5234b4..16a0b0a7ba0b478dd10b0d763fce6ab91634f70a 100644 (file)
@@ -53,7 +53,7 @@ using nwind;
         {\r
             var db = CreateDB();\r
             var customer = db.Customers.First();\r
-            Assert.Greater(customer.Orders.Count, 0);\r
+            AssertHelper.Greater(customer.Orders.Count, 0);\r
         }\r
 \r
 #if !DEBUG && (SQLITE || (MSSQL && !L2SQL))\r
@@ -65,7 +65,7 @@ using nwind;
             var db = CreateDB();\r
             var results = (from c in db.Customers select c.Orders).ToList();\r
 \r
-            Assert.Greater(results.Count, 0);\r
+            AssertHelper.Greater(results.Count, 0);\r
         }\r
 \r
         [Test]\r
@@ -98,7 +98,7 @@ using nwind;
             var db = CreateDB();\r
             var customer = db.Customers.First();\r
 \r
-            Assert.Greater(customer.Orders.Count, 0, "#1");\r
+            AssertHelper.Greater(customer.Orders.Count, 0, "#1");\r
             Assert.IsTrue(customer.Orders.HasLoadedOrAssignedValues, "#2");\r
             customer.Orders.SetSource(System.Linq.Enumerable.Empty<Order>());\r
         }\r
@@ -136,7 +136,7 @@ using nwind;
             int ordersCount = (from cust in db.Customers\r
                                select cust.Orders.Count).First();\r
 \r
-            Assert.Greater(ordersCount, 0);\r
+            AssertHelper.Greater(ordersCount, 0);\r
 \r
             var customer2 = db.Customers.First();\r
             customer2.Orders.SetSource(System.Linq.Enumerable.Empty<Order>());\r
@@ -154,11 +154,11 @@ using nwind;
             var c = db.Customers.First();\r
 \r
             int beforeCount = c.Orders.Count;\r
-            Assert.Greater(beforeCount, 0);\r
+            AssertHelper.Greater(beforeCount, 0);\r
             c.Orders.Clear();\r
             Assert.AreEqual(c.Orders.Count, 0);\r
             c.Orders.AddRange(db.Orders);\r
-            Assert.Greater(c.Orders.Count, beforeCount);\r
+            AssertHelper.Greater(c.Orders.Count, beforeCount);\r
             db.Refresh(RefreshMode.OverwriteCurrentValues, c.Orders);\r
 \r
             Assert.AreEqual(c.Orders.Count, beforeCount);\r
@@ -174,13 +174,13 @@ using nwind;
             var c = db.Customers.First();\r
 \r
             int beforeCount = c.Orders.Count;\r
-            Assert.Greater(beforeCount, 0);\r
+            AssertHelper.Greater(beforeCount, 0);\r
             c.Orders.Clear();\r
             Assert.AreEqual(c.Orders.Count, 0);\r
             c.Orders.AddRange(db.Orders);\r
 \r
             int middleCount = c.Orders.Count;\r
-            Assert.Greater(c.Orders.Count, beforeCount);\r
+            AssertHelper.Greater(c.Orders.Count, beforeCount);\r
 \r
             db.Refresh(RefreshMode.KeepCurrentValues, c.Orders);\r
             Assert.AreEqual(c.Orders.Count, middleCount);\r
@@ -233,7 +233,7 @@ using nwind;
         {\r
             var db = CreateDB();\r
             var customer = db.Customers.Where(c => c.Orders.Count > 0).First();\r
-            Assert.Greater(customer.Orders.Count, 0);\r
+            AssertHelper.Greater(customer.Orders.Count, 0);\r
             bool ok;\r
             System.ComponentModel.ListChangedEventArgs args = null;\r
             customer.Orders.ListChanged += delegate(object sender, System.ComponentModel.ListChangedEventArgs a) \r
index f792f8e585fb0e173c1d07d5553c36dfbc050535..e32291198abae2c9f7e5920020984dceb129f7a0 100644 (file)
@@ -86,10 +86,10 @@ using nwind;
             foreach (var c in q)\r
             {\r
                 Assert.IsNotNull(c.CustomerID);\r
-                Assert.Greater(c.OrderCount, -1);\r
+                AssertHelper.Greater(c.OrderCount, -1);\r
                 count++;\r
             }\r
-            Assert.Greater(count, 0);\r
+            AssertHelper.Greater(count, 0);\r
         }\r
 \r
         [Test]\r
@@ -103,10 +103,10 @@ using nwind;
             foreach (var v in q)\r
             {\r
                 Assert.IsNotNull(v.c.CustomerID);\r
-                Assert.Greater(v.OrderCount, -1);\r
+                AssertHelper.Greater(v.OrderCount, -1);\r
                 count++;\r
             }\r
-            Assert.Greater(count, 0);\r
+            AssertHelper.Greater(count, 0);\r
         }\r
 \r
         [Test]\r
@@ -121,7 +121,7 @@ using nwind;
                 Assert.IsTrue(c.CustomerID!=null, "Non-null customerID required");\r
                 count++;\r
             }\r
-            Assert.Greater(count, 0);\r
+            AssertHelper.Greater(count, 0);\r
         }\r
 #endif\r
     }\r
index 3aa1c9e1b6f1484b396c8124c6b95cc4e8c97d3d..08ed664f1b3c16cfeab659b9a61fe7cdd0ffc967 100644 (file)
@@ -161,7 +161,7 @@ using nwind;
             var customer = new Customer();\r
             db.Customers.Attach(customer, originalCustomer);\r
 \r
-            Assert.Greater(db.Customers.GetModifiedMembers(customer).Count(), 0);\r
+            AssertHelper.Greater(db.Customers.GetModifiedMembers(customer).Count(), 0);\r
         }\r
 \r
 #if !DEBUG && (SQLITE || POSTGRES || (MSSQL && !L2SQL))\r
index a30b2cff6a41dd2dac870107118fdb4dfee07e77..11fe0098a2a8b3e20d57fe91c44beb1da793ab69 100644 (file)
@@ -165,7 +165,7 @@ using Id = System.Int32;
             newProd.QuantityPerUnit = "33 1/2";\r
             db.Products.InsertOnSubmit(newProd);\r
             db.SubmitChanges();\r
-            Assert.Greater(newProd.ProductID, 0, "After insertion, ProductID should be non-zero");\r
+            AssertHelper.Greater(newProd.ProductID, 0, "After insertion, ProductID should be non-zero");\r
             //Assert.IsFalse(newProd.IsModified, "After insertion, Product.IsModified should be false");\r
             return (int)newProd.ProductID; //this test cab be used from delete tests\r
         }\r
@@ -180,7 +180,7 @@ using Id = System.Int32;
         public void G2_DeleteTest()\r
         {\r
             int insertedID = insertProduct_priv();\r
-            Assert.Greater(insertedID, 0, "DeleteTest cannot operate if row was not inserted");\r
+            AssertHelper.Greater(insertedID, 0, "DeleteTest cannot operate if row was not inserted");\r
 \r
             Northwind db = CreateDB();\r
 \r
@@ -200,7 +200,7 @@ using Id = System.Int32;
         public void G3_DeleteTest()\r
         {\r
             int insertedID = insertProduct_priv();\r
-            Assert.Greater(insertedID, 0, "DeleteTest cannot operate if row was not inserted");\r
+            AssertHelper.Greater(insertedID, 0, "DeleteTest cannot operate if row was not inserted");\r
 \r
             Northwind db = CreateDB();\r
 \r
index 2fbdeb16c8ad740a5f0c178bec74bbcd05adc3e7..1357f253347fb5c49ff34958f600f70b6b374b9a 100644 (file)
@@ -34,9 +34,6 @@
 using NUnit.Framework;
 using System;
 using System.Data;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Data
 {
index 2875dc0a1090f8bfa9dafb2ce0a061c0dcce8c15..37a12abcffdbe9947dd367e41a5d3e6b6483cde1 100644 (file)
@@ -34,9 +34,6 @@
 using NUnit.Framework;
 using System;
 using System.Data;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Data
 {
index 7da3dca21f0b2db64186b45234732d8366561c5c..9ba7870e7e083ed90baebe989724d1a7c96515d0 100644 (file)
@@ -30,9 +30,6 @@
 using NUnit.Framework;
 using System;
 using System.Data;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Data
 {
index 63d75f2c410a66a8f479cc1d57059168a7be79a3..f020a208e6f65e4e0c0eb416cf1aa587e7e4de4f 100644 (file)
@@ -34,9 +34,6 @@
 using NUnit.Framework;\r
 using System;\r
 using System.Data;\r
-#if !MOBILE\r
-using NUnit.Framework.SyntaxHelpers;\r
-#endif\r
 \r
 namespace MonoTests.System.Data\r
 {\r
index 2be7b264d09d432d6411966d0ded3330209fe21c..b1f4d2d1b7c6815e0cc5d0ffb3f2c2da69361597 100644 (file)
@@ -33,9 +33,6 @@
 using NUnit.Framework;
 using System;
 using System.Data;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Data
 {
index 83e8ca47378f06ef7acdd6c3eb3dfa366abf4e94..4b7cf62280f8cf5ee961798a8d2ddc8f541ff3a8 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 ../../../build/common/Locale.cs
 ../System.Drawing/gdipEnums.cs    
 ../System.Drawing/gdipFunctions.cs
index 9848565605712e7fde336a7da9279d79c3dca56e..061d5e3ed70610688872b141a512f2e2fdeb3944 100644 (file)
@@ -38,9 +38,6 @@ using System.Drawing.Text;
 using System.Drawing.Imaging;\r
 using DrawingTestHelper;\r
 using System.IO;\r
-#if !MONOTOUCH\r
-using  NUnit.Framework.SyntaxHelpers;\r
-#endif\r
 \r
 namespace Test.Sys.Drawing.GraphicsFixtures {\r
        #region GraphicsFixtureProps\r
index ff09e03824c327e865236b5a4b8568bdfb3bd3a6..8aae7d9e602904bd3c5b2c4e181e210051db3ffb 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 System.Runtime.Remoting.Channels.Tcp/TcpChannelTest.cs
 ServerObject.cs
 ContextsTest.cs
index 831c69e72b54f79b0b9b454ec152261ea9864cc1..45f76791b7cf6841752a917937f876b03e70b52e 100644 (file)
@@ -78,7 +78,7 @@ namespace MonoTests.Remoting
                        IpcServerChannel chan = new IpcServerChannel (channelName, portName);
                        string[] uris = chan.GetUrlsForUri ("server.rem");
                        Assert.IsNotNull (uris);
-                       Assert.Greater (uris.Length, 0);
+                       AssertHelper.Greater (uris.Length, 0);
 
                        bool found = false;
                        foreach (string s in uris) {
@@ -101,7 +101,7 @@ namespace MonoTests.Remoting
                        IpcChannel chan = new IpcChannel (props, null, null);
                        string[] uris = chan.GetUrlsForUri ("server.rem");
                        Assert.IsNotNull (uris);
-                       Assert.Greater (uris.Length, 0);
+                       AssertHelper.Greater (uris.Length, 0);
 
                        bool found = false;
                        foreach (string s in uris) {
index 7a3834dd93c94c871a4c0cbd973d0ea053c1a6b6..cda78a94112d9d0ccba703a3516833a184940830 100644 (file)
@@ -38,9 +38,6 @@ using System.Runtime.Serialization;
 using System.ServiceModel;
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Runtime.Serialization
 {
index 6a9b66a6485cfa4b050f788b6ced91d33a28ae9c..9f4c6e14fd7dbcbc1009dd4866209cdd9cc15508 100644 (file)
@@ -44,7 +44,6 @@ using System.Xml.Serialization;
 using Microsoft.CSharp;
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
-using NUnit.Framework.SyntaxHelpers;
 
 using QName = System.Xml.XmlQualifiedName;
 
index bee52d3e4f896eb4a66a1f00b47fe8b14c7b33b4..7e86906afe3b68b833efa3f65e439a6c9ebdd379 100644 (file)
@@ -43,7 +43,6 @@ using System.Xml.Serialization;
 using Microsoft.CSharp;
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
-using NUnit.Framework.SyntaxHelpers;
 
 using QName = System.Xml.XmlQualifiedName;
 
index d06cb33fe21c43bca6002a04358d3c9f0c28bbe9..c788a402138e04da469f0701d7f16f5e10fdcd91 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 NUnitMoonHelper.cs
 FeatureBased/Features.Client/AsyncCallTesterProxy.cs
 FeatureBased/Features.Client/AsyncPatternServer.cs
index b85b9f02f4cabc7f0e9893114b241ac472fe3dd0..d9b75a637c6a31ccbab67c50bd422f522e0aaf47 100644 (file)
@@ -37,7 +37,6 @@ using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
-using NUnit.Framework.SyntaxHelpers;
 
 using QName = System.Xml.XmlQualifiedName;
 using WS = System.Web.Services.Description;
index 3bd64b70dedce02d94b06b2bc65c923ab133c830..a4cbb9cd3eeaec39c008895366358e6a1369a4ce 100644 (file)
@@ -36,7 +36,6 @@ using WS = System.Web.Services.Description;
 
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace MonoTests.System.ServiceModel.MetadataTests {
 
index f43655c573616811d5c737923109c124ff68edec..6262109c1169a09a5cd0235f4a543030c185db48 100644 (file)
@@ -34,7 +34,6 @@ using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
-using NUnit.Framework.SyntaxHelpers;
 
 using WS = System.Web.Services.Description;
 
index 3a92db121d5f92b59acc561e9478754899d6638b..4da65c703a524f6083cc7aaac19ca97f9d44f09c 100644 (file)
@@ -34,7 +34,6 @@ using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace MonoTests.System.ServiceModel.MetadataTests {
        
index f6656e5c7d9603377dd5858ecc08c32db865c4e8..1e5c270d988b57f7c15dab049c81c37097cf54a5 100644 (file)
@@ -34,7 +34,6 @@ using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
-using NUnit.Framework.SyntaxHelpers;
 
 using WS = System.Web.Services.Description;
 
index 19560b9315095ec4183d79f33e2af1de49fe1114..2acf8f04b81cbaca4b5eeff56d230438f4853c66 100644 (file)
@@ -34,7 +34,6 @@ using System.ServiceModel.Description;
 using System.Text;
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
-using NUnit.Framework.SyntaxHelpers;
 
 using TextElement = System.ServiceModel.Channels.TextMessageEncodingBindingElement;
 using BinaryElement = System.ServiceModel.Channels.BinaryMessageEncodingBindingElement;
index 6a85bfc9e8d22ac0068c5de552aa2012bbecaf92..23c4a7ed6b86a121e5d3aaf0a8fd216fca5748e0 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 System.ServiceProcess/ServiceBaseTest.cs
 System.ServiceProcess/ServiceControllerTest.cs
 System.ServiceProcess/ServiceControllerPermissionAttributeTest.cs
index bec9f30a1884947be265b146bcbe9a14ad3d76e3..46953497fd3b0669a9f1d3339492d34c64df71ba 100644 (file)
@@ -131,7 +131,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
                        Assert.IsTrue (transform.Post (1));
                        Assert.IsTrue (transform.Post (2));
 
-                       Assert.GreaterOrEqual (scheduler.ExecuteAll (), 1);
+                       AssertHelper.GreaterOrEqual (scheduler.ExecuteAll (), 1);
 
                        Assert.AreEqual (2, Volatile.Read (ref n));
                }
@@ -154,7 +154,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
                        Assert.IsTrue (transform.Post (1));
                        Assert.IsTrue (transform.Post (2));
 
-                       Assert.GreaterOrEqual (scheduler.ExecuteAll (), 1);
+                       AssertHelper.GreaterOrEqual (scheduler.ExecuteAll (), 1);
 
                        Assert.AreEqual (2, Volatile.Read (ref n));
                }
@@ -177,7 +177,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
 
                        Assert.IsFalse (transform.Post (101));
 
-                       Assert.GreaterOrEqual (scheduler.ExecuteAll (), 1);
+                       AssertHelper.GreaterOrEqual (scheduler.ExecuteAll (), 1);
 
                        Assert.IsFalse (transform.Post (102));
 
index 6d87932058401cac0c2528c0ed6da421068ea900..087385c2ffc4f9e009a6d4815195fc2a9229cdc6 100644 (file)
@@ -90,7 +90,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
                                var queue = new ConcurrentQueue<Tuple<int, int>> ();
                                var block = factory (queue);
 
-                               Assert.IsEmpty (queue);
+                               CollectionAssert.IsEmpty (queue);
 
                                for (int i = 0; i < 100; i++)
                                        block.Post (i);
@@ -170,15 +170,15 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
 
                                options = new ExecutionDataflowBlockOptions { MaxDegreeOfParallelism = 2 };
                                foreach (var taskIds in GetTaskIdsForExecutionsOptions (options))
-                                       Assert.LessOrEqual (CalculateDegreeOfParallelism (taskIds), 2);
+                                       AssertHelper.LessOrEqual (CalculateDegreeOfParallelism (taskIds), 2);
 
                                options = new ExecutionDataflowBlockOptions { MaxDegreeOfParallelism = 4 };
                                foreach (var taskIds in GetTaskIdsForExecutionsOptions (options))
-                                       Assert.LessOrEqual (CalculateDegreeOfParallelism (taskIds), 4);
+                                       AssertHelper.LessOrEqual (CalculateDegreeOfParallelism (taskIds), 4);
 
                                options = new ExecutionDataflowBlockOptions { MaxDegreeOfParallelism = -1 };
                                foreach (var taskIds in GetTaskIdsForExecutionsOptions (options))
-                                       Assert.LessOrEqual (CalculateDegreeOfParallelism (taskIds), taskIds.Length);
+                                       AssertHelper.LessOrEqual (CalculateDegreeOfParallelism (taskIds), taskIds.Length);
                        }
                }
 
@@ -187,7 +187,7 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
                {
                        var options = new ExecutionDataflowBlockOptions ();
                        foreach (var taskIds in GetTaskIdsForExecutionsOptions (options))
-                               Assert.GreaterOrEqual (taskIds.Distinct ().Count (), 1);
+                               AssertHelper.GreaterOrEqual (taskIds.Distinct ().Count (), 1);
 
                        options = new ExecutionDataflowBlockOptions { MaxMessagesPerTask = 1 };
                        foreach (var taskIds in GetTaskIdsForExecutionsOptions (options))
@@ -195,11 +195,11 @@ namespace MonoTests.System.Threading.Tasks.Dataflow {
 
                        options = new ExecutionDataflowBlockOptions { MaxMessagesPerTask = 2 };
                        foreach (var taskIds in GetTaskIdsForExecutionsOptions (options))
-                               Assert.GreaterOrEqual (taskIds.Distinct ().Count (), taskIds.Length / 2);
+                               AssertHelper.GreaterOrEqual (taskIds.Distinct ().Count (), taskIds.Length / 2);
 
                        options = new ExecutionDataflowBlockOptions { MaxMessagesPerTask = 4 };
                        foreach (var taskIds in GetTaskIdsForExecutionsOptions (options))
-                               Assert.GreaterOrEqual (taskIds.Distinct ().Count (), taskIds.Length / 4);
+                               AssertHelper.GreaterOrEqual (taskIds.Distinct ().Count (), taskIds.Length / 4);
                }
 
                [Test]
index f619c25efb836f13b1917d0271c2844403b5ec34..f32bc20456515cea6467d80232e18634c236aacd 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 ../../System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/crc32.cs
 ../../System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/Header.cs
 ../../System.Web/Test/mainsoft/MainsoftWebTest/HtmlAgilityPack/HtmlAttribute.cs
index 4398b8bf4f5e42b01efb1a3b3c26b6736fbc2f97..76d1ccedb1844c876fff735f6fa3b7cfd1e5e07c 100644 (file)
@@ -647,7 +647,7 @@ namespace MonoTests.System.Web.DynamicData
                        // Custom with UIHint attribute
                        mc = t.GetColumn ("CustomColumn2");
                        Assert.IsNotNull (mc.UIHint, "#A2");
-                       Assert.Greater (mc.UIHint.Length, 0, "#A2-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#A2-1");
 
                        // Proves that UIHint on the column is not used, just the uiHint argument
                        AssertExtensions.Throws<InvalidOperationException> (() => {
@@ -669,7 +669,7 @@ namespace MonoTests.System.Web.DynamicData
                        // Custom with UIHint attribute
                        mc = t.GetColumn ("CustomColumn4");
                        Assert.IsNotNull (mc.UIHint, "#A4");
-                       Assert.Greater (mc.UIHint.Length, 0, "#A4-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#A4-1");
 
                        // Proves that UIHint on the column is not used, just the uiHint argument
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null), "#A4-2");
@@ -686,7 +686,7 @@ namespace MonoTests.System.Web.DynamicData
 
                        mc = t.GetColumn ("DateTimeColumn2");
                        Assert.IsNotNull (mc.UIHint, "#B2");
-                       Assert.Greater (mc.UIHint.Length, 0, "#B2-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#B2-1");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "DateTime.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null), "#B2-3");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "DateTime.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, String.Empty), "#B2-4");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "DateTime.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "Boolean.ascx"), "#B2-5");
@@ -701,7 +701,7 @@ namespace MonoTests.System.Web.DynamicData
 
                        mc = t.GetColumn ("DateColumn2");
                        Assert.IsNotNull (mc.UIHint, "#C2");
-                       Assert.Greater (mc.UIHint.Length, 0, "#C2-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#C2-1");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null), "#C2-3");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, String.Empty), "#C2-4");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "Boolean.ascx"), "#C2-5");
@@ -715,7 +715,7 @@ namespace MonoTests.System.Web.DynamicData
 
                        mc = t.GetColumn ("DateColumn4");
                        Assert.IsNotNull (mc.UIHint, "#C4");
-                       Assert.Greater (mc.UIHint.Length, 0, "#C4-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#C4-1");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null), "#C4-3");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, String.Empty), "#C4-4");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "Boolean.ascx"), "#C4-5");
@@ -730,7 +730,7 @@ namespace MonoTests.System.Web.DynamicData
 
                        mc = t.GetColumn ("TimeColumn2");
                        Assert.IsNotNull (mc.UIHint, "#D2");
-                       Assert.Greater (mc.UIHint.Length, 0, "#D2-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#D2-1");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null), "#D2-3");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, String.Empty), "#D2-4");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "Boolean.ascx"), "#D2-5");
@@ -745,7 +745,7 @@ namespace MonoTests.System.Web.DynamicData
 
                        mc = t.GetColumn ("DurationColumn2");
                        Assert.IsNotNull (mc.UIHint, "#E2");
-                       Assert.Greater (mc.UIHint.Length, 0, "#E2-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#E2-1");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null), "#E2-3");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, String.Empty), "#E2-4");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "Boolean.ascx"), "#E2-5");
@@ -760,7 +760,7 @@ namespace MonoTests.System.Web.DynamicData
 
                        mc = t.GetColumn ("PhoneNumberColumn2");
                        Assert.IsNotNull (mc.UIHint, "#F2");
-                       Assert.Greater (mc.UIHint.Length, 0, "#F2-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#F2-1");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null), "#F2-3");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, String.Empty), "#F2-4");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "Boolean.ascx"), "#F2-5");
@@ -775,7 +775,7 @@ namespace MonoTests.System.Web.DynamicData
 
                        mc = t.GetColumn ("CurrencyColumn2");
                        Assert.IsNotNull (mc.UIHint, "#G2");
-                       Assert.Greater (mc.UIHint.Length, 0, "#G2-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#G2-1");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null), "#G2-3");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, String.Empty), "#G2-4");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "Boolean.ascx"), "#G2-5");
@@ -790,7 +790,7 @@ namespace MonoTests.System.Web.DynamicData
 
                        mc = t.GetColumn ("TextColumn2");
                        Assert.IsNotNull (mc.UIHint, "#H2");
-                       Assert.Greater (mc.UIHint.Length, 0, "#H2-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#H2-1");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null), "#H2-3");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, String.Empty), "#H2-4");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "Boolean.ascx"), "#H2-5");
@@ -805,7 +805,7 @@ namespace MonoTests.System.Web.DynamicData
 
                        mc = t.GetColumn ("HtmlColumn2");
                        Assert.IsNotNull (mc.UIHint, "#I2");
-                       Assert.Greater (mc.UIHint.Length, 0, "#I2-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#I2-1");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null), "#I2-3");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, String.Empty), "#I2-4");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "Boolean.ascx"), "#I2-5");
@@ -820,7 +820,7 @@ namespace MonoTests.System.Web.DynamicData
 
                        mc = t.GetColumn ("MultilineTextColumn2");
                        Assert.IsNotNull (mc.UIHint, "#J2");
-                       Assert.Greater (mc.UIHint.Length, 0, "#J2-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#J2-1");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null), "#J2-3");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, String.Empty), "#J2-4");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "Boolean.ascx"), "#J2-5");
@@ -835,7 +835,7 @@ namespace MonoTests.System.Web.DynamicData
 
                        mc = t.GetColumn ("EmailAddressColumn2");
                        Assert.IsNotNull (mc.UIHint, "#K2");
-                       Assert.Greater (mc.UIHint.Length, 0, "#K2-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#K2-1");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null), "#K2-3");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, String.Empty), "#K2-4");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "Boolean.ascx"), "#K2-5");
@@ -850,7 +850,7 @@ namespace MonoTests.System.Web.DynamicData
 
                        mc = t.GetColumn ("PasswordColumn2");
                        Assert.IsNotNull (mc.UIHint, "#L2");
-                       Assert.Greater (mc.UIHint.Length, 0, "#L2-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#L2-1");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null), "#L2-3");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, String.Empty), "#L2-4");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "Boolean.ascx"), "#L2-5");
@@ -865,7 +865,7 @@ namespace MonoTests.System.Web.DynamicData
 
                        mc = t.GetColumn ("UrlColumn2");
                        Assert.IsNotNull (mc.UIHint, "#M2");
-                       Assert.Greater (mc.UIHint.Length, 0, "#M2-1");
+                       AssertHelper.Greater (mc.UIHint.Length, 0, "#M2-1");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, null), "#M2-3");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, String.Empty), "#M2-4");
                        Assert.AreEqual (ftf.TemplateFolderVirtualPath + "Text.ascx", ftf.GetFieldTemplateVirtualPath (mc, DataBoundControlMode.ReadOnly, "Boolean.ascx"), "#M2-5");
index 09bd670bd4d091650ebc39a84c89dd0aecf45ae7..47a1fa4a8dedb246bb0f5720262453c766a8b67f 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 Test/standalone-tests/Consts.cs
 Test/standalone-tests/Locations.cs
 Test/standalone-tests/OutputCacheProvider.cs
index 4416f5a698b9262d036092092c23f1b41e3585a4..70593c25d06a0d72c3314d40fad9d64d4688b7a0 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 ../../System.Web.DynamicData/Test/Common/AssertExtensions.cs
 mainsoft/MainsoftWebTest/HtmlAgilityPack/AssemblyInfo.cs
 mainsoft/MainsoftWebTest/HtmlAgilityPack/crc32.cs
index 22f3996e76bde65974fdc6873edf26fa350da26f..e240e4355ff5dc3e47b72d8ef5ec25369c05886e 100644 (file)
@@ -77,13 +77,13 @@ namespace MonoTests.System.Web.Hosting {
                        Assert.IsNull (HostingEnvironment.InitializationException, "During:InitializationException");
                        Assert.IsTrue (HostingEnvironment.IsHosted, "During:IsHosted");
                        Assert.IsNotNull (HostingEnvironment.ApplicationID, "During:ApplicationID:Null");
-                       Assert.IsNotEmpty (HostingEnvironment.ApplicationID, "During:ApplicationID:Empty");
+                       AssertHelper.IsNotEmpty (HostingEnvironment.ApplicationID, "During:ApplicationID:Empty");
                        Assert.IsNotNull (HostingEnvironment.ApplicationPhysicalPath, "During:ApplicationPhysicalPath:Null");
-                       Assert.IsNotEmpty (HostingEnvironment.ApplicationPhysicalPath, "During:ApplicationPhysicalPath:Empty");
+                       AssertHelper.IsNotEmpty (HostingEnvironment.ApplicationPhysicalPath, "During:ApplicationPhysicalPath:Empty");
                        Assert.IsNotNull (HostingEnvironment.ApplicationVirtualPath, "During:ApplicationVirtualPath:Null");
-                       Assert.IsNotEmpty (HostingEnvironment.ApplicationVirtualPath, "During:ApplicationVirtualPath:Empty");
+                       AssertHelper.IsNotEmpty (HostingEnvironment.ApplicationVirtualPath, "During:ApplicationVirtualPath:Empty");
                        Assert.IsNotNull (HostingEnvironment.SiteName, "During:SiteName:Null");
-                       Assert.IsNotEmpty (HostingEnvironment.SiteName, "During:SiteName:Empty");
+                       AssertHelper.IsNotEmpty (HostingEnvironment.SiteName, "During:SiteName:Empty");
                        Assert.IsNotNull (HostingEnvironment.Cache, "During:Cache");
                        Assert.AreEqual (ApplicationShutdownReason.None, HostingEnvironment.ShutdownReason, "During:ShutdownReason");
                        Assert.IsNotNull (HostingEnvironment.VirtualPathProvider, "During:VirtualPathProvider");
index 2ce8621aec4781a1245a02df3114d4f7c8d3b030..0342a707978e4971ebe73e3217ea353d9be06a79 100644 (file)
@@ -547,7 +547,7 @@ namespace MonoTests.System.Web {
 
                        KnownResponseHeader known;
 
-                       Assert.LessOrEqual (1, f.KnownResponseHeaders.Count, "#B1");
+                       AssertHelper.LessOrEqual (1, f.KnownResponseHeaders.Count, "#B1");
 
                        known = (KnownResponseHeader)f.KnownResponseHeaders ["Content-Type"];
                        Assert.AreEqual (HttpWorkerRequest.HeaderContentType, known.Index, "#B2");
@@ -571,7 +571,7 @@ namespace MonoTests.System.Web {
 
                        KnownResponseHeader known;
 
-                       Assert.LessOrEqual (1, f.KnownResponseHeaders.Count, "#B1");
+                       AssertHelper.LessOrEqual (1, f.KnownResponseHeaders.Count, "#B1");
 
                        known = (KnownResponseHeader)f.KnownResponseHeaders ["Content-Type"];
                        Assert.AreEqual (HttpWorkerRequest.HeaderContentType, known.Index, "#B2");
index 23487dacb07c844cc0fc2046b631820a1ba1d34b..73c5c75bb2c29ba36d618e41e1da91a03cf51702 100644 (file)
@@ -148,7 +148,7 @@ namespace MonoTests.System.Web
                        provider.DoAddNode (node, rootNode);
 
                        Assert.IsNotNull (provider.CallTrace, "#A1");
-                       Assert.Greater (provider.CallTrace.Length, 1, "#A1-1");
+                       AssertHelper.Greater (provider.CallTrace.Length, 1, "#A1-1");
                        Assert.AreEqual (provider.CallTrace[0].Name, "BuildSiteMap", "#A1-2");
                }
 
@@ -247,7 +247,7 @@ namespace MonoTests.System.Web
                        Assert.IsNotNull (provider.RootNode, "#A1");
                        Assert.AreEqual (provider.RootNode.Provider, provider, "#A2");
                        Assert.IsNotNull (provider.CallTrace, "#A3");
-                       Assert.Greater (provider.CallTrace.Length, 1, "#A3-1");
+                       AssertHelper.Greater (provider.CallTrace.Length, 1, "#A3-1");
                        Assert.AreEqual ("BuildSiteMap", provider.CallTrace[0].Name, "#A3-2");
                        Assert.AreEqual ("get_RootNode", provider.CallTrace[1].Name, "#A3-3");
                }
index f336b1537be36e1a8975e7fe1d530d1e8fe23f6f..884953ac3dd9e06e8d460a54b70cbc646b84ebbd 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 ../../../build/common/Consts.cs
 System.Windows.Forms/ApplicationTest.cs
 System.Windows.Forms/AutoCompleteStringCollectionTest.cs
index d0e3fc1bd3d8315e2dfd49e19881ce93b76d0590..0414fa18e710249b0d7c4f2a74448c8cfb4bce69 100644 (file)
@@ -47,7 +47,7 @@ namespace MonoTests.System.Resources {
 
                        Assert.IsNotNull (returnedNode, "#A1");
                        object val = returnedNode.GetValue (new ReturnSerializableSubClassITRS ());
-                       Assert.IsNotInstanceOfType (typeof (serializableSubClass), val, "#A2");
+                       AssertHelper.IsNotInstanceOfType (typeof (serializableSubClass), val, "#A2");
                        Assert.IsInstanceOfType (typeof (serializable), val, "#A3");
                }
 
@@ -84,7 +84,7 @@ namespace MonoTests.System.Resources {
                        node = GetNodeFileRefToSerializable ("ser.bbb",true);
 
                        object val = node.GetValue (new ReturnSerializableSubClassITRS ());
-                       Assert.IsNotInstanceOfType (typeof (serializableSubClass), val, "#A1");
+                       AssertHelper.IsNotInstanceOfType (typeof (serializableSubClass), val, "#A1");
                        Assert.IsInstanceOfType (typeof (serializable), val, "#A2");
                }
 
index 8ca5f4eb574d131270e3a12297929e39a02f9f86..3c0fc3beaaff338c0fa31e85244079d349c433da 100644 (file)
@@ -90,7 +90,7 @@ namespace MonoTests.System.Resources {
                        // get value passing no params
                        object val = returnedNode.GetValue ((ITypeResolutionService) null);
                        Assert.IsInstanceOfType (typeof (serializable), val, "#A2");
-                       Assert.IsNotInstanceOfType (typeof (serializableSubClass), val, "#A3");
+                       AssertHelper.IsNotInstanceOfType (typeof (serializableSubClass), val, "#A3");
 
                        //get value type passing different params
                        string newType = returnedNode.GetValueTypeName (new ReturnSerializableSubClassITRS ());
index d27d4439bb680fdf7c9f9aa919c08de6694f3f3c..ffd3711a8c298212c8d3af3d1ff8feaff2235e0e 100644 (file)
@@ -50,10 +50,10 @@ namespace MonoTests.System.Resources {
 
                        object defaultVal = returnedNode.GetValue ((ITypeResolutionService) null);
                        Assert.IsInstanceOfType (typeof (serializable), defaultVal, "#A2");
-                       Assert.IsNotInstanceOfType (typeof (serializableSubClass), defaultVal, "#A3");
+                       AssertHelper.IsNotInstanceOfType (typeof (serializableSubClass), defaultVal, "#A3");
 
                        object newVal = returnedNode.GetValue (new ReturnSerializableSubClassITRS ());
-                       Assert.IsNotInstanceOfType (typeof (serializableSubClass), newVal, "#A4");
+                       AssertHelper.IsNotInstanceOfType (typeof (serializableSubClass), newVal, "#A4");
                        Assert.IsInstanceOfType (typeof (serializable), newVal, "#A5");
                }
 
@@ -88,7 +88,7 @@ namespace MonoTests.System.Resources {
 
                        // get value passing null params
                        object val = returnedNode.GetValue ((ITypeResolutionService) null);
-                       // Assert.IsNotInstanceOfType (typeof (serializable), val, "#A5"); this would fail as subclasses are id-ed as instances of parents
+                       // AssertHelper.IsNotInstanceOfType (typeof (serializable), val, "#A5"); this would fail as subclasses are id-ed as instances of parents
                        Assert.IsInstanceOfType (typeof (serializableSubClass), val, "#A4");
                }
 
index 3a6cfbda95ad293b920e005e167a955b932c697c..5c6d1a960cc56f9f898cbe9f857433d9d5ef4b9b 100644 (file)
@@ -314,7 +314,7 @@ namespace MonoTests.System.Resources {
 
                        object o = node.GetValue ((AssemblyName []) null);
 
-                       Assert.IsNotInstanceOfType (typeof (serializableSubClass), o, "#A2");
+                       AssertHelper.IsNotInstanceOfType (typeof (serializableSubClass), o, "#A2");
                        Assert.IsInstanceOfType (typeof (serializable), o, "#A3");
                        rr.Close ();
                }
index 6c69a328a088f11f3a44bdb27dd44fdc74194928..9bfe7b1b416b192272f84c49492d78bb8aa94516 100644 (file)
@@ -252,7 +252,7 @@ namespace MonoTests.System.Resources {
                        Assert.IsNotNull (finalNode, "#A3");
 
                        object finalVal = finalNode.GetValue ((ITypeResolutionService) null);
-                       Assert.IsNotInstanceOfType (typeof (serializableSubClass), finalVal, "#A4");
+                       AssertHelper.IsNotInstanceOfType (typeof (serializableSubClass), finalVal, "#A4");
                        Assert.IsInstanceOfType (typeof (serializable), finalVal, "#A5");
                }
 
index acade5f6933827a5755cc1f7758ddf32ab6c3bac..18271cfba2d479509548c2ce1b963ad781bb4ca4 100644 (file)
@@ -946,10 +946,10 @@ namespace MonoTests.System.Windows.Forms
                        Assert.AreEqual (31, p.GetRowHeights ()[0], "D1");\r
                        Assert.AreEqual (31, p.GetRowHeights ()[1], "D2");\r
                        Assert.AreEqual (81, p.GetColumnWidths ()[0], "D3");\r
-                       Assert.LessOrEqual (75, p.GetColumnWidths ()[1], "D4");\r
-                       Assert.GreaterOrEqual (78, p.GetColumnWidths ()[1], "D5");\r
-                       Assert.LessOrEqual (78, p.GetColumnWidths ()[2], "D6");\r
-                       Assert.GreaterOrEqual (81, p.GetColumnWidths ()[2], "D7");\r
+                       AssertHelper.LessOrEqual (75, p.GetColumnWidths ()[1], "D4");\r
+                       AssertHelper.GreaterOrEqual (78, p.GetColumnWidths ()[1], "D5");\r
+                       AssertHelper.LessOrEqual (78, p.GetColumnWidths ()[2], "D6");\r
+                       AssertHelper.GreaterOrEqual (81, p.GetColumnWidths ()[2], "D7");\r
                }\r
                \r
                [Test]\r
@@ -1702,7 +1702,7 @@ namespace MonoTests.System.Windows.Forms
                        Assert.AreEqual (4, tlp.RowCount, "X18638-1");\r
                        Assert.AreEqual (3, tlp.ColumnCount, "X18638-2");\r
                        Assert.AreEqual (60, widths[0], "X18638-3");\r
-                       Assert.Greater (label2.Width, widths[1], "X18638-5");\r
+                       AssertHelper.Greater (label2.Width, widths[1], "X18638-5");\r
                        Assert.AreEqual (45, widths[2], "X18638-4");\r
                }\r
 \r
index 693d4a2e296436b7c6c4cc7a24c97a727acd6c46..67efb6025e6504d6830210c54bb1fa53b28dbe70 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 System.Xml.Linq/ExtensionsTest.cs
 System.Xml.Linq/XAttributeTest.cs
 System.Xml.Linq/XCommentTest.cs
index da577e644effc0f851c9617fa46466d4140a3c4a..bbbf42e13f5d5a1b9374221ec8f40308bd423432 100644 (file)
@@ -220,8 +220,8 @@ namespace MonoTests.System.Xml.Schema
                                }
                        }
 
-                       Assert.GreaterOrEqual (afterNoOfAttributes, beforeNoOfAttributes, "newAttributes");
-                       Assert.GreaterOrEqual (afterNoOfElements, beforeNoOfElements, "newElements");       
+                       AssertHelper.GreaterOrEqual (afterNoOfAttributes, beforeNoOfAttributes, "newAttributes");
+                       AssertHelper.GreaterOrEqual (afterNoOfElements, beforeNoOfElements, "newElements");       
                }
 
                /*
index 6ec32758faf518b7194ff3462876a81e2fc0610b..24351699070af87a50754ae78540b810f07e5f66 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 Microsoft.CSharp/CodeGeneratorFromCompileUnitTest.cs
 Microsoft.CSharp/CodeGeneratorFromExpressionTest.cs
 Microsoft.CSharp/CodeGeneratorFromNamespaceTest.cs
index c6ccdf0a26ab1e81b475f0a646aaf63296196b3e..823204cf4867366cebc2cd86bffcdeb601dfa29c 100644 (file)
@@ -53,7 +53,7 @@ namespace MonoTests.System.CodeDom.Compiler
                        int importPosition = result.IndexOf (IMPORT);
                        int attributePosition = result.IndexOf (ATTRIBUTE);
 
-                       Assert.Greater (attributePosition, importPosition, "Actual order: " + result);
+                       AssertHelper.Greater (attributePosition, importPosition, "Actual order: " + result);
                }
 
                [Test]
index b6baac08e8546b092a48cb849ec3fc9debb3a37b..6586c4c092f9c554eae94a7f1bb7a62ba03bb79c 100644 (file)
@@ -38,9 +38,6 @@ using System.Text;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 using NUnit.Framework;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Collections.Generic
 {
index 820e84d2a89326a2ffe8a5de07f2403b4f0e7d37..07195bb9246a85a71c758c528406365828b7e7f8 100644 (file)
@@ -53,7 +53,7 @@ namespace MonoTests.System.Diagnostics
                public void ConstructorNullName ()
                {
                        SourceSwitch s = new SourceSwitch (null);
-                       Assert.IsEmpty (s.DisplayName);
+                       AssertHelper.IsEmpty (s.DisplayName);
                }
 
                [Test]
index 9d97fc8b53c615a8589e7fbea1a8cdc0d030038e..d8821a00c2ddbb42d380e3c49437300be24eac11 100644 (file)
@@ -190,8 +190,8 @@ namespace MonoTests.System.Diagnostics {
                public void NullSwitchHasEmptyDisplayNameAndDescription ()
                {
                        var s = new TestNullSwitch ();
-                       Assert.IsEmpty (s.DisplayName);
-                       Assert.IsEmpty (s.Description);
+                       AssertHelper.IsEmpty (s.DisplayName);
+                       AssertHelper.IsEmpty (s.Description);
                }
        }
 }
index 927528aa2960f68f2974b8f22c8f14feb23731c5..0d885863e40dca27d28abfe999b709dd9758961a 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 WebMatrix.Data/ConnectionEventArgsTests.cs
 WebMatrix.Data/DynamicRecordTests.cs
 ../WebMatrix.Data/DynamicRecord.cs
index 64a199a988f901a3ee633c09c67cb3375e7ac439..620b1628eb850d629601e5a21e78704235dde29f 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 System.Collections.ObjectModel/ObservableCollectionTest.cs
 System.Collections.ObjectModel/ReadOnlyObservableCollectionTest.cs
 System.Collections.Specialized/NotifyCollectionChangedEventArgsTest.cs
index f02a6a7db40e47092dc2b446e020f1dc3992c20f..4ac94d59e1f5ca9594b4cc959290a306015c8506 100644 (file)
@@ -4,10 +4,6 @@ using System.Text;
 using NUnit.Framework;
 using Mono;
 
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
-
 namespace MonoTests.Mono {
 
        [TestFixture]
index 70c250d015da682354eb25b303d108380f06759e..75b2de89aac8ac5b700f448ecc8bc970d3bfea0c 100644 (file)
@@ -32,9 +32,6 @@ using System.Collections.Concurrent;
 
 using NUnit;
 using NUnit.Framework;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Collections.Concurrent
 {
index 9cd2d1e11136e2e8cb6841595af01cb0ba7f71e9..4bf774937d5221a767dc1194876eb9e059c817b8 100644 (file)
@@ -30,9 +30,6 @@ using System.Collections.Generic;
 using System.Collections.Concurrent;
 
 using NUnit.Framework;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Collections.Concurrent
 {
index bf93320e26b9e8abf86b0adc6626960ea76ebcbf..7a0e837cacfc57b227f0c351720ca13007dae4b6 100644 (file)
@@ -9,7 +9,6 @@ using System;
 using System.Security.AccessControl;
 using System.Security.Principal;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace MonoTests.System.Security.AccessControl {
 
index f35a9d3883062cb04a0eaeeeff65f3ef43dc9116..ea6380d0977fc398fd018736c7ce5ec3fa2a386d 100644 (file)
@@ -10,10 +10,6 @@ using System.Text;
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
 
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
-
 namespace MonoTests.System.Text
 {
        [TestFixture]
index 903a6946a08163a08687381b77d54f21000ed0d7..94f191a121a4ea80b70c6ae0cf7877824992eb7c 100644 (file)
@@ -30,9 +30,6 @@ using System.Threading;
 using System.Threading.Tasks;
 
 using NUnit.Framework;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Threading.Tasks
 {
index 94d36a131e5ab550770551e7dc0f2d2cffd3163b..1af618d3336965aa43958c7f0370abdf5412cc0e 100644 (file)
@@ -35,9 +35,6 @@ using System.Threading.Tasks;
 using System.Collections.Generic;
 
 using NUnit.Framework;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Threading.Tasks
 {
index 0ca7f49f474c9c6fb8407df5eb41a663090a62c3..803b10c15eb9d4384b89465ad77d1d190bde275e 100644 (file)
@@ -32,9 +32,6 @@ using System.Threading;
 using System.Threading.Tasks;
 
 using NUnit.Framework;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Threading.Tasks
 {
index e8130bc06fd5cf8bac6fc0e3dd06b7d81e841f9e..001f4d454cd80c1b8a9e9c8ea2c921c2bc620e52 100644 (file)
@@ -29,9 +29,6 @@ using System.Threading.Tasks;
 using System.Collections.Generic;
 
 using NUnit.Framework;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Threading.Tasks
 {
index f4e8a9705f78e0beeacafc11313de8475cea8a30..07bd1fe0b56adeee0f7b15ad2b3221e9b307954d 100644 (file)
@@ -34,10 +34,6 @@ using System.Threading.Tasks;
 using System.Collections.Generic;
 using NUnit.Framework;
 
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
-
 namespace MonoTests.System.Threading.Tasks
 {
        [TestFixture]
index 8c063dccdc879ca860f78b88fe19806d97ff35bf..b65d150bb581ffb8625456b9525fcab3a28d67c1 100644 (file)
@@ -29,9 +29,6 @@ using System.Threading;
 
 using NUnit;
 using NUnit.Framework;
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
 
 namespace MonoTests.System.Threading
 {
index bf3beb47200ad653a5b441ec06d6a6eca21142d9..c4d0bd82fc9f6df28b133379d2db582b68de251d 100644 (file)
@@ -15,10 +15,6 @@ using System.Threading;
 
 using NUnit.Framework;
 
-#if !MOBILE
-using NUnit.Framework.SyntaxHelpers;
-#endif
-
 namespace MonoTests.System
 {
        [TestFixture]
index bc43d92b9202a4dd44bdfb2a61ad24b4f04e4e2a..4e444a37efa54a3462c548504d90a02f096fddb2 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 Microsoft.Win32/RegistryKeyTest.cs
 Mono/DataConvertTest.cs
 ../Mono/DataConverter.cs
index 9af81920a16b972c3d4f02f72597a4ba1d85e24d..fa3ffe15ac50e4eeb370f879d42c8af6ccfa69d8 100644 (file)
@@ -47,7 +47,7 @@ namespace MonoTests.Monodoc.Generators
                {
                        var xml = rootTree.RenderUrl ("T:System.String", generator);
                        Assert.IsNotNull (xml);
-                       Assert.IsNotEmpty (xml);
+                       AssertHelper.IsNotEmpty (xml);
                        AssertValidXml (xml);
                        AssertEcmaFullTypeName (xml, "System.String");
                }
@@ -57,7 +57,7 @@ namespace MonoTests.Monodoc.Generators
                {
                        var xml = rootTree.RenderUrl ("T:System.Int32", generator);
                        Assert.IsNotNull (xml);
-                       Assert.IsNotEmpty (xml);
+                       AssertHelper.IsNotEmpty (xml);
                        AssertValidXml (xml);
                        AssertEcmaFullTypeName (xml, "System.Int32");
                }
index 867c9b793898dfb675e3aa05f15da5df70e6ec4c..29da7513704aead3d9f0d098a5b02d737c99e847 100644 (file)
@@ -85,7 +85,7 @@ namespace MonoTests.Monodoc
 
                        // HACK: in reality we have currently 4 known issues which are due to duplicated namespaces across
                        // doc sources, something that was never supported and that we need to improve/fix at some stage
-                       Assert.LessOrEqual (4, errorCount, errorCount + " / " + testCount.ToString ());
+                       AssertHelper.LessOrEqual (4, errorCount, errorCount + " / " + testCount.ToString ());
                }
 
                IEnumerable<Node> GetLeaves (Node node)
index 29ac108da8d5f2db0e007e42b6c721f3116f97fa..fc6bf8da18afd209240b12ab87373ec2b2c57ef5 100644 (file)
@@ -17,7 +17,7 @@ namespace MonoTests.Monodoc
                {
                        // the docPath variable is the only one we know for sure should exist
                        Assert.IsNotNull (Config.Get ("docPath"));
-                       Assert.IsNotEmpty (Config.Get ("docPath"));
+                       AssertHelper.IsNotEmpty (Config.Get ("docPath"));
                }
        }
 }
index b806b8fb6e970302dd755c331a070e831781639a..a3f19b731a01371628deab21a6efcb1866c0df76 100644 (file)
@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 Monodoc/HelpSourceTests.cs
 Monodoc/EcmaDocTests.cs
 Monodoc/TreeTest.cs
diff --git a/mcs/class/test-helpers/NunitHelpers.cs b/mcs/class/test-helpers/NunitHelpers.cs
new file mode 100644 (file)
index 0000000..7ae0ef8
--- /dev/null
@@ -0,0 +1,102 @@
+using System.IO;
+using System.Collections;
+using NUnit.Framework.Constraints;
+
+namespace NUnit.Framework
+{
+       static class CollectionAssert
+       {
+               public static void DoesNotContain (IEnumerable collection, object val)
+               {
+                        Assert.That(collection, Has.No.Member(val));
+               }
+
+               public static void Contains (IEnumerable collection, object val)
+               {
+                        Assert.That(collection, Has.Member(val));
+               }
+
+               public static void AreEqual (IEnumerable expected, IEnumerable actual, string message = null, params object[] args) 
+               {
+                       Assert.That(actual, Is.EqualTo(expected), message, args);
+               }
+
+               public static void AreEquivalent (IEnumerable expected, IEnumerable actual, string message = null, params object[] args) 
+               {
+                       Assert.That(actual, Is.EquivalentTo(expected), message, args);
+               }
+
+               public static void IsEmpty(IEnumerable collection, string message = null, params object[] args)
+               {
+                       Assert.That(collection, new EmptyCollectionConstraint(), message, args);
+               }
+       }
+
+       static class FileAssert
+       {
+               public static void AreEqual(Stream expected, Stream actual, string message, params object[] args)
+               {
+                       Assert.That(actual, Is.EqualTo(expected), message, args);
+               }
+
+               public static void AreEqual(string expected, string actual, string message, params object[] args)
+               {
+                       using (FileStream exStream = File.OpenRead(expected))
+                       using (FileStream acStream = File.OpenRead(actual))
+                       {
+                               AreEqual(exStream, acStream, message, args);
+                       }
+               }
+       }
+
+       static class StringAssert
+       {
+               public static void Contains(string expected, string actual, string message = null, params object[] args)
+               {
+                       Assert.That(actual, Is.StringContaining (expected), message, args);
+               }
+
+               public static void StartsWith(string expected, string actual, string message = null, params object[] args)
+               {
+                       Assert.IsTrue (actual.StartsWith (expected), message, args);
+               }
+       }
+
+       static class AssertHelper
+       {
+               public static void IsEmpty (string aString, string message = null, params object[] args )
+               {
+                       Assert.That(aString, Is.Empty, message, args);
+               }
+
+               public static void IsNotEmpty (string aString, string message = null, params object[] args )
+               {
+                       Assert.That(aString, Is.Not.Empty, message, args);
+               }
+
+               public static void Greater(int arg1, int arg2, string message = null, params object[] args) 
+               {
+                       Assert.That(arg1, Is.GreaterThan(arg2), message, args);
+               }
+
+               public static void GreaterOrEqual(int arg1, int arg2, string message = null, params object[] args)
+               {
+                       Assert.That(arg1, Is.GreaterThanOrEqualTo(arg2), message, args);
+               }
+
+               public static void GreaterOrEqual(long arg1, long arg2, string message = null, params object[] args)
+               {
+                       Assert.That(arg1, Is.GreaterThanOrEqualTo(arg2), message, args);
+               }
+
+               public static void LessOrEqual (int arg1, int arg2, string message = null, params object[] args)
+               {
+                       Assert.That(arg1, Is.LessThanOrEqualTo(arg2), message, args);
+               }
+
+               public static void IsNotInstanceOfType(System.Type expected, object actual, string message, params object[] args )
+               {
+                       Assert.IsFalse (actual.GetType ().IsInstanceOfType (expected), message, args);
+               }
+       }
+}