db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r399021 - in /db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNet/ master/DerbyNetClient/ tests/jdbcapi/ tests/tools/
Date Tue, 02 May 2006 19:49:42 GMT
Author: fuzzylogic
Date: Tue May  2 12:49:38 2006
New Revision: 399021

URL: http://svn.apache.org/viewcvs?rev=399021&view=rev
Log:
DERBY-575: enable LOB tests on platforms with non-ASCII native encoding.

Committed for Myrna Van Lunteren <m.v.lunteren@gmail.com>

Added:
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/aclob.utf
      - copied unchanged from r399019, db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/aclob.txt
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/empty.utf
      - copied unchanged from r399019, db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/empty.txt
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/littleclob.utf
      - copied unchanged from r399019, db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/littleclob.txt
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/searchclob.utf
      - copied unchanged from r399019, db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/searchclob.txt
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/short.utf
      - copied unchanged from r399019, db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/short.txt
Removed:
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/aclob.txt
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/empty.txt
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/littleclob.txt
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/searchclob.txt
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/short.txt
Modified:
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LOBTest.java
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB_app.properties
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests.sql

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out?rev=399021&r1=399020&r2=399021&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/blobclob4BLOB.out
Tue May  2 12:49:38 2006
@@ -1,16 +1,16 @@
 Test blobclob starting
 START: prepareCLOBMAIN
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting extin/short.utf length = 56
+===> inserting extin/littleclob.utf length = 10000
+===> inserting extin/empty.utf length = 0
+===> inserting extin/searchclob.utf length = 5000
+===> inserting extin/aclob.utf length = 300000
 START: prepareSearchClobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting extin/short.utf length = 56
+===> inserting extin/littleclob.utf length = 10000
+===> inserting extin/empty.utf length = 0
+===> inserting extin/searchclob.utf length = 5000
+===> inserting extin/aclob.utf length = 300000
 prepareSearchClobTable finished
 START: prepareUnicodeTable
 START: prepareUnicodeFile
@@ -524,17 +524,17 @@
 START: clobTest96
 clobTest96 finished
 START: prepareBlobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting extin/short.utf length = 56
+===> inserting extin/littleclob.utf length = 10000
+===> inserting extin/empty.utf length = 0
+===> inserting extin/searchclob.utf length = 5000
+===> inserting extin/aclob.utf length = 300000
 START: prepareSearchBlobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting extin/short.utf length = 56
+===> inserting extin/littleclob.utf length = 10000
+===> inserting extin/empty.utf length = 0
+===> inserting extin/searchclob.utf length = 5000
+===> inserting extin/aclob.utf length = 300000
 START: blobTest0
 blobTest0 finished
 START: blobTest2

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out?rev=399021&r1=399020&r2=399021&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ieptests.out
Tue May  2 12:49:38 2006
@@ -656,7 +656,7 @@
 ij> ---test with a file which has a differen records seperators (\n, \r , \r\n)
 create table nt1( a int , b char(30));
 0 rows inserted/updated/deleted
-ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'NT1', 'extin/mixednl.del',null, null, null,0);
+ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'NT1', 'extin/mixednl.del',null, null, 'UTF-8',0);
 Statement executed.
 ij> select * from nt1;
 A |B                             
@@ -690,7 +690,7 @@
     );
 0 rows inserted/updated/deleted
 ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE ('APP', 'POSITION_INFO', 'extin/position_info.del',
-                                    null, null, null, 1);
+                                    null, null, 'US-ASCII', 1);
 Statement executed.
 ij> select count(*) from position_info ;
 1          

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out?rev=399021&r1=399020&r2=399021&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/blobclob4BLOB.out
Tue May  2 12:49:38 2006
@@ -1,16 +1,16 @@
 Test blobclob starting
 START: prepareCLOBMAIN
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting extin/short.utf length = 56
+===> inserting extin/littleclob.utf length = 10000
+===> inserting extin/empty.utf length = 0
+===> inserting extin/searchclob.utf length = 5000
+===> inserting extin/aclob.utf length = 300000
 START: prepareSearchClobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting extin/short.utf length = 56
