Return-Path: 
 <ddlutils-dev-return-1822-apmail-db-ddlutils-dev-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-ddlutils-dev-archive@www.apache.org
Received: (qmail 31378 invoked from network); 13 Aug 2008 04:43:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 13 Aug 2008 04:43:09 -0000
Received: (qmail 62725 invoked by uid 500); 13 Aug 2008 04:43:08 -0000
Delivered-To: apmail-db-ddlutils-dev-archive@db.apache.org
Received: (qmail 62714 invoked by uid 500); 13 Aug 2008 04:43:08 -0000
Mailing-List: contact ddlutils-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ddlutils-dev-help@db.apache.org>
List-Unsubscribe: <mailto:ddlutils-dev-unsubscribe@db.apache.org>
List-Post: <mailto:ddlutils-dev@db.apache.org>
List-Id: <ddlutils-dev.db.apache.org>
Reply-To: ddlutils-dev@db.apache.org
Delivered-To: mailing list ddlutils-dev@db.apache.org
Received: (qmail 62702 invoked by uid 500); 13 Aug 2008 04:43:08 -0000
Delivered-To: apmail-db-ddlutils-commits@db.apache.org
Received: (qmail 62699 invoked by uid 99); 13 Aug 2008 04:43:07 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Aug 2008 21:43:07 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Aug 2008 04:42:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0A05F2388892; Tue, 12 Aug 2008 21:42:18 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r685436 -
 /db/ddlutils/trunk/src/test/java/org/apache/ddlutils/io/TestConstraints.java
Date: Wed, 13 Aug 2008 04:42:17 -0000
To: ddlutils-commits@db.apache.org
From: tomdz@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080813044218.0A05F2388892@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tomdz
Date: Tue Aug 12 21:42:17 2008
New Revision: 685436

URL: http://svn.apache.org/viewvc?rev=685436&view=rev
Log:
Fixed some tests

Modified:
    db/ddlutils/trunk/src/test/java/org/apache/ddlutils/io/TestConstraints.java

Modified: db/ddlutils/trunk/src/test/java/org/apache/ddlutils/io/TestConstraints.java
URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/test/java/org/apache/ddlutils/io/TestConstraints.java?rev=685436&r1=685435&r2=685436&view=diff
==============================================================================
--- db/ddlutils/trunk/src/test/java/org/apache/ddlutils/io/TestConstraints.java (original)
+++ db/ddlutils/trunk/src/test/java/org/apache/ddlutils/io/TestConstraints.java Tue Aug 12 21:42:17 2008
@@ -29,6 +29,9 @@
 import org.apache.ddlutils.TestAgainstLiveDatabaseBase;
 import org.apache.ddlutils.model.Database;
 import org.apache.ddlutils.platform.derby.DerbyPlatform;
