db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r395486 - in /db/derby/code/trunk/java: drda/org/apache/derby/impl/drda/TestProto.java testing/README.htm testing/org/apache/derbyTesting/functionTests/harness/CopySuppFiles.java
Date Thu, 20 Apr 2006 05:16:46 GMT
Author: fuzzylogic
Date: Wed Apr 19 22:16:44 2006
New Revision: 395486

URL: http://svn.apache.org/viewcvs?rev=395486&view=rev
DERBY-658: Update README.htm for testing, fix TestProto and multi tests to run on non-ASCII

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


Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java?rev=395486&r1=395485&r2=395486&view=diff
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/TestProto.java Wed Apr 19 22:16:44
@@ -20,21 +20,21 @@
 package org.apache.derby.impl.drda;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.DataOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileReader;
 import java.io.StreamTokenizer;
+import java.io.UnsupportedEncodingException;
 import java.net.Socket;
 import java.net.UnknownHostException;
-import java.util.Hashtable;
 import java.util.Enumeration;
-import java.util.Vector;
+import java.util.Hashtable;
 import java.util.Locale;
-import java.io.UnsupportedEncodingException;
-import java.io.FileNotFoundException;
+import java.util.Vector;
 	This class is used to test error conditions in the protocol.
@@ -178,16 +178,16 @@
 		String prev_filename = current_filename;
 		current_filename = filename;
         	String hostName=getHostName();