+===> inserting extin/littleclob.utf length = 10000
+===> inserting extin/empty.utf length = 0
+===> inserting extin/searchclob.utf length = 5000
+===> inserting extin/aclob.utf length = 300000
 prepareSearchClobTable finished
 START: prepareUnicodeTable
 START: prepareUnicodeFile
@@ -524,17 +524,17 @@
 START: clobTest96
 clobTest96 finished
 START: prepareBlobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting extin/short.utf length = 56
+===> inserting extin/littleclob.utf length = 10000
+===> inserting extin/empty.utf length = 0
+===> inserting extin/searchclob.utf length = 5000
+===> inserting extin/aclob.utf length = 300000
 START: prepareSearchBlobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting extin/short.utf length = 56
+===> inserting extin/littleclob.utf length = 10000
+===> inserting extin/empty.utf length = 0
+===> inserting extin/searchclob.utf length = 5000
+===> inserting extin/aclob.utf length = 300000
 START: blobTest0
 blobTest0 finished
 START: blobTest2

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out?rev=399021&r1=399020&r2=399021&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out
Tue May  2 12:49:38 2006
@@ -656,7 +656,7 @@
 ij> ---test with a file which has a differen records seperators (\n, \r , \r\n)
 create table nt1( a int , b char(30));
 0 rows inserted/updated/deleted
-ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'NT1', 'extin/mixednl.del',null, null, null,0);
+ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'NT1', 'extin/mixednl.del',null, null, 'UTF-8',0);
 Statement executed.
 ij> select * from nt1;
 A |B                             
@@ -690,7 +690,7 @@
     );
 0 rows inserted/updated/deleted
 ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE ('APP', 'POSITION_INFO', 'extin/position_info.del',
-                                    null, null, null, 1);
+                                    null, null, 'US-ASCII', 1);
 Statement executed.
 ij> select count(*) from position_info ;
 1          

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out?rev=399021&r1=399020&r2=399021&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
Tue May  2 12:49:38 2006
@@ -1,16 +1,16 @@
 Test blobclob starting
 START: prepareCLOBMAIN
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting extin/short.utf length = 56
+===> inserting extin/littleclob.utf length = 10000
+===> inserting extin/empty.utf length = 0
+===> inserting extin/searchclob.utf length = 5000
+===> inserting extin/aclob.utf length = 300000
 START: prepareSearchClobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting extin/short.utf length = 56
+===> inserting extin/littleclob.utf length = 10000
+===> inserting extin/empty.utf length = 0
+===> inserting extin/searchclob.utf length = 5000
+===> inserting extin/aclob.utf length = 300000
 prepareSearchClobTable finished
 START: prepareUnicodeTable
 START: prepareUnicodeFile
@@ -545,17 +545,17 @@
 START: clobTest96
 clobTest96 finished
 START: prepareBlobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting extin/short.utf length = 56
+===> inserting extin/littleclob.utf length = 10000
+===> inserting extin/empty.utf length = 0
+===> inserting extin/searchclob.utf length = 5000
+===> inserting extin/aclob.utf length = 300000
 START: prepareSearchBlobTable
-===> inserting extin/short.txt length = 56
-===> inserting extin/littleclob.txt length = 10000
-===> inserting extin/empty.txt length = 0
-===> inserting extin/searchclob.txt length = 5000
-===> inserting extin/aclob.txt length = 300000
+===> inserting extin/short.utf length = 56
+===> inserting extin/littleclob.utf length = 10000
+===> inserting extin/empty.utf length = 0
+===> inserting extin/searchclob.utf length = 5000
+===> inserting extin/aclob.utf length = 300000
 START: blobTest0
 blobTest0 finished
 START: blobTest2

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out?rev=399021&r1=399020&r2=399021&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out
Tue May  2 12:49:38 2006
@@ -672,7 +672,7 @@
 ij> ---test with a file which has a differen records seperators (\n, \r , \r\n)
 create table nt1( a int , b char(30));
 0 rows inserted/updated/deleted
-ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'NT1', 'extin/mixednl.del',null, null, null,0);
+ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'NT1', 'extin/mixednl.del',null, null, 'UTF-8',0);
 0 rows inserted/updated/deleted
 ij> select * from nt1;
 A          |B                             
