svn commit: r450098 - in /incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test: KennelTests.java data/KennelData.java framework/DatabaseSetup.java

[bdaniel]

Author: bdaniel
Date: Tue Sep 26 08:54:41 2006
New Revision: 450098

URL: http://svn.apache.org/viewvc?view=rev&rev=450098
Log:
Updating kennel tests to avoid using "NUMBER" as a column name. 

Modified:
    
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java
    
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java
    
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java

Modified: 
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java?view=diff&rev=450098&r1=450097&r2=450098
==============================================================================
--- 
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java
 (original)
+++ 
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java
 Tue Sep 26 08:54:41 2006
@@ -26,7 +26,6 @@
 import org.apache.tuscany.das.rdb.test.data.KennelData;
 import org.apache.tuscany.das.rdb.test.data.OwnerData;
 import org.apache.tuscany.das.rdb.test.data.OwnerDogData;
-import org.apache.tuscany.das.rdb.test.data.TypesData;
 import org.apache.tuscany.das.rdb.test.data.VisitData;
 import org.apache.tuscany.das.rdb.test.framework.DasTest;
 import org.apache.tuscany.das.rdb.test.framework.TestData;

Modified: 
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java?view=diff&rev=450098&r1=450097&r2=450098
==============================================================================
--- 
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java
 (original)
+++ 
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java
 Tue Sep 26 08:54:41 2006
@@ -28,7 +28,7 @@
 
 /*    CREATE TABLE KENNEL (
             ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
-            NUMBER INTEGER UNSIGNED NULL,
+            KNUMBER INTEGER UNSIGNED NULL,
             KIND VARCHAR(20) NULL,
             OCC_COUNT INTEGER UNSIGNED NULL,
             PRIMARY KEY(ID)
@@ -42,7 +42,7 @@
                        { new Integer(101), "Small", new Integer(1) },
                        { new Integer(102), "Large", new Integer(1)} };
 
-       private static String[] columns = { "NUMBER", "KIND", "OCC_COUNT" };
+       private static String[] columns = { "KNUMBER", "KIND", "OCC_COUNT" };
 
        public KennelData(Connection connection) {
                super(connection, data, columns, columnTypes);

Modified: 
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java?view=diff&rev=450098&r1=450097&r2=450098
==============================================================================
--- 
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
 (original)
+++ 
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
 Tue Sep 26 08:54:41 2006
@@ -76,16 +76,21 @@
             }
             connection.setAutoCommit(false);
 
-        } catch (Exception e) {
-            if (e instanceof SQLException) {
-                if (((SQLException) e).getNextException() != null)
-                    ((SQLException) e).getNextException().printStackTrace();
-                else
-                    e.printStackTrace();
+        } catch (SQLException e) {
 
+            if (e.getNextException() != null) {
+                e.getNextException().printStackTrace();
+            } else {
+                e.printStackTrace();
             }
 
             throw new RuntimeException(e);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        } catch (InstantiationException e) {
+            throw new RuntimeException(e);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
         }
 
     }
@@ -322,7 +327,7 @@
     protected String getCreateKennel() {
         return "CREATE TABLE KENNEL (" 
         + getIntegerColumn("ID") + " NOT NULL " + getGeneratedKeyClause() + " 
, " 
-        + getIntegerColumn("NUMBER") + ", "
+        + getIntegerColumn("KNUMBER") + ", "
         + getStringColumn("KIND", 20) + ", " 
         + getIntegerColumn("OCC_COUNT") + ", " 
         + "PRIMARY KEY(ID))";



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]