Refactor Assert methods

poc/TestOfTestFrameworkByReference/Mock/MockObject.cs

@@ -0,0 +1,6 @@
+namespace NFUnitTest.Mock
+{
+    internal class MockObject
+    {
+    }
+}

poc/TestOfTestFrameworkByReference/NFUnitTestByReference.nfproj

@@ -28,6 +28,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="DataRowTests.cs" />
+    <Compile Include="Mock\MockObject.cs" />
     <Compile Include="SkipFewMethods.cs" />
     <Compile Include="SkipTestClass.cs" />
     <Compile Include="Test.cs" />

source/TestFramework/CollectionAssert.cs

@@ -6,6 +6,7 @@
 
 
 using System.Collections;
+using TestFrameworkShared;
 
 namespace nanoFramework.TestFramework
 {
@@ -33,7 +34,7 @@ public sealed class CollectionAssert
         /// <exception cref=""></exception>
         public static void Empty(ICollection collection, string message = "")
         {
-            Assert.CheckParameterNotNull(collection, "CollectionAssert.Empty", "collection", string.Empty);
+            Assert.EnsureParameterIsNotNull(collection, "CollectionAssert.Empty");
 
             if (collection.Count != 0)
             {
@@ -49,7 +50,7 @@ public static void Empty(ICollection collection, string message = "")
         /// <exception cref="AssertFailedException">Raises an exception if the collection is not empty.</exception>
         public static void NotEmpty(ICollection collection, string message = "")
         {
-            Assert.CheckParameterNotNull(collection, "CollectionAssert.NotEmpty", "collection", string.Empty);
+            Assert.EnsureParameterIsNotNull(collection, "CollectionAssert.NotEmpty");
 
             if (collection.Count == 0)
             {

source/TestFramework/nanoFramework.TestFramework.nfproj

@@ -31,10 +31,19 @@
   </PropertyGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
   <ItemGroup>
+    <Compile Include="Assert.cs" />
+    <Compile Include="Assert.AreEqual.cs">
+      <DependentUpon>Assert.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Assert.AreNotEqual.cs">
+      <DependentUpon>Assert.cs</DependentUpon>
+	</Compile>
+    <Compile Include="Assert.Obsolete.cs">
+      <DependentUpon>Assert.cs</DependentUpon>
+    </Compile>
     <Compile Include="CollectionAssert.cs" />
     <Compile Include="OutputHelper.cs" />
     <Compile Include="TestExtensions.cs" />
-    <Compile Include="Assert.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />

source/TestFrameworkShared/SkipTestException.cs

@@ -9,33 +9,17 @@
 namespace nanoFramework.TestFramework
 {
     /// <summary>
-    /// To skip a test, raise this exception thru the Assert.SkipTest("some message");
+    /// To skip a test, raise this exception through the Assert.SkipTest("some message");
     /// </summary>
     public class SkipTestException : Exception
     {
-        /// <summary>
-        /// Initializes a new instance of the SkipTestException class.
-        /// </summary>
-        public SkipTestException()
-            : base()
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the SkipTestException class with a specified error message.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public SkipTestException(string message)
-            : base(message)
-        { }
-
         /// <summary>
         /// Initializes a new instance of the SkipTestException class with a specified error message
         /// and a reference to the inner SkipTestException that is the cause of this exception. 
         /// </summary>
         /// <param name="message">The message that describes the error.</param>
         /// <param name="innerException"></param>
-        public SkipTestException(string message, Exception innerException)
-            : base(message, innerException)
+        public SkipTestException(string message = null, Exception innerException = null) : base(message, innerException)
         { }
     }
 }