@@ -706,7 +706,7 @@
     );
 0 rows inserted/updated/deleted
 ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE ('APP', 'POSITION_INFO', 'extin/position_info.del',
-                                    null, null, null, 1);
+                                    null, null, 'US-ASCII', 1);
 0 rows inserted/updated/deleted
 ij> select count(*) from position_info ;
 1          

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LOBTest.java
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LOBTest.java?rev=399021&r1=399020&r2=399021&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LOBTest.java
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LOBTest.java
Tue May  2 12:49:38 2006
@@ -87,7 +87,7 @@
 		System.out.println("creating");
 		s.executeUpdate("CREATE TABLE atable (a INT, b LONG VARCHAR FOR BIT DATA)");
 		conn.commit();
-		java.io.File file = new java.io.File("short.txt");
+		java.io.File file = new java.io.File("short.utf");
 		int fileLength = (int) file.length();
 
 		// first, create an input stream

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java?rev=399021&r1=399020&r2=399021&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java
Tue May  2 12:49:38 2006
@@ -76,11 +76,11 @@
 		fileName = new String[numFiles];
 		fileLength = new long[numFiles];
 
-		fileName[0] = "extin/short.txt";	// set up a short (fit in one page) blob/clob
-		fileName[1] = "extin/littleclob.txt"; // set up a long (longer than a page) blob/clob
-		fileName[2] = "extin/empty.txt"; // set up a blob/clob with nothing in it
-		fileName[3] = "extin/searchclob.txt"; // set up a blob/clob to search with
-		fileName[4] = "extin/aclob.txt"; // set up a really long (over 300K) blob/clob
+		fileName[0] = "extin/short.utf";	// set up a short (fit in one page) blob/clob
+		fileName[1] = "extin/littleclob.utf"; // set up a long (longer than a page) blob/clob
+		fileName[2] = "extin/empty.utf"; // set up a blob/clob with nothing in it
+		fileName[3] = "extin/searchclob.utf"; // set up a blob/clob to search with
+		fileName[4] = "extin/aclob.utf"; // set up a really long (over 300K) blob/clob
 
         numRows = 10;
 
@@ -2924,7 +2924,7 @@
                         System.out.println("FAIL : length of bytes is " +
                             res.length + " should be 100");
                     else
-                        System.out.println(new String(res, "US-ASCII"));
+                        System.out.println(new String(res, "US-ASCII")); // ensure fixed
string
                 }
             }
             System.out.println("blobTest2 finished");
@@ -4034,17 +4034,21 @@
 			TestUtil.dumpSQLExceptions(e,expected);
 		}
 		
-		catch (Exception e)
+		catch (StringIndexOutOfBoundsException obe)
 		{
 			// Known bug.  JCC 5914.  
-			if ((pos > clobLength) && isDerbyNet && (e.getMessage() != null &&
-													e.getMessage().indexOf("String index out of range") >= 0))
+			if ((pos > clobLength) && isDerbyNet)
 				System.out.println("EXPECTED Out of bounds exception");
 			else
 			{
-				System.out.println("FAIL -- unexpected exception:" + e.toString());
-	            if (debug) e.printStackTrace();
+				System.out.println("FAIL -- unexpected exception:" + obe.toString());
+				if (debug) obe.printStackTrace();
 			}
+		}
+		catch (Exception e)
+		{
+			System.out.println("FAIL -- unexpected exception:" + e.toString());
+	            if (debug) e.printStackTrace();
 		}
     }
 

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB_app.properties?rev=399021&r1=399020&r2=399021&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB_app.properties
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB_app.properties
Tue May  2 12:49:38 2006
@@ -2,6 +2,6 @@
 runwithjdk13=false
 runwithibm13=false
 # runwithj9=false
-supportfiles=tests/jdbcapi/short.txt,tests/jdbcapi/littleclob.txt,tests/jdbcapi/empty.txt,tests/jdbcapi/aclob.txt,tests/jdbcapi/searchclob.txt
+supportfiles=tests/jdbcapi/short.utf,tests/jdbcapi/littleclob.utf,tests/jdbcapi/empty.utf,tests/jdbcapi/aclob.utf,tests/jdbcapi/searchclob.utf
 usedefaults=true
 useextdirs=true

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml?rev=399021&r1=399020&r2=399021&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
Tue May  2 12:49:38 2006
@@ -133,7 +133,7 @@
   <target name="copyfiles">
     <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/jdbcapi">
       <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/jdbcapi"

