db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r686238 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNetClient/ suites/ tests/jdbcapi/
Date Fri, 15 Aug 2008 14:33:59 GMT
Author: myrnavl
Date: Fri Aug 15 07:33:59 2008
New Revision: 686238

URL: http://svn.apache.org/viewvc?rev=686238&view=rev
Log:
DERBY-3828; run jdbcapi/SURTest_ij.sql in a junit ScriptTest
  patch contributed by Erlend Birkenes

Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURijTest.java
  (with props)
Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/SURTest_ij.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest_ij_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest_ij_sed.properties
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SURTest_ij.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest_ij.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SURTest_ij.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SURTest_ij.out?rev=686238&r1=686237&r2=686238&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SURTest_ij.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SURTest_ij.out
Fri Aug 15 07:33:59 2008
@@ -1,5 +1,3 @@
-CONNECTION0* - 	jdbc:derby:SURTest
-* = current connection
 ij> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
@@ -16,79 +14,77 @@
 --   See the License for the specific language governing permissions and
 --   limitations under the License.
 --
-connect 'SURTest;create=true;';
-WARNING 01J01: Database 'SURTest' not created, connection made to existing database instead.
-ij(CONNECTION1)> autocommit off;
-ij(CONNECTION1)> create table t1 (c1 int primary key, c2 int);
+autocommit off;
+ij> create table t1 (c1 int primary key, c2 int);
 0 rows inserted/updated/deleted
-ij(CONNECTION1)> insert into t1 values 
+ij> insert into t1 values 
     (1, 1), (2, 2), (3, 3), (4, 4), (5, 5), 
     (6, 6), (7, 7), (8, 8), (9, 9), (10, 10);
 10 rows inserted/updated/deleted
-ij(CONNECTION1)> get scroll insensitive cursor sc1 as 'SELECT * FROM t1 FOR UPDATE';
-ij(CONNECTION1)> next sc1;
+ij> get scroll insensitive cursor sc1 as 'SELECT * FROM t1 FOR UPDATE';
+ij> next sc1;
 C1         |C2         
 -----------------------
 1          |1          
-ij(CONNECTION1)> next sc1;
+ij> next sc1;
 C1         |C2         
 -----------------------
 2          |2          
-ij(CONNECTION1)> -- update row nr. 2 after positioning with next
+ij> -- update row nr. 2 after positioning with next
 update t1 set c2 = c1 + 20 where current of sc1;
 1 row inserted/updated/deleted
-ij(CONNECTION1)> absolute 5 sc1;
+ij> absolute 5 sc1;
 C1         |C2         
 -----------------------
 5          |5          
-ij(CONNECTION1)> -- update row nr. 5 after positioning with absolute
+ij> -- update row nr. 5 after positioning with absolute
 update t1 set c2 = c1 + 20 where current of sc1;
 1 row inserted/updated/deleted
-ij(CONNECTION1)> relative 2 sc1;
+ij> relative 2 sc1;
 C1         |C2         
 -----------------------
 7          |7          
-ij(CONNECTION1)> -- update row nr. 7 after positioning with relative
+ij> -- update row nr. 7 after positioning with relative
 update t1 set c2 = c1 + 20 where current of sc1;
 1 row inserted/updated/deleted
-ij(CONNECTION1)> previous sc1;
+ij> previous sc1;
 C1         |C2         
 -----------------------
 6          |6          
-ij(CONNECTION1)> -- update row nr. 6 after positioning with previous
+ij> -- update row nr. 6 after positioning with previous
 update t1 set c2 = c1 + 20 where current of sc1;
 1 row inserted/updated/deleted
-ij(CONNECTION1)> relative -1 sc1;
+ij> relative -1 sc1;
 C1         |C2         
 -----------------------
 5          |25         
-ij(CONNECTION1)> last sc1;
+ij> last sc1;
 C1         |C2         
 -----------------------
 10         |10         
-ij(CONNECTION1)> -- update row nr. 10 after positioning with last
+ij> -- update row nr. 10 after positioning with last
 update t1 set c2 = c1 + 20 where current of sc1;
 1 row inserted/updated/deleted
