From f8e3f2e629520381f1f5d24bf3c0115789e36bbd Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Wed, 19 Jan 2005 07:11:27 +0000 Subject: [PATCH] 2005-01-19 Atsushi Enomoto * DataRowTest.cs : no need to gather 3 individual tests as RowEditTest. Let's not output to Console. svn path=/trunk/mcs/; revision=39136 --- .../System.Data/Test/System.Data/ChangeLog | 5 +++ .../Test/System.Data/DataRowTest.cs | 32 ++++++++----------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog index fbab39a3ecc..2bf8a39d3c9 100644 --- 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 + + * DataRowTest.cs : no need to gather 3 individual tests as RowEditTest. + Let's not output to Console. + 2005-01-14 Atsushi Enomoto * 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 84e2d5e2da1..517117645d3 100644 --- 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++) { -- 2.25.1