From 315417b16eb50ef117ad01fd39099bd03ca3d5e8 Mon Sep 17 00:00:00 2001 From: Boris Kirzner Date: Sun, 19 Mar 2006 16:32:53 +0000 Subject: [PATCH] Ifdef code that is not supposed to pass in TARGET_JVM by now svn path=/trunk/mcs/; revision=58157 --- mcs/class/System.Data/Test/System.Data.Common/ChangeLog | 6 ++++++ .../System.Data.Common/DBDataPermissionAttributeTest.cs | 2 ++ .../System.Data.Common/DataColumnMappingCollectionTest.cs | 3 +++ .../System.Data.Common/DataTableMappingCollectionTest.cs | 3 +++ mcs/class/System.Data/Test/System.Data/ChangeLog | 6 ++++++ .../Test/System.Data/ConstraintCollectionTest2.cs | 2 +- .../Test/System.Data/DataColumnCollectionTest.cs | 3 +++ .../System.Data/Test/System.Data/DataRowCollectionTest.cs | 4 ++++ .../System.Data/Test/System.Data/DataTableCollectionTest.cs | 3 +++ 9 files changed, 31 insertions(+), 1 deletion(-) diff --git a/mcs/class/System.Data/Test/System.Data.Common/ChangeLog b/mcs/class/System.Data/Test/System.Data.Common/ChangeLog index c8dacb778d2..a515f8583aa 100644 --- a/mcs/class/System.Data/Test/System.Data.Common/ChangeLog +++ b/mcs/class/System.Data/Test/System.Data.Common/ChangeLog @@ -1,3 +1,9 @@ +2006-03-19 Boris Kirzner + + * DataColumnMappingCollectionTest.cs, DataTableMappingCollectionTest.cs, + DBDataPermissionAttributeTest.cs: ifdef code that is not supposed + to work in TARGET_JVM by now. + 2006-02-18 Raja R Harinath * DbConnectionStringBuilderTest.cs diff --git a/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionAttributeTest.cs b/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionAttributeTest.cs index c29f1dd026c..e2b27847e8d 100644 --- a/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionAttributeTest.cs +++ b/mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionAttributeTest.cs @@ -56,7 +56,9 @@ namespace MonoTests.System.Data.Common { public void Default () { DBDataPermissionAttribute a = new NonAbstractDBDataPermissionAttribute (SecurityAction.Assert); +#if !TARGET_JVM Assert.AreEqual (a.ToString (), a.TypeId.ToString (), "TypeId"); +#endif Assert.IsFalse (a.Unrestricted, "Unrestricted"); Assert.IsFalse (a.AllowBlankPassword, "AllowBlankPassword"); Assert.AreEqual (String.Empty, a.ConnectionString, "ConnectionString"); diff --git a/mcs/class/System.Data/Test/System.Data.Common/DataColumnMappingCollectionTest.cs b/mcs/class/System.Data/Test/System.Data.Common/DataColumnMappingCollectionTest.cs index 0d1653eb3fb..d86ea195a82 100644 --- a/mcs/class/System.Data/Test/System.Data.Common/DataColumnMappingCollectionTest.cs +++ b/mcs/class/System.Data/Test/System.Data.Common/DataColumnMappingCollectionTest.cs @@ -376,6 +376,9 @@ namespace MonoTests.System.Data.Common } [Test] +#if TARGET_JVM + [Ignore ("Not works in TARGET_JVM")] +#endif public void ToStringTest() { AssertEquals("test1","System.Data.Common.DataColumnMappingCollection",columnMapCollection.ToString()); diff --git a/mcs/class/System.Data/Test/System.Data.Common/DataTableMappingCollectionTest.cs b/mcs/class/System.Data/Test/System.Data.Common/DataTableMappingCollectionTest.cs index 1112975ff8a..af9c011d470 100644 --- a/mcs/class/System.Data/Test/System.Data.Common/DataTableMappingCollectionTest.cs +++ b/mcs/class/System.Data/Test/System.Data.Common/DataTableMappingCollectionTest.cs @@ -360,6 +360,9 @@ namespace MonoTests.System.Data.Common } [Test] +#if TARGET_JVM + [Ignore ("Not works in TARGET_JVM")] +#endif public void ToStringTest() { AssertEquals("test1","System.Data.Common.DataTableMappingCollection",tableMapCollection.ToString()); diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog index 303bd01bc70..d0e8c600fd4 100644 --- a/mcs/class/System.Data/Test/System.Data/ChangeLog +++ b/mcs/class/System.Data/Test/System.Data/ChangeLog @@ -1,3 +1,9 @@ +2006-03-19 Boris Kirzner + + * ConstraintCollectionTest2.cs, DataColumnCollectionTest.cs, + DataRowCollectionTest.cs, DataTableCollectionTest.cs: ifdef code that is not + supposed to work in TARGET_JVM by now. + 2006-03-09 Senganal T * DataRowCollectionTest2.cs : diff --git a/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest2.cs b/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest2.cs index 64dc1637a8a..355434a28ea 100644 --- a/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest2.cs +++ b/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest2.cs @@ -347,7 +347,7 @@ namespace MonoTests.System.Data TestException( new testExceptionMethodCallback(DataProvider.TryToBreakForigenConstraint),arr); } - void TestException(testExceptionMethodCallback dlg,IList exceptionList) + public void TestException(testExceptionMethodCallback dlg,IList exceptionList) { try { dlg(); diff --git a/mcs/class/System.Data/Test/System.Data/DataColumnCollectionTest.cs b/mcs/class/System.Data/Test/System.Data/DataColumnCollectionTest.cs index e74ac86833a..e2cbc172b1b 100644 --- a/mcs/class/System.Data/Test/System.Data/DataColumnCollectionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/DataColumnCollectionTest.cs @@ -570,6 +570,9 @@ namespace MonoTests.System.Data } [Test] +#if TARGET_JVM + [Ignore ("Not works in TARGET_JVM")] +#endif public void ToStringTest () { DataTable Table = new DataTable ("test_table"); diff --git a/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs b/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs index ddaac4f9c89..10a5d691b27 100644 --- a/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs @@ -112,7 +112,9 @@ namespace MonoTests.System.Data AssertEquals ("test#01", 1, Rows.Count); AssertEquals ("test#02", false, Rows.IsReadOnly); AssertEquals ("test#03", false, Rows.IsSynchronized); +#if !TARGET_JVM AssertEquals ("test#04", "System.Data.DataRowCollection", Rows.ToString ()); +#endif string [] cols = new string [2]; cols [0] = "first"; @@ -124,7 +126,9 @@ namespace MonoTests.System.Data Rows.Add (cols); AssertEquals ("test#05", 3, Rows.Count); +#if !TARGET_JVM AssertEquals ("test#06", "System.Data.DataRow", Rows [0].ToString ()); +#endif AssertEquals ("test#07", DBNull.Value, Rows [0] [0]); AssertEquals ("test#08", DBNull.Value, Rows [0] [1]); AssertEquals ("test#09", "first", Rows [1] [0]); diff --git a/mcs/class/System.Data/Test/System.Data/DataTableCollectionTest.cs b/mcs/class/System.Data/Test/System.Data/DataTableCollectionTest.cs index 05d0eddc7fb..9519896280d 100644 --- a/mcs/class/System.Data/Test/System.Data/DataTableCollectionTest.cs +++ b/mcs/class/System.Data/Test/System.Data/DataTableCollectionTest.cs @@ -348,6 +348,9 @@ namespace MonoTests.System.Data } [Test] +#if TARGET_JVM + [Ignore ("Not works in TARGET_JVM")] +#endif public void ToStringTest() { DataTableCollection tbcol = _dataset[0].Tables; -- 2.25.1