-ij(CONNECTION1)> after last sc1;
+ij> after last sc1;
 No current row
-ij(CONNECTION1)> -- update when positioned after last should cause an error
+ij> -- update when positioned after last should cause an error
 update t1 set c2 = c1 + 20 where current of sc1;
 ERROR 24000: Invalid cursor state - no current row.
-ij(CONNECTION1)> first sc1;
+ij> first sc1;
 C1         |C2         
 -----------------------
 1          |1          
-ij(CONNECTION1)> -- update row nr. 1 after positioning with first
+ij> -- update row nr. 1 after positioning with first
 update t1 set c2 = c1 + 20 where current of sc1;
 1 row inserted/updated/deleted
-ij(CONNECTION1)> before first sc1;
+ij> before first sc1;
 No current row
-ij(CONNECTION1)> -- update when positioned before first should cause an error
+ij> -- update when positioned before first should cause an error
 update t1 set c2 = c1 + 20 where current of sc1;
 ERROR 24000: Invalid cursor state - no current row.
-ij(CONNECTION1)> close sc1;
-ij(CONNECTION1)> commit;
-ij(CONNECTION1)> -- check that row where correctly updated
+ij> close sc1;
+ij> commit;
+ij> -- check that row where correctly updated
 select * from t1;
 C1         |C2         
 -----------------------
@@ -102,71 +98,70 @@
 8          |8          
 9          |9          
 10         |30         
-10 rows selected
-ij(CONNECTION1)> get scroll insensitive cursor sc1 as 'SELECT * FROM t1 FOR UPDATE';
-ij(CONNECTION1)> next sc1;
+ij> get scroll insensitive cursor sc1 as 'SELECT * FROM t1 FOR UPDATE';
+ij> next sc1;
 C1         |C2         
 -----------------------
 1          |21         
-ij(CONNECTION1)> next sc1;
+ij> next sc1;
 C1         |C2         
 -----------------------
 2          |22         
-ij(CONNECTION1)> -- delete row nr. 2 after positioning with next
+ij> -- delete row nr. 2 after positioning with next
 delete from t1 where current of sc1;
 1 row inserted/updated/deleted
-ij(CONNECTION1)> absolute 5 sc1;
+ij> absolute 5 sc1;
 C1         |C2         
 -----------------------
 5          |25         
-ij(CONNECTION1)> -- delete row nr. 5 after positioning with absolute
+ij> -- delete row nr. 5 after positioning with absolute
 delete from t1 where current of sc1;
 1 row inserted/updated/deleted
-ij(CONNECTION1)> relative 2 sc1;
+ij> relative 2 sc1;
 C1         |C2         
 -----------------------
 7          |27         
-ij(CONNECTION1)> -- delete row nr. 7 after positioning with relative
+ij> -- delete row nr. 7 after positioning with relative
 delete from t1 where current of sc1;
 1 row inserted/updated/deleted
-ij(CONNECTION1)> previous sc1;
+ij> previous sc1;
 C1         |C2         
 -----------------------
 6          |26         
-ij(CONNECTION1)> -- delete row nr. 6 after positioning with previous
+ij> -- delete row nr. 6 after positioning with previous
 delete from t1 where current of sc1;
 1 row inserted/updated/deleted
-ij(CONNECTION1)> relative -1 sc1;
+ij> relative -1 sc1;
 C1         |C2         
 -----------------------
 NULL       |NULL       
-ij(CONNECTION1)> last sc1;
+ij> last sc1;
 C1         |C2         
 -----------------------
 10         |30         
-ij(CONNECTION1)> -- delete row nr. 10 after positioning with last
+ij> -- delete row nr. 10 after positioning with last
 delete from t1 where current of sc1;
 1 row inserted/updated/deleted
-ij(CONNECTION1)> after last sc1;
+ij> after last sc1;
 No current row
-ij(CONNECTION1)> -- delete when positioned after last should cause an error
+ij> -- delete when positioned after last should cause an error
 delete from t1 where current of sc1;
 ERROR 24000: Invalid cursor state - no current row.
-ij(CONNECTION1)> first sc1;
+ij> first sc1;
 C1         |C2         
 -----------------------
 1          |21         
