Cleaned up the code in NunitAssert

This commit is contained in:
dotneteer 2011-04-16 09:15:04 -07:00
parent 5d1ee01881
commit fa14c7c2cd

View file

@ -12,36 +12,6 @@ namespace Dlrsoft.VBScriptTest
{ {
#region IAssert Members #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)] [ComVisible(false)]
public void AreEqual(object expected, object actual) public void AreEqual(object expected, object actual)
{ {
@ -49,7 +19,13 @@ namespace Dlrsoft.VBScriptTest
} }
[ComVisible(false)] [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) if (message == null || message == System.Type.Missing)
AreEqual(expected, actual); AreEqual(expected, actual);
@ -63,7 +39,14 @@ namespace Dlrsoft.VBScriptTest
Assert.AreNotEqual(notExpected, actual); 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) if (message == null || message == System.Type.Missing)
AreNotEqual(notExpected, actual); AreNotEqual(notExpected, actual);
@ -77,7 +60,14 @@ namespace Dlrsoft.VBScriptTest
Assert.Fail(); 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) if (message == null || message == System.Type.Missing)
Fail(); Fail();
@ -91,7 +81,14 @@ namespace Dlrsoft.VBScriptTest
Assert.IsFalse(condition); 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) if (message == null || message == System.Type.Missing)
IsFalse(condition); IsFalse(condition);
@ -105,7 +102,14 @@ namespace Dlrsoft.VBScriptTest
Assert.IsTrue(condition); 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) if (message == null || message == System.Type.Missing)
IsTrue(condition); IsTrue(condition);