updating to the latest module.

[mono.git] / mcs / class / System.Data / Test / System.Data / DataRowCollectionTest.cs

diff --git a/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs b/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs
index 341c0360f82ded80c7578c03be6030a9a3e483db..bff4d7e2fabc63dd6c06e112fdb6810def9edda4 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs
@@ -112,9 +112,7 @@ 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";
@@ -126,9 +124,7 @@ 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]);
@@ -217,40 +213,6 @@ namespace MonoTests.System.Data
                                AssertEquals ("test#28", typeof(ArgumentException), e.GetType ());
                        }
                }
-
-                [Test]
-                public void Add_ByValuesNullTest ()
-                {
-                        DataTable t = new DataTable ("test");
-                        t.Columns.Add ("id", typeof (int));
-                        t.Columns.Add ("name", typeof (string));
-                        t.Columns.Add ("nullable", typeof (string));
-
-                        t.Columns [0].AutoIncrement = true;
-                        t.Columns [0].AutoIncrementSeed = 10;
-                        t.Columns [0].AutoIncrementStep = 5;
-
-                        t.Columns [1].DefaultValue = "testme";
-                        
-
-                        // null test & missing columns
-                        DataRow r = t.Rows.Add (new object [] { null, null});
-                        AssertEquals ("#ABV1", 10, (int) r [0]);
-                        AssertEquals ("#ABV2", "testme", (string) r [1]);
-                        AssertEquals ("#ABV3", DBNull.Value, r [2]);
-
-                        // dbNull test
-                        r = t.Rows.Add (new object [] { DBNull.Value, DBNull.Value, DBNull.Value});
-                        AssertEquals ("#ABV4", DBNull.Value, r [0]);
-                        AssertEquals ("#ABV5", DBNull.Value, r [1]);
-                        AssertEquals ("#ABV6", DBNull.Value, r [2]);
-
-                        // ai test & no default value test
-                        r = t.Rows.Add (new object [] { null, null, null});
-                        AssertEquals ("#ABV7", 15, (int) r [0]);
-                        AssertEquals ("#ABV8", "testme", (string) r [1]);
-                        AssertEquals ("#ABV9", DBNull.Value, r [2]);
-                }
                
                [Test]
                public void Clear ()
@@ -558,37 +520,6 @@ namespace MonoTests.System.Data
                        AssertEquals ("test#17", 1L, row [0]);
                }
                
-               [Test]
-               public void Find2 ()
-               {
-                       DataSet ds = new DataSet ();
-                       ds.EnforceConstraints = false;
-
-                       DataTable dt = new DataTable ();
-                       ds.Tables.Add (dt);
-
-                       DataColumn dc = new DataColumn ("Column A");
-                       dt.Columns.Add (dc);
-
-                       dt.PrimaryKey = new DataColumn [] {dc};
-
-                       DataRow dr = dt.NewRow ();
-                       dr [0] = "a";
-                       dt.Rows.Add (dr);
-
-                       dr = dt.NewRow ();
-                       dr [0] = "b";
-                       dt.Rows.Add (dr);
-
-                       dr = dt.NewRow ();
-                       dr [0] = "c";
-                       dt.Rows.Add (dr);
-
-                       DataRow row = (DataRow) ds.Tables [0].Rows.Find (new object [] {"a"});
-                       
-                       AssertNotNull (row);
-               }
-               
                [Test]
                public void InsertAt ()
                {
@@ -747,47 +678,5 @@ namespace MonoTests.System.Data
                        AssertEquals ("test#18", 1, Rows.Count);
                        AssertEquals ("test#19", "c", Rows [0] [0]);
                }
-
-#if NET_2_0
-               [Test]
-               [Category ("NotWorking")]
-               // IndexOf does not exist in System.Data and is commented-out bellow
-               public void IndexOf () {
-                       DataSet ds = new DataSet ();
-
-                       DataTable dt = new DataTable ();
-                       ds.Tables.Add (dt);
-
-                       DataColumn dc = new DataColumn ("Column A");
-                       dt.Columns.Add (dc);
-
-                       dt.PrimaryKey = new DataColumn[] { dc };
-
-                       DataRow dr1 = dt.NewRow ();
-                       dr1[0] = "a";
-                       dt.Rows.Add (dr1);
-
-                       DataRow dr2 = dt.NewRow ();
-                       dr2[0] = "b";
-                       dt.Rows.Add (dr2);
-
-                       DataRow dr3 = dt.NewRow ();
-                       dr3[0] = "c";
-                       dt.Rows.Add (dr3);
-
-                       DataRow dr4 = dt.NewRow ();
-                       dr4[0] = "d";
-                       dt.Rows.Add (dr4);
-
-                       DataRow dr5 = dt.NewRow ();
-                       dr5[0] = "e";
-
-                       //int index = ds.Tables[0].Rows.IndexOf (dr3);
-                       //AssertEquals ("IndexOf-Yes", 2, index);
-                       
-                       //index = ds.Tables[0].Rows.IndexOf (dr5);
-                       //AssertEquals ("IndexOf-No", -1, index);
-               }
-#endif
        }
 }