db-derby-commits mailing list archives

Author: bpendleton
Date: Fri Jul  8 01:41:07 2011
New Revision: 1144123

URL: http://svn.apache.org/viewvc?rev=1144123&view=rev
Log:
DERBY-5303: Convert tools/URLCheck.sql to junit

This patch was contributed by Houx Zhang (houxzhang at gmail dot com)

This patch moves the execution of URLCheck.sql from the old derbytools
suite to the ToolScripts JUnit test suite.

The patch includes a modification to the LocalizedResource class in
the tools.jar library to ensure that if getNewOutput is called, then
subsequent uses of OutputWriter send their output to that output stream.


Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/URLCheck_app.properties
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java
    db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall?rev=1144123&r1=1144122&r2=1144123&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall
Fri Jul  8 01:41:07 2011
@@ -5,5 +5,4 @@ tools/ij.sql
 tools/ij2.sql
 tools/ij3.sql
 tools/ij5.sql
-tools/ij6.sql
-tools/URLCheck.sql
+tools/ij6.sql
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java?rev=1144123&r1=1144122&r2=1144123&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java
Fri Jul  8 01:41:07 2011
@@ -53,7 +53,7 @@ public final class ToolScripts extends S
      *
      */
     private static final String[] CLIENT_AND_EMBEDDED_TESTS = {
-        "ij4", "ij7",
+        "ij4", "ij7", "URLCheck"
     };
 
     /**

Modified: db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java?rev=1144123&r1=1144122&r2=1144123&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
(original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
Fri Jul  8 01:41:07 2011
@@ -266,7 +266,8 @@ public final class LocalizedResource  im
 	 */
 	public LocalizedOutput getNewEncodedOutput(OutputStream o,
 			String encoding) throws UnsupportedEncodingException{
-		return new LocalizedOutput(o, encoding);
+	    out = new LocalizedOutput(o, encoding);
+	    return out;
 	}
 	public String getTextMessage(String key ) {
         return getTextMessage(key, new Object[0]);