db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r398031 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ testData/ testData/ImportExport/ tests/tools/
Date Fri, 28 Apr 2006 22:33:50 GMT
Author: fuzzylogic
Date: Fri Apr 28 15:33:46 2006
New Revision: 398031

URL: http://svn.apache.org/viewcvs?rev=398031&view=rev
Log:
DERBY-1264: Fix importExportThruIj test on systems with non-ASCII native
encoding.

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

Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/sqlAnywhere1.utf
      - copied unchanged from r397980, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/sqlAnywhere1.txt
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/sqlAnywhere2.utf
      - copied unchanged from r397980, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/sqlAnywhere2.txt
Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/copyfiles.ant
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/sqlAnywhere1.txt
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/sqlAnywhere2.txt
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportThruIJ.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ_app.properties

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportThruIJ.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportThruIJ.out?rev=398031&r1=398030&r2=398031&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportThruIJ.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportThruIJ.out
Fri Apr 28 15:33:46 2006
@@ -430,7 +430,7 @@
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'SQLANYWHERE1' ,
                                   null , '1,2,3,4,5,7,8,9,10,11,12,13,14', 
-	 		          'extin/sqlAnywhere1.txt' , 
+	 		          'extin/sqlAnywhere1.utf' , 
 				  '|', '''', 'ASCII', 0) ;
 0 rows inserted/updated/deleted
 ij> select Company, Country from sqlAnywhere1 where country not like 'U%S%A%' and country
is not null;
@@ -554,7 +554,7 @@
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'SQLANYWHERE2' , 
 		                  null , '3, 4, 7, 5',
-			          'extin/sqlAnywhere2.txt' , 
+			          'extin/sqlAnywhere2.utf' , 
 				  '|', '''', 'ASCII', 0) ;
 0 rows inserted/updated/deleted
 ij> select count(*) from sqlAnywhere2;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml?rev=398031&r1=398030&r2=398031&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
Fri Apr 28 15:33:46 2006
@@ -29,7 +29,7 @@
     </copy>
     <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/ImportExport">
       <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/ImportExport"
-        includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/ImportExport/copyfiles.ant"/>
+        includes="*.asc,*.del,*.txt,*.utf"/>
     </copy>
   </target>
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ.sql?rev=398031&r1=398030&r2=398031&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ.sql
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ.sql
Fri Apr 28 15:33:46 2006
@@ -187,7 +187,7 @@
 
 call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'SQLANYWHERE1' ,
                                   null , '1,2,3,4,5,7,8,9,10,11,12,13,14', 
-	 		          'extin/sqlAnywhere1.txt' , 
+	 		          'extin/sqlAnywhere1.utf' , 
 				  '|', '''', 'ASCII', 0) ;
 
 	
@@ -202,7 +202,7 @@
 
 call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'SQLANYWHERE2' , 
 		                  null , '3, 4, 7, 5',
-			          'extin/sqlAnywhere2.txt' , 
+			          'extin/sqlAnywhere2.utf' , 
 				  '|', '''', 'ASCII', 0) ;
 select count(*) from sqlAnywhere2;
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ_app.properties?rev=398031&r1=398030&r2=398031&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ_app.properties
Fri Apr 28 15:33:46 2006
@@ -1,3 +1,5 @@
-supportfiles=testData/ImportExport/sqlAnywhere1.txt,testData/ImportExport/sqlAnywhere2.txt,testData/ImportExport/Access1.txt,testData/ImportExport/Access2.txt,testData/ImportExport/Access3.txt,testData/ImportExport/Alt1.asc,testData/ImportExport/Alt2.asc,testData/ImportExport/Alt3.asc,testData/ImportExport/Alt4.asc,testData/ImportExport/Alt5.asc,testData/ImportExport/Alt6.asc,testData/ImportExport/Tutor1.asc,testData/ImportExport/Tutor2.asc,testData/ImportExport/Tutor3.asc,testData/ImportExport/EndOfFile.txt
+supportfiles=testData/ImportExport/sqlAnywhere1.utf,testData/ImportExport/sqlAnywhere2.utf,testData/ImportExport/Access1.txt,testData/ImportExport/Access2.txt,testData/ImportExport/Access3.txt,testData/ImportExport/Alt1.asc,testData/ImportExport/Alt2.asc,testData/ImportExport/Alt3.asc,testData/ImportExport/Alt4.asc,testData/ImportExport/Alt5.asc,testData/ImportExport/Alt6.asc,testData/ImportExport/Tutor1.asc,testData/ImportExport/Tutor2.asc,testData/ImportExport/Tutor3.asc,testData/ImportExport/EndOfFile.txt
+# fails: supportfiles=testData/ImportExport/sqlAnywhere2.txt,testData/ImportExport/Access1.txt,testData/ImportExport/Access2.txt,testData/ImportExport/Access3.txt,testData/ImportExport/Alt1.asc,testData/ImportExport/Alt2.asc,testData/ImportExport/Alt3.asc,testData/ImportExport/Alt4.asc,testData/ImportExport/Alt5.asc,testData/ImportExport/Alt6.asc,testData/ImportExport/Tutor1.asc,testData/ImportExport/Tutor2.asc,testData/ImportExport/Tutor3.asc,testData/ImportExport/EndOfFile.txt
+#also fails: supportfiles=testData/ImportExport/sqlAnywhere1.txt,testData/ImportExport/Access1.txt,testData/ImportExport/Access2.txt,testData/ImportExport/Access3.txt,testData/ImportExport/Alt1.asc,testData/ImportExport/Alt2.asc,testData/ImportExport/Alt3.asc,testData/ImportExport/Alt4.asc,testData/ImportExport/Alt5.asc,testData/ImportExport/Alt6.asc,testData/ImportExport/Tutor1.asc,testData/ImportExport/Tutor2.asc,testData/ImportExport/Tutor3.asc,testData/ImportExport/EndOfFile.txt
 usedefaults=true
-useextdirs=true
\ No newline at end of file
+useextdirs=true



Mime
View raw message