2005-01-19 Atsushi Enomoto <atsushi@ximian.com>

	* DataRowTest.cs : no need to gather 3 individual tests as RowEditTest.
	  Let's not output to Console.

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

diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog
index fbab39a3ecc23bfa909bcc046cccef7e5e315ee1..2bf8a39d3c9a1a97a46fa0cb2d9ede6c972c7a4e 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-19  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * DataRowTest.cs : no need to gather 3 individual tests as RowEditTest.
+         Let's not output to Console.
+
 2005-01-14  Atsushi Enomoto  <atsushi@ximian.com>
 
        * DataViewTest.cs : made AddNew_2() and FindRows() pass under .NET 1.1.

diff --git a/mcs/class/System.Data/Test/System.Data/DataRowTest.cs b/mcs/class/System.Data/Test/System.Data/DataRowTest.cs
index 84e2d5e2da1c26f3cf583758b2a02c18c7276c9d..517117645d344fba9e019019801b0fdadf189141 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataRowTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataRowTest.cs
@@ -121,15 +121,8 @@ namespace MonoTests.System.Data
                         }
                 }
 
-               [Test]
-                public void RowEditTest()
-                {
-                        DeleteRowTest ();
-                        EditModeTest ();
-                        ParentRowTest ();
-                }
-                                                                                                    
-                private void DeleteRowTest ()
+                [Test]
+                public void DeleteRowTest ()
                 {
                         DataRow newRow;
                                                                                                     
@@ -164,7 +157,7 @@ namespace MonoTests.System.Data
                         table.AcceptChanges ();
                         AssertEquals ("#A06", "Name 1", (table.Rows [0]) [1]);
                         try  {
-                                Console.WriteLine (rc [2]);
+                                object o = rc [2];
                                 Fail ("#A07");
                         }
                         catch (Exception e) {
@@ -172,7 +165,8 @@ namespace MonoTests.System.Data
                         }
                 }
 
-                private void EditModeTest ()
+                [Test]
+                public void EditModeTest ()
                 {
                         try {
                                 //Clear all existing values from table
@@ -194,8 +188,8 @@ namespace MonoTests.System.Data
                                 AssertEquals ("#A12", "LName", row [2, DataRowVersion.Current]);
                                                                                                     
                                 try {
-                                        Console.WriteLine (row [1, DataRowVersion.Original]);
-                                        Console.WriteLine (row [1, DataRowVersion.Proposed]);
+                                      object o = row [1, DataRowVersion.Original];
+                                      o = row [1, DataRowVersion.Proposed];
                                         Fail ("#A13");
                                 }
                                 catch (Exception e) {
@@ -215,7 +209,7 @@ namespace MonoTests.System.Data
                                 AssertEquals ("#A18", "LName", row [2, DataRowVersion.Current]);
                                 
                                try {
-                                        Console.WriteLine (row [1, DataRowVersion.Proposed]);
+                                      object o = row [1, DataRowVersion.Proposed];
                                         Fail ("#A19");
                                 }
                                 catch (Exception e) {
@@ -256,7 +250,7 @@ namespace MonoTests.System.Data
                                 AssertEquals ("#A33", "My LName", row [2, DataRowVersion.Current]);
                                                                                                     
                                 try {
-                                        Console.WriteLine (row [1, DataRowVersion.Proposed]);
+                                      object o = row [1, DataRowVersion.Proposed];
                                         Fail ("#A34");
                                 }
                                 catch (Exception e) {
@@ -279,7 +273,7 @@ namespace MonoTests.System.Data
                                                                                                     
                                                                                                     
                                 try {
-                                        Console.WriteLine (row [1, DataRowVersion.Proposed]);
+                                      object o = row [1, DataRowVersion.Proposed];
                                         Fail ("#A42");
                                 }
                                 catch (Exception e) {
@@ -292,10 +286,12 @@ namespace MonoTests.System.Data
                                                                                                     
                         }
                         catch (Exception e){
-                                Console.WriteLine (e + "" + e.StackTrace);
+//                              Console.WriteLine (e + "" + e.StackTrace);
                         }
                 }                                                                                                     
-               private void ParentRowTest (){
+                [Test]
+                public void ParentRowTest ()
+                {
 
                         //Clear all existing values from table
                         for (int i = 0; i < table.Rows.Count; i++) {