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 mi...@apache.org on 2013/04/16 08:13:30 UTC
svn commit: r1468307 -
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java
Author: mikem
Date: Tue Apr 16 06:13:29 2013
New Revision: 1468307
URL: http://svn.apache.org/r1468307
Log:
DERBY-6154
backing out change #1468229. test worked when run standalone but changes
did not work when test was run as full suite.
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java?rev=1468307&r1=1468306&r2=1468307&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java Tue Apr 16 06:13:29 2013
@@ -383,9 +383,7 @@ public class BlobClob4BlobTest extends B
/**
* Test triggers on CLOB columns.
*/
- public void baseTestTriggersWithClobColumn(boolean useOrderBy)
- throws Exception {
-
+ public void testTriggersWithClobColumn() throws Exception {
insertDefaultData();
Statement stmt = createStatement();
@@ -415,23 +413,12 @@ public class BlobClob4BlobTest extends B
Statement trigASt = createStatement();
Statement trigBSt = createStatement();
- ResultSet origRS = (useOrderBy ?
- origSt.executeQuery(
- "select a, length(a), b from testClob order by b") :
- origSt.executeQuery(
- "select a, length(a), b from testClob"));
-
- ResultSet trigARS = (useOrderBy ?
- trigASt.executeQuery(
- "select a, length(a), b from testClobTriggerA order by b") :
- trigASt.executeQuery(
- "select a, length(a), b from testClobTriggerA"));
-
- ResultSet trigBRS = (useOrderBy ?
- trigBSt.executeQuery(
- "select a, length(a), b from testClobTriggerB order by b") :
- trigBSt.executeQuery(
- "select a, length(a), b from testClobTriggerB order by b"));
+ ResultSet origRS = origSt.executeQuery(
+ "select a, length(a), b from testClob order by b");
+ ResultSet trigARS = trigASt.executeQuery(
+ "select a, length(a), b from testClobTriggerA order by b");
+ ResultSet trigBRS = trigBSt.executeQuery(
+ "select a, length(a), b from testClobTriggerB order by b");
int count = 0;
while (origRS.next()) {
@@ -479,31 +466,6 @@ public class BlobClob4BlobTest extends B
}
/**
- * Test triggers on CLOB columns.
- * <p>
- * Call with order by in the query, this causes a path through the
- * sorter.
- **/
- public void testTriggersWithClobColumnOrderBy()
- throws Exception {
-
- baseTestTriggersWithClobColumn(true);
- }
-
- /**
- * Test triggers on CLOB columns.
- * <p>
- * Call with no order by in the query, thus a code path not through
- * the sorter.
- **/
- public void testTriggersWithClobColumn()
- throws Exception {
-
- baseTestTriggersWithClobColumn(false);
- }
-
-
- /**
* test Clob.getSubString() method
*/
public void testGetSubString() throws Exception {