Hi,
I made a mistake in the i18n patch that Andrew checked in - the messageLocale.sql test needed some extra files in the derbyTesting.jar.
Attached is a patch that modifies the build.xml to add those files to derbyTesting.jar & also modifies the messageLocale test & expected output files to remove (now) untrue comments.
Thx, Myrna
Index:
java/testing/org/apache/derbyTesting/functionTests/tests/i18n/messageLocale.sql
===================================================================
---
java/testing/org/apache/derbyTesting/functionTests/tests/i18n/messageLocale.sql
(revision 159336)
+++
java/testing/org/apache/derbyTesting/functionTests/tests/i18n/messageLocale.sql
(working copy)
@@ -1,6 +1,4 @@
--- THIS TEST WILL NOT WORK WITH THE .jar files
--- It uses a dummy message_qq_PP_testOnly.properties that exists
--- only in the codeline
+-- This test uses dummy messages from
org/apache/derby/loc/message_qq_PP_testOnly.properties
--
-- Message locale handling
--
Index:
java/testing/org/apache/derbyTesting/functionTests/master/messageLocale.out
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/master/messageLocale.out
(revision 159336)
+++ java/testing/org/apache/derbyTesting/functionTests/master/messageLocale.out
(working copy)
@@ -1,6 +1,4 @@
-ij> -- THIS TEST WILL NOT WORK WITH THE .jar files
--- It uses a dummy message_qq_PP_testOnly.properties that exists
--- only in the codeline
+ij> -- This test uses dummy messages from
org/apache/derby/loc/message_qq_PP_testOnly.properties
--
-- Message locale handling
--
Index: build.xml
===================================================================
--- build.xml (revision 159336)
+++ build.xml (working copy)
@@ -975,7 +975,7 @@
<target name="derbytestingjar" depends="initjars,ckderbytesting"
if="derbyTesting.available">
<zip destfile="${derby.jar.dir}/derbyTesting.jar" filesonly="true"
compress="true">
- <fileset dir="${out.dir}"
includes="org/apache/derbyTesting/functionTests/**,SimpleApp*,org/apache/derby/impl/tools/ij/mt*.class,org/apache/derby/impl/tools/ij/SimpleCharStream.class,org/apache/derby/impl/drda/TestProto.class,org/apache/derbyTesting/unitTests/*/*,org/apache/derby/iapi/services/diag/DiagnosticUtil.class,org/apache/derby/iapi/services/diag/Diagnosticable.class,org/apache/derby/iapi/services/diag/DiagnosticableGeneric.class,org/apache/derby/impl/store/access/conglomerate/QualifierUtil.class"/>
+ <fileset dir="${out.dir}"
includes="org/apache/derbyTesting/functionTests/**,SimpleApp*,org/apache/derby/impl/tools/ij/mt*.class,org/apache/derby/impl/tools/ij/SimpleCharStream.class,org/apache/derby/impl/drda/TestProto.class,org/apache/derbyTesting/unitTests/*/*,org/apache/derby/iapi/services/diag/DiagnosticUtil.class,org/apache/derby/iapi/services/diag/Diagnosticable.class,org/apache/derby/iapi/services/diag/DiagnosticableGeneric.class,org/apache/derby/impl/store/access/conglomerate/QualifierUtil.class,org/apache/derby/loc/m*_qq_PP_testOnly*"/>
</zip>
</target>