-ij(CONNECTION1)> -- delete row nr. 1 after positioning with first
+ij> -- delete row nr. 1 after positioning with first
 delete from t1 where current of sc1;
 1 row inserted/updated/deleted
-ij(CONNECTION1)> before first sc1;
+ij> before first sc1;
 No current row
-ij(CONNECTION1)> -- delete when positioned before first should cause an error
+ij> -- delete when positioned before first should cause an error
 delete from t1 where current of sc1;
 ERROR 24000: Invalid cursor state - no current row.
-ij(CONNECTION1)> close sc1;
-ij(CONNECTION1)> commit;
-ij(CONNECTION1)> -- check that row where correctly updated
+ij> close sc1;
+ij> commit;
+ij> -- check that row where correctly updated
 select * from t1;
 C1         |C2         
 -----------------------
@@ -174,5 +169,4 @@
 4          |4          
 8          |8          
 9          |9          
-4 rows selected
-ij(CONNECTION1)> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude?rev=686238&r1=686237&r2=686238&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
Fri Aug 15 07:33:59 2008
@@ -7,4 +7,3 @@
 # excluding jdbcapi/derbyStress.java - jcc runs out of memory with this test
 jdbcapi/derbyStress.java
 largedata/LobLimits.java
-jdbcapi/SURTest_ij.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall?rev=686238&r1=686237&r2=686238&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
Fri Aug 15 07:33:59 2008
@@ -1,2 +1 @@
 jdbcapi/derbyStress.java
-jdbcapi/SURTest_ij.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest_ij.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest_ij.sql?rev=686238&r1=686237&r2=686238&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest_ij.sql
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest_ij.sql
Fri Aug 15 07:33:59 2008
@@ -14,7 +14,6 @@
 --   See the License for the specific language governing permissions and
 --   limitations under the License.
 --
-connect 'SURTest;create=true;';
 autocommit off;
 create table t1 (c1 int primary key, c2 int);
 insert into t1 values 

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURijTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURijTest.java?rev=686238&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURijTest.java
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURijTest.java
Fri Aug 15 07:33:59 2008
@@ -0,0 +1,65 @@
+/*
+ * Derby - Class 
+ * org.apache.derbyTesting.functionTests.tests.jdbcapi.SURijTest
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, 
+ * software distributed under the License is distributed on an 
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
+ * either express or implied. See the License for the specific 
+ * language governing permissions and limitations under the License.
+ */
+
+package org.apache.derbyTesting.functionTests.tests.jdbcapi;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.TestConfiguration;
+
+/**
+ *	Test that runs the SURTest_ij.sql script and compares the output 
+ *	to SURTest_ij.out.
+ */
+public final class SURijTest extends ScriptTestCase {
+
+	/**
+	 * The test script
+	 */
+	private static final String[] TESTS = { "SURTest_ij" };
+	
+	
+	/**
+	 * Constructor that runs a single script.
+	 * 
+	 * @param name
+	 */
+	private SURijTest(String script) {
+		super(script);
+	}
+
+	
+	/**
+	 * Return the suite that runs the script.
+	 */
+	public static Test suite() {
+
+		TestSuite suite = new TestSuite("SURijTest");
+		suite.addTest(TestConfiguration
+				.clientServerDecorator(new CleanDatabaseTestSetup(
+						new SURijTest(TESTS[0]))));
+        suite.addTest(new CleanDatabaseTestSetup(
+                        new SURijTest(TESTS[0])));
+		return suite;
+	}
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURijTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java?rev=686238&r1=686237&r2=686238&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
Fri Aug 15 07:33:59 2008
@@ -73,6 +73,7 @@
 		suite.addTest(SetTransactionIsolationTest.suite());
 		suite.addTest(AuthenticationTest.suite());
 		suite.addTest(DriverTest.suite());
+		suite.addTest(SURijTest.suite());
 		suite.addTest(NullSQLTextTest.suite());
 		suite.addTest(PrepStmtNullTest.suite());
 		suite.addTest(StatementJdbc30Test.suite());



Mime
View raw message