-		FileReader fr;
+		BufferedReader fr;
-			fr = new FileReader(filename);
+			fr = new BufferedReader(new InputStreamReader(new FileInputStream(filename),"UTF-8"));
 		} catch (FileNotFoundException fnfe) {
 			// if useprocess=false & we're running in a suite, 
 			// the location is different, try it
 			String userdir =  System.getProperty("user.dir");
 			String sep =  System.getProperty("file.separator");
-			fr = new FileReader(userdir + sep + ".." + sep + filename);
+			fr = new BufferedReader (new InputStreamReader(new FileInputStream(userdir + sep + ".."
+ sep + filename),"UTF-8"));
 		tkn = new StreamTokenizer(fr);
 		int val;

Modified: db/derby/code/trunk/java/testing/README.htm
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/README.htm?rev=395486&r1=395485&r2=395486&view=diff
--- db/derby/code/trunk/java/testing/README.htm (original)
+++ db/derby/code/trunk/java/testing/README.htm Wed Apr 19 22:16:44 2006
@@ -100,6 +100,9 @@
   <li><a href="#hostName">4.14 Testing with Network Server on a remote
+    <p><a href="#4.15_Encoding_issues">4.15 Encoding Issues</a></p>
+  </li>
+  <li>
 Compatibility Tests</a></p>
@@ -666,6 +669,17 @@
+    <p>encodingTests</p>
+  </li>
+  <ul>
+    <li>
+      <p>runs tests with derbyTesting=UTF-16. </p>
+    </li>
+    <li>
+      <p>takes 2 to 5 minutes</p>
+    </li>
+  </ul>
+  <li>
     <p style="margin-bottom: 0in;">derbyall </p>
@@ -850,7 +864,12 @@
     <p>a .pass or .fail file. This file lists the test if it passes
 under .pass, and under .fail if the output in .out is different from
-the expected output in the master. </p>
+the expected output in the master.</p>
+  </li>
+  <li>
+    <p>.tmpmstr file. This file is a copy of the master file created in
+local encoding, and in the case of networkserver, massaged to eliminate
+irrelevant differences. This is the file the .out file is compared with.</p>
 <p>possibly created:</p>
@@ -861,13 +880,16 @@
 get cleaned up. </p>
-    <p style="margin-bottom: 0in;">.tmpstr file is created for network
-server tests and is a possibly massaged copy of the master file the
-output needs to be compared with. </p>
+    <p>.err and .out files in network server database files for any
+additional error output.</p>
-    <p>.err and .out files in network server database files for any
-additional error output. </p>
+    <p>one or more database directories</p>
+  </li>
+  <li>
+    <p>.utf8out file - see section on <a href="#4.15_Encoding_issues">Encoding</a>
+    </p>
 <p>When the test is successful, cleanup will occur unless the test
@@ -1067,14 +1089,13 @@
 functionality than the (rest of the) functionTests, which are more
 geared toward how end-users might use functionality.</p>
-  <li>.junit&nbsp;&nbsp;&nbsp;&nbsp; junit tests. These require
+  <li>
+    <p>.junit&nbsp;&nbsp;&nbsp;&nbsp; junit tests. These require
 junit.jar to run and are actually run with junit.textui.TestRunner. The
-actual tests are .java files. <br>
+actual tests are .java files.<br>
+    </p>
 <h3><a name="mozTocId809770"></a><a name="ov2"></a>4.2 Supporting
 files for tests</h3>
 <p>Various additional files may be used by a test, for instance, to
@@ -1089,7 +1110,11 @@
 <p>For example, in the file
-<font size="2">supportfiles=tools/dblook_makeDB.sql,tools/dblook_test.jar</font></p>
+<font size="2">supportfiles=tools/dblook_makeDB.sql,tools/dblook_test.jar<br>
+<p>To support running on non-ISO-5889 systems, the harness copies files
+ending in sql, .view, .multi, .properties, .txt and .policy into local
+encoding; all other files are copied into UTF-8 encoding.</p>
 <h3><a name="mozTocId427577"></a><a name="ov3"></a>4.3
 <p>Every test directory has a default_app.properties. This file is
@@ -1208,7 +1233,7 @@
 <p>The diff is executed between the final resulting output and the
-master file found.</p>
+master file found copied into local encoding as .tmpmstr.</p>
 <h3><a name="Adding_a_new_test"></a>4.7&nbsp; Adding a new test</h3>
 <p>To add a new test: </p>
@@ -1237,8 +1262,21 @@
     <p style="margin-bottom: 0in;">if the output is correct, copy it to
-the master directory. Note that there is no copyfiles.ant file needed
-for the master directory, all .out files are automatically copied. </p>
+the master directory.&nbsp; If you are running the on a non-ISO5889
+encoded system, run the test with -DgenerateUTF8Out=true. This will
+create a .utf8out file in fixed UTF-8 encoding - use that file to copy
+into svn.<br>
+    </p>
+  </li>
+  <li>
+    <p style="margin-bottom: 0in;">Build. This will copy the newly
+created master into a matching directory structure in the classes
+directory and, when building jars, the master files will be included in
+derbyTesting.jar, so it can be found by the harness at run time. Note
+that there is no copyfiles.ant file needed
+for the master directory, all .out files are automatically copied to
+the classes directory on build. </p>
     <p style="margin-bottom: 0in;">run the test again. Investigate if
@@ -1271,11 +1309,17 @@
 For instance, to shutdown a database one can use:</p>
-<div style="margin-left: 80px;">TestUtil.getConnection("wombat","shutdown=true");</div>
+<div style="margin-left: 80px;">
+    <p>ensure that the test does not cause any problems on non-ISO-5889
+systems. See section <a href="#4.15_Encoding_issues">4.15.</a></p>
+  </li>
+  <li>
     <p style="margin-bottom: 0in;">ensure the test does not have hard
 coded 'localhost' for network
 connections. Instead, use the method TestUtil.getHostName() to find if
@@ -1286,7 +1330,10 @@
 suites/*.xml file, maintaining proper xml syntax. </p>
-    <p>run the suite, and correct any problems found. </p>
+    <p>run the suite, and correct any problems found.</p>
+  </li>
+  <li>make sure you svn add all new files, and that the svn:eol-style
+is native for all text files, and not for any binary files.<br>
@@ -1564,7 +1611,8 @@
-      <br>
+generateUTF8Out - copies the test .out into UTF-8 encoding. See section
+      <a href="#4.15_Encoding_issues">4.15</a>.<br>
@@ -1707,7 +1755,7 @@
- style="width: 786px; height: 31px; text-align: left; margin-right: auto; margin-left: 40px;"
+ style="text-align: left; margin-right: auto; margin-left: 40px; height: 31px; width: 786px;"
  border="1" cellpadding="2" cellspacing="2">
@@ -1798,7 +1846,108 @@
 DerbyNetRemote.exclude and DerbyNetClientRemote.exclude) have been
 created to skip some tests that cannot be run against a remote server
 because of those implications. <br>
+<h3><a name="encoding"></a></h3>
+<h3><a name="4.15_Encoding_issues"></a>4.15 Encoding issues</h3>
+<p>There are three aspects to dealing with encoding issues, how to run
+a test with specific encoding, what to do to ensure a test can be run
+without relying on a certain encoding, and how to generate test output
+in fixed encoding.<br>
+  <li>
+    <h4>Run a test with a specific encoding</h4>
+  </li>
+<p style="margin-left: 40px;">To force a specific test to run with a
+encoding one can use the property derbyTesting.encoding. This is
+currently only supported with jdk15. For instance,
+to run a specific .java test one time only with
+ style="margin-left: auto; margin-right: auto; text-align: left; height: 32px; width: 760px;"
+ border="1" cellpadding="2" cellspacing="2">
+  <tbody>
+    <tr>
+      <td style="vertical-align: top;">java
+      </small></td>
+    </tr>
+  </tbody>
+<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
The test
+encodingTests contains tests that run with derbyTesting.encoding=UTF-16
+in the encodingTests.properties file:</p>
+<table style="width: 50%; text-align: left; margin-left: 40px;"
+ border="1" cellpadding="2" cellspacing="2">
+  <tbody>
+    <tr>
+      <td style="vertical-align: top;">derbyTesting.encoding=UTF-16</td>
+    </tr>
+  </tbody>
+  <li>
+    <h4>ensure running on non-ISO-5889 systems is possible</h4>
+  </li>
+<p style="margin-left: 40px;">Special care is required to ensure that
+individual tests can be run successfully on non-ISO-5889 systems. This
+<ul style="margin-left: 40px;">
+  <li>
+    <p>Ensure reading of files is done in an appropriate manner. The
+test harness will copy supportfiles with extension .*sql, .multi,
+.view, .txt, .properties, and .policy in local encoding. This means,
+that accessing such a file should be done with an appropriate
+mechanism; i.e. from within ij (i.e. a .sql test) use 'run', and from
+within a .java test use FileReader. The test harness will copy other
+supportfiles in fixed encoding, i.e. using UTF-8. To access these files
+and you will have to use an input mechanism that supports specifying
+of&nbsp; the encoding, such as FileInputStream and BufferedReader.
+Various .sql tests that run other .sql scripts use the test-specific
+mechanismn in ij to access files from the classpath: 'run resource'.
+This construct assumes the files listed are in the classpath - the
+classes dir or derbyTesting.jar - and they are assumed to be in UTF-8.</p>
+  </li>
+  <li>
+    <p>Avoid usage of non-encoding safe constructors for Strings. i.e.
+Avoid String(byte[]) and String(byte[],int,int) to create a string.</p>
+  </li>
+<p style="margin-left: 40px;"> </p>
+  <li>
+    <h4>Generating master files on non-ISO-5889 systems</h4>
+  </li>
+<ul style="margin-left: 40px;">
+  <li>
+    <p>Special care is required when developing tests and running them
+on non-ISO-5889 systems. The output files cannot be checked into a svn
+tree which is assumed to be ISO-5889 compatible. To avoid surprises,
+use the property -DgenerateUTF8Out which will create a .utf8out file
+which is a copy of the test output converted into UTF-8. Be careful not
+to let a file transfer program modify this file (for instance. ftp in
+ascii mode may try to convert the file).<br>
+    </p>
+    <table style="width: 90%; text-align: left;" border="1"
+ cellpadding="2" cellspacing="2">
+      <tbody>
+        <tr>
+          <td style="vertical-align: top;">java
+        </tr>
+      </tbody>
+    </table>
+  </li>
 <p style="margin-bottom: 0in;"><a name="Note1:"></a><font size="2">Note1:</font></p>
 <p style="margin-left: 0.42in; margin-bottom: 0in;"><font size="2">A

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/CopySuppFiles.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/CopySuppFiles.java?rev=395486&r1=395485&r2=395486&view=diff
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/CopySuppFiles.java
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/CopySuppFiles.java
Wed Apr 19 22:16:44 2006
@@ -68,7 +68,7 @@
                 // need to make a guess so we copy text files to local encoding
                 // on non-ascii systems...
-		        if ((fileName.indexOf("sql") > 0) || (fileName.indexOf("txt") > 0) || (fileName.indexOf(".view")
> 0) || (fileName.indexOf(".policy") > 0))
+		        if ((fileName.indexOf("sql") > 0) || (fileName.indexOf("txt") > 0) || (fileName.indexOf(".view")
> 0) || (fileName.indexOf(".policy") > 0) || (fileName.indexOf(".multi") > 0) ||
(fileName.indexOf(".properties") > 0))
                     BufferedReader inFile = new BufferedReader(new InputStreamReader(is,
                     PrintWriter pw = new PrintWriter

View raw message