-        includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/jdbcapi/copyfiles.ant"/>
 
+        includes="*.gif,*.properties,*.sql,*.utf"/>
     </copy>
   </target> 
 

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant?rev=399021&r1=399020&r2=399021&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant
Tue May  2 12:49:38 2006
@@ -1,77 +0,0 @@
-aclob.txt
-autoGeneratedJdbc30_app.properties
-batchUpdate_app.properties
-batchUpdate_derby.properties
-blobclob4BLOB_app.properties
-blobclob4BLOB_derby.properties
-bestrowidentifier.sql
-bestrowidentifier_app.properties
-checkDriver_app.properties
-checkDriver_derby.properties
-dbMetaDataJdbc30_app.properties
-dbMetaDataJdbc30_sed.properties
-default_app.properties
-default_derby.properties
-empty.txt
-getCurConnJdbc20_app.properties
-getCurConnJdbc20.sql
-littleclob.txt
-LOBTest_app.properties
-metadata_app.properties
-metadata_derby.properties
-metadata_sed.properties
-metadataJdbc20_app.properties
-metadataJdbc20_derby.properties
-metadataJdbc20_sed.properties
-metadataMultiConn_app.properties
-odbc_metadata_app.properties
-odbc_metadata_sed.properties
-parameterMapping_app.properties
-resultsetJdbc30_app.properties
-resultsetJdbc30_sed.properties
-resultsetStream.gif
-resultsetStream_app.properties
-resultsetJdbc30_sed.properties
-resultset_app.properties
-savepointJdbc30_app.properties
-savepointJdbc30_derby.properties
-secureUsers.sql
-secureUsers1.sql
-secureUsers1_app.properties
-secureUsers1_derby.properties
-secureUsers1_sed.properties
-secureUsers_app.properties
-secureUsers_derby.properties
-secureUsers_sed.properties
-secureUsersldap.sql
-secureUsersldap_app.properties
-secureUsersldap_derby.properties
-secureUsersldap_sed.properties
-searchclob.txt
-setTransactionIsolation_derby.properties
-setTransactionIsolation_sed.properties
-short.txt
-StmtCloseFunTest_app.properties
-parameterMetaDataJdbc30_app.properties
-users.sql
-users2.sql
-users2_app.properties
-users2_derby.properties
-users2_sed.properties
-users_app.properties
-users_derby.properties
-users_sed.properties
-xaAnotherTest.sql
-xaAnotherTest_app.properties
-xaAnotherTest_derby.properties
-xaAnotherTest_sed.properties
-xaMorph.sql
-xaSimpleNegative.sql
-xaSimpleNegative_derby.properties
-xaSimpleNegative_sed.properties
-xaSimplePositive.sql
-xaSimplePositive_app.properties
-xaSimplePositive_sed.properties
-xaSimplePositive_derby.properties
-xaStateTran.sql
-XATest_app.properties

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests.sql?rev=399021&r1=399020&r2=399021&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests.sql
(original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests.sql
Tue May  2 12:49:38 2006
@@ -386,7 +386,7 @@
 
 ---test with a file which has a differen records seperators (\n, \r , \r\n)
 create table nt1( a int , b char(30));
-CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'NT1', 'extin/mixednl.del',null, null, null,0);
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'NT1', 'extin/mixednl.del',null, null, 'UTF-8',0);
 select * from nt1;
 drop table nt1 ;
 
@@ -401,7 +401,7 @@
        web_flag varchar(1)
     );
 CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE ('APP', 'POSITION_INFO', 'extin/position_info.del',
-                                    null, null, null, 1);
+                                    null, null, 'US-ASCII', 1);
 select count(*) from position_info ;
 select detail_description from position_info where position_code='AG1000';
 CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE ('APP', 'POSITION_INFO', 'extinout/pinfo.del',



Mime
View raw message