From fa14c7c2cd4565879b941ae0b844656752a486b9 Mon Sep 17 00:00:00 2001
From: dotneteer <none@none>
Date: Sat, 16 Apr 2011 09:15:04 -0700
Subject: [PATCH] Cleaned up the code in NunitAssert

---
 .../VBScriptTest/NunitAssert.cs               | 74 ++++++++++---------
 1 file changed, 39 insertions(+), 35 deletions(-)

diff --git a/aspclassiccompiler/VBScriptTest/NunitAssert.cs b/aspclassiccompiler/VBScriptTest/NunitAssert.cs
index a74b8de..0b84155 100644
--- a/aspclassiccompiler/VBScriptTest/NunitAssert.cs
+++ b/aspclassiccompiler/VBScriptTest/NunitAssert.cs
@@ -12,36 +12,6 @@ namespace Dlrsoft.VBScriptTest
     {
         #region IAssert Members
 
-        [ComVisible(false)]
-        public void AreEqual(object expected, object actual, string message)
-        {
-            Assert.AreEqual(expected, actual, message);
-        }
-
-        [ComVisible(false)]
-        public void AreNotEqual(object notExpected, object actual, string message)
-        {
-            Assert.AreNotEqual(notExpected, actual, message);
-        }
-
-        [ComVisible(false)]
-        public void Fail(string message)
-        {
-            Assert.Fail(message);
-        }
-
-        [ComVisible(false)]
-        public void IsFalse(bool condition, string message)
-        {
-            Assert.IsFalse(condition, message);
-        }
-
-        [ComVisible(false)]
-        public void IsTrue(bool condition, string message)
-        {
-            Assert.IsTrue(condition, message);
-        }
-
         [ComVisible(false)]
         public void AreEqual(object expected, object actual)
         {
@@ -49,7 +19,13 @@ namespace Dlrsoft.VBScriptTest
         }
 
         [ComVisible(false)]
-        public void AreEqual(object expected, object actual, object message)
+        public void AreEqual(object expected, object actual, string message)
+        {
+            Assert.AreEqual(expected, actual, message);
+        }
+
+        [ComVisible(true)]
+        public void AreEqual(object expected, object actual, [Optional]object message)
         {
             if (message == null || message == System.Type.Missing)
                 AreEqual(expected, actual);
@@ -63,7 +39,14 @@ namespace Dlrsoft.VBScriptTest
             Assert.AreNotEqual(notExpected, actual);
         }
 
-        public void AreNotEqual(object notExpected, object actual, object message)
+        [ComVisible(false)]
+        public void AreNotEqual(object notExpected, object actual, string message)
+        {
+            Assert.AreNotEqual(notExpected, actual, message);
+        }
+
+        [ComVisible(true)]
+        public void AreNotEqual(object notExpected, object actual, [Optional]object message)
         {
             if (message == null || message == System.Type.Missing)
                 AreNotEqual(notExpected, actual);
@@ -77,7 +60,14 @@ namespace Dlrsoft.VBScriptTest
             Assert.Fail();
         }
 
-        public void Fail(object message)
+        [ComVisible(false)]
+        public void Fail(string message)
+        {
+            Assert.Fail(message);
+        }
+
+        [ComVisible(true)]
+        public void Fail([Optional]object message)
         {
             if (message == null || message == System.Type.Missing)
                 Fail();
@@ -91,7 +81,14 @@ namespace Dlrsoft.VBScriptTest
             Assert.IsFalse(condition);
         }
 
-        public void IsFalse(bool condition, object message)
+        [ComVisible(false)]
+        public void IsFalse(bool condition, string message)
+        {
+            Assert.IsFalse(condition, message);
+        }
+
+        [ComVisible(true)]
+        public void IsFalse(bool condition, [Optional]object message)
         {
             if (message == null || message == System.Type.Missing)
                 IsFalse(condition);
@@ -105,7 +102,14 @@ namespace Dlrsoft.VBScriptTest
             Assert.IsTrue(condition);
         }
 
-        public void IsTrue(bool condition, object message)
+        [ComVisible(false)]
+        public void IsTrue(bool condition, string message)
+        {
+            Assert.IsTrue(condition, message);
+        }
+
+        [ComVisible(true)]
+        public void IsTrue(bool condition, [Optional]object message)
         {
             if (message == null || message == System.Type.Missing)
                 IsTrue(condition);