db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r691757 - in /db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests: master/ suites/ testData/ testData/ImportExport/ tests/tools/
Date Wed, 03 Sep 2008 20:30:21 GMT
Author: myrnavl
Date: Wed Sep  3 13:30:21 2008
New Revision: 691757

URL: http://svn.apache.org/viewvc?rev=691757&view=rev
Log:
DERBY-3863; backport improved importexport ij test - merge of 691506 from trunk
  (with adjustment for conflict in ImportExportTest.java)

Added:
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out
      - copied unchanged from r691506, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_NullFields.dat
      - copied unchanged from r691506, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_NullFields.dat
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_defaultformat.dat
      - copied unchanged from r691506, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_defaultformat.dat
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format1.dat
      - copied unchanged from r691506, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format1.dat
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2.dat
      - copied unchanged from r691506, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2.dat
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2oops.dat
      - copied unchanged from r691506, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2oops.dat
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/NoEOR.dat
      - copied unchanged from r691506, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/NoEOR.dat
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/TwoLineBadEOF.dat
      - copied unchanged from r691506, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/TwoLineBadEOF.dat
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat1.dat
      - copied unchanged from r691506, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat1.dat
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat2.dat
      - copied unchanged from r691506, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat2.dat
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ.sql
      - copied unchanged from r691506, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ.sql
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ_app.properties
      - copied unchanged from r691506, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ_app.properties
Modified:
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java

Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall?rev=691757&r1=691756&r2=691757&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall
(original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall
Wed Sep  3 13:30:21 2008
@@ -1,7 +1,7 @@
 tools/dblook_test.java
 tools/dblook_test_territory.java
 tools/derbyrunjartest.java
-tools/importExportThruIJ.sql
+tools/importExportIJ.sql
 tools/ij.sql
 tools/ij2.sql
 tools/ij3.sql

Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml?rev=691757&r1=691756&r2=691757&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
(original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
Wed Sep  3 13:30:21 2008
@@ -45,7 +45,7 @@
     </copy>
     <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/ImportExport">
       <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/ImportExport"
-        includes="*.asc,*.del,*.txt,*.utf"/>
+        includes="*.asc,*.del,*.txt,*.utf,*.dat"/>
     </copy>
     <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/ResultSetStream">
       <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/ResultSetStream"

Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java?rev=691757&r1=691756&r2=691757&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java
(original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java
Wed Sep  3 13:30:21 2008
@@ -64,7 +64,7 @@
 	
 	public static Test baseSuite(String name) {
 		TestSuite suite = new TestSuite(ImportExportTest.class, name);
-		Test test = new SupportFilesSetup(suite, new String[] {"functionTests/testData/ImportExport/EndOfFile.txt"}
);
+		Test test = new SupportFilesSetup(suite, new String[] {"functionTests/testData/ImportExport/TwoLineBadEOF.dat"}
);
 		return new CleanDatabaseTestSetup(test) {
             protected void decorateSQL(Statement s) throws SQLException {
 
@@ -78,10 +78,12 @@
 						   "COLUMN7 DOUBLE PRECISION , COLUMN8 INT , COLUMN9 BIGINT , COLUMN10 NUMERIC , "
+
 						   "COLUMN11 REAL , COLUMN12 SMALLINT , COLUMN13 TIME , COLUMN14 TIMESTAMP , "+
 						   "COLUMN15 SMALLINT , COLUMN16 VARCHAR(1))");
-                s.execute("create table T4 (   Account int,    Fname   char(30),"+
-                        "Lname   char(30), Company varchar(35), Address varchar(40), City
   varchar(20),"+
- 					   "State   char(5), Zip     char(10), Payment decimal(8,2), Balance decimal(8,2))");
-                
+                s.execute("create table T4 (   Account int,    Name   char(30), Jobdesc char(40),
" +
+						   "Company varchar(35), Address1 varchar(40), Address2 varchar(40), " +
+						   "City    varchar(20), State   char(5), Zip char(10), Country char(10), " +
+						   "Phone1  char(20), Phone2  char(20), email   char(30), web     char(30), " +
+						   "Fname   char(30), Lname   char(30), Comment char(30), AccDate char(30), " +
+						   "Payment decimal(8,2), Balance decimal(8,2))");
             }
         };
 	}
@@ -162,7 +164,7 @@
 	public void testEarlyEndOfFile() throws Exception {
 		Connection c = getConnection();
 		try {
-			doImportFromFile(c, "extin/EndOfFile.txt" , "T4" , null , null , null, 0);
+			doImportFromFile(c, "extin/TwoLineBadEOF.dat" , "T4" , null , null , null, 0);
 		} catch (SQLException e) {
 			assertSQLState("XIE0E", e);
 		}



Mime
View raw message