You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2007/04/16 18:42:14 UTC
svn commit: r529322 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools:
ImportExportBinaryDataTest.java ImportExportLobTest.java
ImportExportTest.java
Author: rhillegas
Date: Mon Apr 16 09:42:13 2007
New Revision: 529322
URL: http://svn.apache.org/viewvc?view=rev&rev=529322
Log:
DERBY-2193-03: Adjust the import/export lob tests which assert different results based on the vm level.
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBinaryDataTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportLobTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBinaryDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBinaryDataTest.java?view=diff&rev=529322&r1=529321&r2=529322
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBinaryDataTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBinaryDataTest.java Mon Apr 16 09:42:13 2007
@@ -258,7 +258,7 @@
doImportTable("APP", "BIN_TAB_IMP", fileName, null, null, null, 0);
fail("import did not fail on data with invalid hex string");
} catch (SQLException e) {
- assertSQLState(JDBC.vmSupportsJDBC4() ? "38000": "XIE0N", e);
+ assertSQLState(JDBC.vmSupportsJDBC4() ? "XIE0R": "XIE0N", e);
}
try {
@@ -268,7 +268,7 @@
fileName, null, null, null, 1);
fail("import did not fail on data with invalid hex strings");
} catch (SQLException e) {
- assertSQLState(JDBC.vmSupportsJDBC4() ? "38000": "XIE0N", e);
+ assertSQLState(JDBC.vmSupportsJDBC4() ? "XIE0R": "XIE0N", e);
}
try {
@@ -278,7 +278,7 @@
fileName, null, null, null, 1);
fail("import did not fail on data with invalid hex strings");
} catch (SQLException e) {
- assertSQLState(JDBC.vmSupportsJDBC4() ? "38000": "XIE0N", e);
+ assertSQLState(JDBC.vmSupportsJDBC4() ? "XIE0R": "XIE0N", e);
}
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportLobTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportLobTest.java?view=diff&rev=529322&r1=529321&r2=529322
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportLobTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportLobTest.java Mon Apr 16 09:42:13 2007
@@ -226,7 +226,7 @@
doImportTable("APP", "BOOKS_IMP", fileName, null, null, null, 0);
fail("import did not fail on data with invalid hex string");
} catch (SQLException e) {
- assertSQLState(JDBC.vmSupportsJDBC4() ? "38000": "XIE0N", e);
+ assertSQLState(JDBC.vmSupportsJDBC4() ? "XIE0R": "XIE0N", e);
}
try {
@@ -238,7 +238,7 @@
fileName, null, null, null, 1);
fail("import did not fail on data with invalid hex strings");
} catch (SQLException e) {
- assertSQLState(JDBC.vmSupportsJDBC4() ? "38000": "XIE0N", e);
+ assertSQLState(JDBC.vmSupportsJDBC4() ? "XIE0R": "XIE0N", e);
}
try {
@@ -250,7 +250,7 @@
fileName, null, null, null, 1);
fail("import did not fail on data with invalid hex strings");
} catch (SQLException e) {
- assertSQLState(JDBC.vmSupportsJDBC4() ? "38000": "XIE0N", e);
+ assertSQLState(JDBC.vmSupportsJDBC4() ? "XIE0R": "XIE0N", e);
}
}
@@ -432,7 +432,7 @@
doImportTableLobsFromExtFile("APP", "BOOKS_IMP", fileName,
null, null, null, 0);
}catch (SQLException e) {
- assertSQLState(JDBC.vmSupportsJDBC4() ? "38000": "XIE0P", e);
+ assertSQLState(JDBC.vmSupportsJDBC4() ? "XIE0R": "XIE0P", e);
}
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java?view=diff&rev=529322&r1=529321&r2=529322
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java Mon Apr 16 09:42:13 2007
@@ -167,7 +167,7 @@
doImportFromFile(c, "extin/EndOfFile.txt" , "T4" , null , null , null, 0);
} catch (SQLException e) {
// DERBY-1440: JDBC 4 client driver doesn't include nested exception SQLStates
- assertSQLState(JDBC.vmSupportsJDBC4() ? "38000" : "XIE0E", e);
+ assertSQLState(JDBC.vmSupportsJDBC4() ? "XIE0R" : "XIE0E", e);
}
}