+import org.apache.ddlutils.platform.firebird.FirebirdPlatform;
+import org.apache.ddlutils.platform.mysql.MySql50Platform;
+import org.apache.ddlutils.platform.mysql.MySqlPlatform;
 import org.apache.ddlutils.platform.sybase.SybasePlatform;
 
 /**
@@ -451,42 +454,45 @@
      */
     public void testForeignKeyWithOnDeleteRestrict()
     {
-        final String modelXml = 
-            "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
-            "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
-            "  <table name='roundtrip_1'>\n"+
-            "    <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
-            "  </table>\n"+
-            "  <table name='roundtrip_2'>\n"+
-            "    <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
-            "    <column name='avalue' type='INTEGER' required='true'/>\n"+
-            "    <foreign-key foreignTable='roundtrip_1' onDelete='restrict'>\n"+
-            "      <reference local='avalue' foreign='pk'/>\n"+
-            "    </foreign-key>\n"+
-            "  </table>\n"+
-            "</database>";
-
-        performConstraintsTest(modelXml, true);
-
-        insertRow("roundtrip_1", new Object[] { new Integer(1) });
-        insertRow("roundtrip_2", new Object[] { new Integer(5), new Integer(1) });
-
-        List beansTable1 = getRows("roundtrip_1");
-        List beansTable2 = getRows("roundtrip_2");
-
-        assertEquals(1, beansTable1.size());
-        assertEquals(1, beansTable2.size());
-        assertEquals(new Integer(1), beansTable1.get(0), "pk");
-        assertEquals(new Integer(5), beansTable2.get(0), "pk");
-        assertEquals(new Integer(1), beansTable2.get(0), "avalue");
-
-        try
+        if (!FirebirdPlatform.DATABASENAME.equals(getPlatform().getName()))
         {
-            deleteRow("roundtrip_1", new Object[] { new Integer(1) });
-            fail();
+            final String modelXml = 
+                "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
+                "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
+                "  <table name='roundtrip_1'>\n"+
+                "    <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
+                "  </table>\n"+
+                "  <table name='roundtrip_2'>\n"+
+                "    <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
+                "    <column name='avalue' type='INTEGER' required='true'/>\n"+
+                "    <foreign-key foreignTable='roundtrip_1' onDelete='restrict'>\n"+
+                "      <reference local='avalue' foreign='pk'/>\n"+
+                "    </foreign-key>\n"+
+                "  </table>\n"+
+                "</database>";
+    
+            performConstraintsTest(modelXml, true);
+    
+            insertRow("roundtrip_1", new Object[] { new Integer(1) });
+            insertRow("roundtrip_2", new Object[] { new Integer(5), new Integer(1) });
+    
+            List beansTable1 = getRows("roundtrip_1");
+            List beansTable2 = getRows("roundtrip_2");
+    
+            assertEquals(1, beansTable1.size());
+            assertEquals(1, beansTable2.size());
+            assertEquals(new Integer(1), beansTable1.get(0), "pk");
+            assertEquals(new Integer(5), beansTable2.get(0), "pk");
+            assertEquals(new Integer(1), beansTable2.get(0), "avalue");
+    
+            try
+            {
+                deleteRow("roundtrip_1", new Object[] { new Integer(1) });
+                fail();
+            }
+            catch (DdlUtilsException ex)
+            {}
         }
-        catch (DdlUtilsException ex)
-        {}
     }
 
     /**
@@ -582,7 +588,9 @@
      */
     public void testForeignKeyWithOnDeleteSetDefault()
     {
-        if (!DerbyPlatform.DATABASENAME.equals(getPlatform().getName()))
+        if (!DerbyPlatform.DATABASENAME.equals(getPlatform().getName()) &&
+            !MySqlPlatform.DATABASENAME.equals(getPlatform().getName()) &&
+            !MySql50Platform.DATABASENAME.equals(getPlatform().getName()))
         {
             final String modelXml = 
                 "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
@@ -633,42 +641,45 @@
      */
     public void testForeignKeyWithOnUpdateRestrict()
     {
-        final String modelXml = 
-            "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
-            "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
-            "  <table name='roundtrip_1'>\n"+
-            "    <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
-            "  </table>\n"+
-            "  <table name='roundtrip_2'>\n"+
-            "    <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
-            "    <column name='avalue' type='INTEGER' required='true'/>\n"+
-            "    <foreign-key foreignTable='roundtrip_1' onUpdate='restrict'>\n"+
-            "      <reference local='avalue' foreign='pk'/>\n"+
-            "    </foreign-key>\n"+
-            "  </table>\n"+
-            "</database>";
-
-        performConstraintsTest(modelXml, true);
-
-        insertRow("roundtrip_1", new Object[] { new Integer(1) });
-        insertRow("roundtrip_2", new Object[] { new Integer(5), new Integer(1) });
-
-        List beansTable1 = getRows("roundtrip_1");
-        List beansTable2 = getRows("roundtrip_2");
-
-        assertEquals(1, beansTable1.size());
-        assertEquals(1, beansTable2.size());
-        assertEquals(new Integer(1), beansTable1.get(0), "pk");
-        assertEquals(new Integer(5), beansTable2.get(0), "pk");
-        assertEquals(new Integer(1), beansTable2.get(0), "avalue");
-
-        try
+        if (!FirebirdPlatform.DATABASENAME.equals(getPlatform().getName()))
         {
-            updateRow("roundtrip_1", (DynaBean)beansTable1.get(0), new Object[] { new Integer(5) });
-            fail();
+            final String modelXml = 
+                "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
+                "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
+                "  <table name='roundtrip_1'>\n"+
+                "    <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
+                "  </table>\n"+
+                "  <table name='roundtrip_2'>\n"+
+                "    <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
+                "    <column name='avalue' type='INTEGER' required='true'/>\n"+
+                "    <foreign-key foreignTable='roundtrip_1' onUpdate='restrict'>\n"+
+                "      <reference local='avalue' foreign='pk'/>\n"+
+                "    </foreign-key>\n"+
+                "  </table>\n"+
+                "</database>";
+    
+            performConstraintsTest(modelXml, true);
+    
+            insertRow("roundtrip_1", new Object[] { new Integer(1) });
+            insertRow("roundtrip_2", new Object[] { new Integer(5), new Integer(1) });
+    
+            List beansTable1 = getRows("roundtrip_1");
+            List beansTable2 = getRows("roundtrip_2");
+    
+            assertEquals(1, beansTable1.size());
+            assertEquals(1, beansTable2.size());
+            assertEquals(new Integer(1), beansTable1.get(0), "pk");
+            assertEquals(new Integer(5), beansTable2.get(0), "pk");
+            assertEquals(new Integer(1), beansTable2.get(0), "avalue");
+    
+            try
+            {
+                updateRow("roundtrip_1", (DynaBean)beansTable1.get(0), new Object[] { new Integer(5) });
+                fail();
+            }
+            catch (DdlUtilsException ex)
+            {}
         }
-        catch (DdlUtilsException ex)
-        {}
     }
 
     /**
@@ -774,7 +785,9 @@
      */
     public void testForeignKeyWithOnUpdateSetDefault()
     {
-        if (!DerbyPlatform.DATABASENAME.equals(getPlatform().getName()))
+        if (!DerbyPlatform.DATABASENAME.equals(getPlatform().getName()) &&
+            !MySqlPlatform.DATABASENAME.equals(getPlatform().getName()) &&
+            !MySql50Platform.DATABASENAME.equals(getPlatform().getName()))
         {
             final String modelXml =
                 "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
@@ -809,13 +822,13 @@
     
             updateRow("roundtrip_1", (DynaBean)beansTable1.get(1), new Object[] { new Integer(0) });
     
-            beansTable1 = getRows("roundtrip_1");
-            beansTable2 = getRows("roundtrip_2");
+            beansTable1 = getRows("roundtrip_1", "pk");
+            beansTable2 = getRows("roundtrip_2", "pk");
     
             assertEquals(2, beansTable1.size());
             assertEquals(1, beansTable2.size());
-            assertEquals(new Integer(1), beansTable1.get(0), "pk");
-            assertEquals(new Integer(0), beansTable1.get(1), "pk");
+            assertEquals(new Integer(0), beansTable1.get(0), "pk");
+            assertEquals(new Integer(1), beansTable1.get(1), "pk");
             assertEquals(new Integer(5), beansTable2.get(0), "pk");
             assertEquals(new Integer(1), beansTable2.get(0), "avalue");
         }