db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r397028 [3/3] - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNet/ master/DerbyNet/jdk16/ master/DerbyNetClient/ master/DerbyNetClient/jdk16/ tests/jdbc4/ tests/jdbcapi/ tests/tools/
Date Wed, 26 Apr 2006 00:26:55 GMT
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out?rev=397028&r1=397027&r2=397028&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out
Tue Apr 25 17:26:41 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/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out?rev=397028&r1=397027&r2=397028&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
Tue Apr 25 17:26:41 2006
@@ -1,16 +1,16 @@
 Test blobclob starting
 START: prepareCLOBMAIN
-===> inserting short.txt length = 56
-===> inserting littleclob.txt length = 10000
-===> inserting empty.txt length = 0
-===> inserting searchclob.txt length = 5000
-===> inserting aclob.txt length = 300000
+===> inserting short.utf length = 56
+===> inserting littleclob.utf length = 10000
+===> inserting empty.utf length = 0
+===> inserting searchclob.utf length = 5000
+===> inserting aclob.utf length = 300000
 START: prepareSearchClobTable
-===> inserting short.txt length = 56
-===> inserting littleclob.txt length = 10000
-===> inserting empty.txt length = 0
-===> inserting searchclob.txt length = 5000
-===> inserting aclob.txt length = 300000
+===> inserting short.utf length = 56
+===> inserting littleclob.utf length = 10000
+===> inserting empty.utf length = 0
+===> inserting searchclob.utf length = 5000
+===> inserting aclob.utf length = 300000
 prepareSearchClobTable finished
 START: prepareUnicodeTable
 START: prepareUnicodeFile
@@ -545,17 +545,17 @@
 START: clobTest96
 clobTest96 finished
 START: prepareBlobTable
-===> inserting short.txt length = 56
-===> inserting littleclob.txt length = 10000
-===> inserting empty.txt length = 0
-===> inserting searchclob.txt length = 5000
-===> inserting aclob.txt length = 300000
+===> inserting short.utf length = 56
+===> inserting littleclob.utf length = 10000
+===> inserting empty.utf length = 0
+===> inserting searchclob.utf length = 5000
+===> inserting aclob.utf length = 300000
 START: prepareSearchBlobTable
-===> inserting short.txt length = 56
-===> inserting littleclob.txt length = 10000
-===> inserting empty.txt length = 0
-===> inserting searchclob.txt length = 5000
-===> inserting aclob.txt length = 300000
+===> inserting short.utf length = 56
+===> inserting littleclob.utf length = 10000
+===> inserting empty.utf length = 0
+===> inserting searchclob.utf length = 5000
+===> inserting aclob.utf length = 300000
 START: blobTest0
 blobTest0 finished
 START: blobTest2

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out?rev=397028&r1=397027&r2=397028&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ieptests.out
Tue Apr 25 17:26:41 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/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnectionMethods_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnectionMethods_app.properties?rev=397028&r1=397027&r2=397028&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnectionMethods_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/TestConnectionMethods_app.properties
Tue Apr 25 17:26:41 2006
@@ -13,4 +13,4 @@
 excludeJCC=at-or-after:1.0
 
 supportfiles=tests/jdbc4/short.txt,tests/jdbc4/littleclob.txt,tests/jdbc4/aclob.txt
-useextdirs=true
\ No newline at end of file
+useextdirs=true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LOBTest.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LOBTest.java?rev=397028&r1=397027&r2=397028&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LOBTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/LOBTest.java
Tue Apr 25 17:26:41 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/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java?rev=397028&r1=397027&r2=397028&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java
Tue Apr 25 17:26:41 2006
@@ -86,11 +86,11 @@
 		fileLength = new long[numFiles];
         fileCRC32 = new long[numFiles];
 
