diff --git a/aspclassiccompiler/VBScript/Runtime/IAssert.cs b/aspclassiccompiler/VBScript/Runtime/IAssert.cs index ad7063a..74e8672 100644 --- a/aspclassiccompiler/VBScript/Runtime/IAssert.cs +++ b/aspclassiccompiler/VBScript/Runtime/IAssert.cs @@ -1,16 +1,30 @@ using System; using System.Collections.Generic; using System.Text; -using System.Runtime.InteropServices; namespace Dlrsoft.VBScript.Runtime { public interface IAssert { + + void AreEqual(object expected, object actual); + void AreEqual(object expected, object actual, string message); + + void AreNotEqual(object notExpected, object actual); + void AreNotEqual(object notExpected, object actual, string message); + + void Fail(); + void Fail(string message); + + void IsFalse(bool condition); + void IsFalse(bool condition, string message); + + void IsTrue(bool condition); + void IsTrue(bool condition, string message); } } diff --git a/aspclassiccompiler/VBScriptTest/NunitAssert.cs b/aspclassiccompiler/VBScriptTest/NunitAssert.cs index f2cbb64..a74b8de 100644 --- a/aspclassiccompiler/VBScriptTest/NunitAssert.cs +++ b/aspclassiccompiler/VBScriptTest/NunitAssert.cs @@ -12,31 +12,107 @@ 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) + { + Assert.AreEqual(expected, actual); + } + + [ComVisible(false)] + public void AreEqual(object expected, object actual, object message) + { + if (message == null || message == System.Type.Missing) + AreEqual(expected, actual); + else + AreEqual(expected, actual, message.ToString()); + } + + [ComVisible(false)] + public void AreNotEqual(object notExpected, object actual) + { + Assert.AreNotEqual(notExpected, actual); + } + + public void AreNotEqual(object notExpected, object actual, object message) + { + if (message == null || message == System.Type.Missing) + AreNotEqual(notExpected, actual); + else + AreNotEqual(notExpected, actual, message.ToString()); + } + + [ComVisible(false)] + public void Fail() + { + Assert.Fail(); + } + + public void Fail(object message) + { + if (message == null || message == System.Type.Missing) + Fail(); + else + Fail(message.ToString()); + } + + [ComVisible(false)] + public void IsFalse(bool condition) + { + Assert.IsFalse(condition); + } + + public void IsFalse(bool condition, object message) + { + if (message == null || message == System.Type.Missing) + IsFalse(condition); + else + IsFalse(condition, message.ToString()); + } + + [ComVisible(false)] + public void IsTrue(bool condition) + { + Assert.IsTrue(condition); + } + + public void IsTrue(bool condition, object message) + { + if (message == null || message == System.Type.Missing) + IsTrue(condition); + else + IsTrue(condition, message.ToString()); + } + #endregion } }