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 dj...@apache.org on 2006/08/03 07:58:44 UTC
svn commit: r428252 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang:
wisconsin.java wisconsin_sed.properties
Author: djd
Date: Wed Aug 2 22:58:44 2006
New Revision: 428252
URL: http://svn.apache.org/viewvc?rev=428252&view=rev
Log:
DERBY-1609 (partial) Change the lang/wisconsin.java test to use the new ij.runScript method
rather than its previous use of the utilMain.go method. Change the sed commands because the
cursor names are different in the output due to the use of a connection in a different state.
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_sed.properties
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java?rev=428252&r1=428251&r2=428252&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java Wed Aug 2 22:58:44 2006
@@ -23,16 +23,12 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.sql.Connection;
-import java.sql.SQLException;
import java.sql.PreparedStatement;
+import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.derby.iapi.tools.i18n.LocalizedInput;
-import org.apache.derby.iapi.tools.i18n.LocalizedOutput;
-import org.apache.derby.iapi.tools.i18n.LocalizedResource;
import org.apache.derby.impl.tools.ij.utilMain;
import org.apache.derby.tools.ij;
-import java.util.Hashtable;
public class wisconsin {
@@ -45,8 +41,6 @@
createTables(conn);
- utilMain utilInstance;
- LocalizedInput is;
BufferedInputStream inStream;
// set input stream
@@ -61,19 +55,10 @@
System.out.println("unable to find input file "+filePath);
throw e;
}
- is = LocalizedResource.getInstance().getNewInput(inStream);
- LocalizedInput [] in = { is };
- LocalizedOutput out = new LocalizedOutput(System.out);
-
-
- utilInstance = new utilMain(1, out, (Hashtable)null);
- utilInstance.initConnections();
- utilInstance.go(in, out, (java.util.Properties) null);
- //log.flush();
- out.flush();
-
-
+ ij.runScript(conn, inStream, "US-ASCII",
+ System.out, (String) null);
+ conn.commit();
}
private static void createTables(Connection conn) throws SQLException{
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_sed.properties?rev=428252&r1=428251&r2=428252&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_sed.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_sed.properties Wed Aug 2 22:58:44 2006
@@ -10,7 +10,7 @@
# Cursor names and the amount of pre-fetched data differ between the
# frameworks. Since we are just testing which plan is chosen, we
# filter out run-time statistics that are not relevant for the test.
-substitute=SQL_CURS[HN]200C1;C,99349.65000000001 ;99349.65000000& ,SQL_CURLH000C1;C,Number of opens ?=.*;<filtered number of opens>,Number of pages visited ?=.*;<filtered number of pages visited>,Number of rows qualified ?=.*;<filtered number of rows qualified>,Number of rows visited ?=.*;<filtered number of rows visited>,Rows returned ?=.*;<filtered rows returned>,Rows seen ?=.*;<filtered rows seen>,Rows seen from the left ?=.*;<filtered rows seen from the left>,Rows seen from the right ?=.*;<filtered rows seen from the right>,Statement executed\.;0 rows inserted/updated/deleted
+substitute=SQL_CURS[HN]400C5;C,99349.65000000001 ;99349.65000000& ,SQL_CURLH000C6;C,Number of opens ?=.*;<filtered number of opens>,Number of pages visited ?=.*;<filtered number of pages visited>,Number of rows qualified ?=.*;<filtered number of rows qualified>,Number of rows visited ?=.*;<filtered number of rows visited>,Rows returned ?=.*;<filtered rows returned>,Rows seen ?=.*;<filtered rows seen>,Rows seen from the left ?=.*;<filtered rows seen from the left>,Rows seen from the right ?=.*;<filtered rows seen from the right>,Statement executed\.;0 rows inserted/updated/deleted
# next time does not always show up, so we remove it from the
# output. Warning 01J01 only appears in embedded.
delete=next time in milliseconds/row.*,WARNING 01J01:.*