2004-09-14 Rafael Teixeira <rafaelteixeirabr@hotmail.com>

	* UtilsTest.cs: upgraded to use nunit Assert class, also corrected testing for null that
	  was giving an exception when run.

svn path=/trunk/mcs/; revision=33881

diff --git a/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ChangeLog b/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ChangeLog
index e7579b0b94ff75c6364b00d3f6837a368f30d8c8..c8e3c9b67179eb4af41dca8d4ac76847f5df3449 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ChangeLog
+++ b/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-14  Rafael Teixeira <rafaelteixeirabr@hotmail.com> 
+       * UtilsTest.cs: upgraded to use nunit Assert class, also corrected testing for null that 
+         was giving an exception when run.
+         
 2004-01-21  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
        * Added UtilsTest.cs:
                More tests (with bidimensional arrays) for Utils.CopyArray undocumented runtime function,

diff --git a/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/UtilsTest.cs b/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/UtilsTest.cs
index 6181cfc81abdb52ddf0c79bfee179bc3937ec849..7734d9ad858599113c2f3ea52a32eb4b8e51c517 100755 (executable)
--- a/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/UtilsTest.cs
+++ b/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/UtilsTest.cs
@@ -36,7 +36,7 @@ namespace MonoTests.Microsoft.VisualBasic.CompilerServices
 {\r
 \r
        [TestFixture]\r
-       public class UtilsTest : Assertion {\r
+       public class UtilsTest {\r
                \r
                [SetUp]\r
                public void GetReady() {}\r
@@ -49,9 +49,9 @@ namespace MonoTests.Microsoft.VisualBasic.CompilerServices
                        string[] source = new string[] { "First", "Second", "Third" };
                        string[] destination = new string[2];
                        string[] result = (string[])Utils.CopyArray(source, destination);
-                       AssertEquals ("ResultIsDestination", destination, result);\r
-                       AssertEquals ("First", source[0], destination[0]);\r
-                       AssertEquals ("Second", source[1], destination[1]);\r
+                       Assert.AreSame (destination, result, "ResultIsDestination");\r
+                       Assert.AreEqual (source[0], destination[0], "First");\r
+                       Assert.AreEqual (source[1], destination[1], "Second");\r
                }\r
 
                [Test]\r
@@ -59,10 +59,10 @@ namespace MonoTests.Microsoft.VisualBasic.CompilerServices
                        string[] source = new string[] { "First", "Second" };
                        string[] destination = new string[3];
                        string[] result = (string[])Utils.CopyArray(source, destination);
-                       AssertEquals ("ResultIsDestination", destination, result);\r
-                       AssertEquals ("First", source[0], destination[0]);\r
-                       AssertEquals ("Second", source[1], destination[1]);\r
-                       AssertEquals ("EmptyThird", null, destination[2]);\r
+                       Assert.AreSame (destination, result, "ResultIsDestination");\r
+                       Assert.AreEqual (source[0], destination[0], "First");\r
+                       Assert.AreEqual (source[1], destination[1], "Second");\r
+                       Assert.IsNull (destination[2], "EmptyThird");\r
                }\r
        \r
                [Test]\r
@@ -74,9 +74,9 @@ namespace MonoTests.Microsoft.VisualBasic.CompilerServices
                        source[1,1] = "Fourth";
                        string[,] destination = new string[2,1];
                        string[,] result = (string[,])Utils.CopyArray(source, destination);
-                       AssertEquals ("ResultIsDestination", destination, result);\r
-                       AssertEquals ("First", source[0,0], destination[0,0]);\r
-                       AssertEquals ("Third", source[1,0], destination[1,0]);\r
+                       Assert.AreSame (destination, result, "ResultIsDestination");\r
+                       Assert.AreEqual (source[0,0], destination[0,0], "First");\r
+                       Assert.AreEqual (source[1,0], destination[1,0], "Third");\r
                }\r
 
                [Test]\r
@@ -88,13 +88,13 @@ namespace MonoTests.Microsoft.VisualBasic.CompilerServices
                        source[1,1] = "Fourth";
                        string[,] destination = new string[2,3];
                        string[,] result = (string[,])Utils.CopyArray(source, destination);
-                       AssertEquals ("ResultIsDestination", destination, result);\r
-                       AssertEquals ("First", source[0,0], destination[0,0]);\r
-                       AssertEquals ("Second", source[0,1], destination[0,1]);\r
-                       AssertEquals ("Third", source[1,0], destination[1,0]);\r
-                       AssertEquals ("Fourth", source[1,1], destination[1,1]);\r
-                       AssertEquals ("EmptyFifth", null, destination[0,2]);\r
-                       AssertEquals ("EmptySixth", null, destination[1,2]);\r
+                       Assert.AreSame (destination, result, "ResultIsDestination");\r
+                       Assert.AreEqual (source[0,0], destination[0,0], "First");\r
+                       Assert.AreEqual (source[0,1], destination[0,1], "Second");\r
+                       Assert.AreEqual (source[1,0], destination[1,0], "Third");\r
+                       Assert.AreEqual (source[1,1], destination[1,1], "Fourth");\r
+                       Assert.IsNull (destination[0,2], "EmptyFifth");\r
+                       Assert.IsNull (destination[1,2], "EmptySixth");\r
                }\r
        \r
                // An nice way to test for exceptions the class under test should \r
@@ -106,7 +106,7 @@ namespace MonoTests.Microsoft.VisualBasic.CompilerServices
                        ConcreteCollection myCollection;\r
                        myCollection = new ConcreteCollection();\r
                        ....\r
-                       AssertEquals ("#UniqueID", expected, actual);\r
+                       Assert.AreEqual ("#UniqueID", expected, actual);\r
                        ....\r
                        Fail ("Message");\r
                }\r