-		fileName[0] = "short.txt";	// set up a short (fit in one page) blob/clob
-		fileName[1] = "littleclob.txt"; // set up a long (longer than a page) blob/clob
-		fileName[2] = "empty.txt"; // set up a blob/clob with nothing in it
-		fileName[3] = "searchclob.txt"; // set up a blob/clob to search with
-		fileName[4] = "aclob.txt"; // set up a really long (over 300K) blob/clob
+		fileName[0] = "short.utf";	// set up a short (fit in one page) blob/clob
+		fileName[1] = "littleclob.utf"; // set up a long (longer than a page) blob/clob
+		fileName[2] = "empty.utf"; // set up a blob/clob with nothing in it
+		fileName[3] = "searchclob.utf"; // set up a blob/clob to search with
+		fileName[4] = "aclob.utf"; // set up a really long (over 300K) blob/clob
 
 		for (int i = 0 ; i < numFiles; i++)
 		{
@@ -4106,18 +4106,23 @@
 			}
 			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/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB_app.properties?rev=397028&r1=397027&r2=397028&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB_app.properties
Tue Apr 25 17:26:41 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/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml?rev=397028&r1=397027&r2=397028&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
Tue Apr 25 17:26:41 2006
@@ -145,7 +145,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/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/lobStreams.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/lobStreams.java?rev=397028&r1=397027&r2=397028&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/lobStreams.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/lobStreams.java
Tue Apr 25 17:26:41 2006
@@ -48,10 +48,10 @@
 
         static
         {
-//            fileName[0] = "extin" + sep + "aclob.txt";
- //           fileName[1] = "extin" + sep + "littleclob.txt";
-            fileName[0] =  "aclob.txt";
-            fileName[1] =  "littleclob.txt";
+//            fileName[0] = "extin" + sep + "aclob.utf";
+ //           fileName[1] = "extin" + sep + "littleclob.utf";
+            fileName[0] =  "aclob.utf";
+            fileName[1] =  "littleclob.utf";
         }
         
         public static void main(String[] args)

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/lobStreams_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/lobStreams_app.properties?rev=397028&r1=397027&r2=397028&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/lobStreams_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/lobStreams_app.properties
Tue Apr 25 17:26:41 2006
@@ -1,6 +1,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/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetStream.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetStream.java?rev=397028&r1=397027&r2=397028&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetStream.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetStream.java
Tue Apr 25 17:26:41 2006
@@ -73,20 +73,20 @@
 				"insert into t2 (len, data) values (?, ?)");
 			String filePath = "extin";
 			String sep = System.getProperty("file.separator");
-			boolean exists = (new File("extin", "littleclob.txt")).exists();
+			boolean exists = (new File("extin", "littleclob.utf")).exists();
 			if (!exists)
 			{
 				String userDir = System.getProperty("user.dir");
 					filePath = userDir + sep + ".." + sep + filePath;
 			}
-			File file = new File(filePath + sep + "littleclob.txt");
+			File file = new File(filePath + sep + "littleclob.utf");
 			int fileSize = (int) file.length();
 			BufferedInputStream fileData = new BufferedInputStream(new FileInputStream(file));
 			ppw.setInt(1, fileSize);
 			ppw.setBinaryStream(2, fileData, fileSize);
 			ppw.executeUpdate();
 
-			file = new File(filePath + sep + "short.txt");
+			file = new File(filePath + sep + "short.utf");
 			fileSize = (int) file.length();
 			fileData = new BufferedInputStream(new FileInputStream(file));
 			ppw.setInt(1, fileSize);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetStream_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetStream_app.properties?rev=397028&r1=397027&r2=397028&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetStream_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetStream_app.properties
Tue Apr 25 17:26:41 2006
@@ -1,3 +1,3 @@
-supportfiles=tests/jdbcapi/resultsetStream.gif,tests/jdbcapi/littleclob.txt,tests/jdbcapi/short.txt
+supportfiles=tests/jdbcapi/resultsetStream.gif,tests/jdbcapi/littleclob.utf,tests/jdbcapi/short.utf
 usedefaults=true
 useextdirs=true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests.sql?rev=397028&r1=397027&r2=397028&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests.sql
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests.sql
Tue Apr 25 17:26:41 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