Connector/NET commit: r1359 - branches/5.2/MySql.Data/Tests/Source

[rburnett]

Modified:
   branches/5.2/MySql.Data/Tests/Source/DataAdapterTests.cs
Log:
cleaned up data adapter test

Modified: branches/5.2/MySql.Data/Tests/Source/DataAdapterTests.cs
===================================================================
--- branches/5.2/MySql.Data/Tests/Source/DataAdapterTests.cs	2008-08-12 18:19:37 UTC (rev 1358)
+++ branches/5.2/MySql.Data/Tests/Source/DataAdapterTests.cs	2008-08-12 21:45:54 UTC (rev 1359)
@@ -34,6 +34,7 @@
 	{
         public override void FixtureSetup()
         {
+            csAdditions += ";logging=true;";
             base.FixtureSetup();
         }
 
@@ -717,40 +718,25 @@
             DataTable dt = new DataTable();
             da.Fill(dt);
 
-            DataRow row = dt.NewRow();
-            row["id"] = 1;
-            row["name"] = "name 1";
-            dt.Rows.Add(row);
+            for (int i = 1; i <= 100; i++)
+            {
+                DataRow row = dt.NewRow();
+                row["id"] = i;
+                row["name"] = "name " + i;
+                dt.Rows.Add(row);
+            }
 
-            row = dt.NewRow();
-            row["id"] = 2;
-            row["name"] = "name 2";
-            dt.Rows.Add(row);
+            da.UpdateBatchSize = 10;
+            da.Update(dt);
 
-            row = dt.NewRow();
-            row["id"] = 3;
-            row["name"] = "name 3";
-            dt.Rows.Add(row);
-
-            try
+            dt.Rows.Clear();
+            da.Fill(dt);
+            Assert.AreEqual(100, dt.Rows.Count);
+            for (int i = 0; i < 100; i++)
             {
-                da.UpdateBatchSize = 0;
-                da.Update(dt);
-
-                dt.Rows.Clear();
-                da.Fill(dt);
-                Assert.AreEqual(3, dt.Rows.Count);
-                Assert.AreEqual(1, dt.Rows[0]["id"]);
-                Assert.AreEqual(2, dt.Rows[1]["id"]);
-                Assert.AreEqual(3, dt.Rows[2]["id"]);
-                Assert.AreEqual("name 1", dt.Rows[0]["name"]);
-                Assert.AreEqual("name 2", dt.Rows[1]["name"]);
-                Assert.AreEqual("name 3", dt.Rows[2]["name"]);
+                Assert.AreEqual(i+1, dt.Rows[i]["id"]);
+                Assert.AreEqual("name " + (i+1), dt.Rows[i]["name"]);
             }
-            catch (Exception ex)
-            {
-                Assert.Fail(ex.Message);
-            }
         }
 
         [Test]
@@ -777,25 +763,18 @@
             dt.Rows[2]["id"] = 6;
             dt.Rows[2]["name"] = "new test value #2";
 
-            try
-            {
-                da.UpdateBatchSize = 0;
-                da.Update(dt);
+            da.UpdateBatchSize = 0;
+            da.Update(dt);
 
-                dt.Rows.Clear();
-                da.Fill(dt);
-                Assert.AreEqual(3, dt.Rows.Count);
-                Assert.AreEqual(4, dt.Rows[0]["id"]);
-                Assert.AreEqual(2, dt.Rows[1]["id"]);
-                Assert.AreEqual(6, dt.Rows[2]["id"]);
-                Assert.AreEqual("Test 1", dt.Rows[0]["name"]);
-                Assert.AreEqual("new test value", dt.Rows[1]["name"]);
-                Assert.AreEqual("new test value #2", dt.Rows[2]["name"]);
-            }
-            catch (Exception ex)
-            {
-                Assert.Fail(ex.Message);
-            }
+            dt.Rows.Clear();
+            da.Fill(dt);
+            Assert.AreEqual(3, dt.Rows.Count);
+            Assert.AreEqual(4, dt.Rows[0]["id"]);
+            Assert.AreEqual(2, dt.Rows[1]["id"]);
+            Assert.AreEqual(6, dt.Rows[2]["id"]);
+            Assert.AreEqual("Test 1", dt.Rows[0]["name"]);
+            Assert.AreEqual("new test value", dt.Rows[1]["name"]);
+            Assert.AreEqual("new test value #2", dt.Rows[2]["name"]);
         }
 
         [Test]
@@ -833,25 +812,18 @@
 
             dt.Rows[1].Delete();
 
-            try
-            {
-                da.UpdateBatchSize = 0;
-                da.Update(dt);
+            da.UpdateBatchSize = 0;
+            da.Update(dt);
 
-                dt.Rows.Clear();
-                da.Fill(dt);
-                Assert.AreEqual(3, dt.Rows.Count);
-                Assert.AreEqual(4, dt.Rows[0]["id"]);
-                Assert.AreEqual(6, dt.Rows[1]["id"]);
-                Assert.AreEqual(7, dt.Rows[2]["id"]);
-                Assert.AreEqual("Test 1", dt.Rows[0]["name"]);
-                Assert.AreEqual("new test value #2", dt.Rows[1]["name"]);
-                Assert.AreEqual("foobar", dt.Rows[2]["name"]);
-            }
-            catch (Exception ex)
-            {
-                Assert.Fail(ex.Message);
-            }
+            dt.Rows.Clear();
+            da.Fill(dt);
+            Assert.AreEqual(3, dt.Rows.Count);
+            Assert.AreEqual(4, dt.Rows[0]["id"]);
+            Assert.AreEqual(6, dt.Rows[1]["id"]);
+            Assert.AreEqual(7, dt.Rows[2]["id"]);
+            Assert.AreEqual("Test 1", dt.Rows[0]["name"]);
+            Assert.AreEqual("new test value #2", dt.Rows[1]["name"]);
+            Assert.AreEqual("foobar", dt.Rows[2]["name"]);
         }
 
         [Test]
@@ -882,21 +854,14 @@
                 dt.Rows.Add(row);
             }
 
-            try
-            {
-                da.UpdateBatchSize = 0;
-                da.Update(dt);
+            da.UpdateBatchSize = 0;
+            da.Update(dt);
 
-                dt.Rows.Clear();
-                da.Fill(dt);
-                Assert.AreEqual(numRows, dt.Rows.Count);
-                for (int i=0; i < numRows; i++)
-                    Assert.AreEqual(i, dt.Rows[i]["id"]);
-            }
-            catch (Exception ex)
-            {
-                Assert.Fail(ex.Message);
-            }
+            dt.Rows.Clear();
+            da.Fill(dt);
+            Assert.AreEqual(numRows, dt.Rows.Count);
+            for (int i=0; i < numRows; i++)
+                Assert.AreEqual(i, dt.Rows[i]["id"]);
         }
     }
 }