Merge pull request #1624 from esdrubal/getprocesstimes
[mono.git] / mcs / class / System.Data / Test / System.Data / DataRowTest2.cs
index b928ce302347cfa3e4196f3fb8f916e80fe52eff..4a9e3ca2d47c26ffac2a40d6f2a460817ef5534e 100644 (file)
@@ -1240,14 +1240,6 @@ namespace MonoTests.System.Data
                        Assert.IsNull (colChangeArgs.ProposedValue, "#J3");
                        Assert.AreSame (dt.Rows [0], colChangeArgs.Row, "#J4");
 
-#if ONLY_1_1
-                       evt = (EventInfo) _eventsFired [index++];
-                       Assert.AreEqual ("ColumnChanging", evt.Name, "#K1");
-                       colChangeArgs = (DataColumnChangeEventArgs) evt.Args;
-                       Assert.AreSame (dc1, colChangeArgs.Column, "#K2");
-                       Assert.AreSame (DBNull.Value, colChangeArgs.ProposedValue, "#K3");
-                       Assert.AreSame (dt.Rows [0], colChangeArgs.Row, "#K4");
-#endif
 
                        evt = (EventInfo) _eventsFired [index++];
                        Assert.AreEqual ("ColumnChanged", evt.Name, "#L1");
@@ -2586,7 +2578,7 @@ namespace MonoTests.System.Data
                                drChild.GetParentRows(drl,DataRowVersion.Current); 
                                Assert.Fail("DRW129: failed to throw ArgumentException");
                        }
-                       catch (ArgumentException) {}
+                       catch (InvalidConstraintException) {}
                        catch (AssertionException exc) {throw  exc;}
                        catch (Exception exc)
                        {