db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r437009 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java
Date Fri, 25 Aug 2006 23:12:16 GMT
Author: djd
Date: Fri Aug 25 16:12:15 2006
New Revision: 437009

URL: http://svn.apache.org/viewvc?rev=437009&view=rev
Log:
DERBY-1555 (partial) Have SURDataModelSetup test for embedded vs. network using utility methods
in the JUnit classes.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java?rev=437009&r1=437008&r2=437009&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java
Fri Aug 25 16:12:15 2006
@@ -22,6 +22,7 @@
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.BaseJDBCTestSetup;
 import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.TestConfiguration;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -71,7 +72,7 @@
                          TABLE_EXISTS_SQL_STATE, e.getSQLState());
             
             // The net framework does not give any valuable error code
-            if (TestUtil.isNetFramework()) {
+            if (!TestConfiguration.getCurrent().getJDBCClient().isEmbedded()) {
                 
                 assertEquals("'drop table t1' failed with unexpected error code",
                              NET_ERROR, e.getErrorCode());



Mime
View raw message