From b96c217e11f57d000643065351eba87fe68216c3 Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Mon, 19 Dec 2005 06:04:29 +0000
Subject: [PATCH] international tests for ManifestClassPath

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@357651 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/CoreTasks/apply.html              |  2 +-
 .../testcases/taskdefs/manifestclasspath.xml  | 41 ++++++++++++++++++-
 .../taskdefs/manifestclasspath/Alpha.java     |  5 +++
 .../taskdefs/manifestclasspath/Beta.java      |  9 ++++
 .../ant/taskdefs/ManifestClassPathTest.java   | 18 ++++++--
 5 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 src/etc/testcases/taskdefs/manifestclasspath/Alpha.java
 create mode 100644 src/etc/testcases/taskdefs/manifestclasspath/Beta.java

diff --git a/docs/manual/CoreTasks/apply.html b/docs/manual/CoreTasks/apply.html
index 47d052d96..15d012f22 100644
--- a/docs/manual/CoreTasks/apply.html
+++ b/docs/manual/CoreTasks/apply.html
@@ -432,4 +432,4 @@ to the <code>jsmin</code> program, the <code>addsourcefile</code> is set to
 Reserved.</p>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/etc/testcases/taskdefs/manifestclasspath.xml b/src/etc/testcases/taskdefs/manifestclasspath.xml
index 383785610..f457ea2b1 100644
--- a/src/etc/testcases/taskdefs/manifestclasspath.xml
+++ b/src/etc/testcases/taskdefs/manifestclasspath.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0"?>
 
 <project name="manifestclasspath" default="tearDown">
-
+  <!-- hebrew -->
+  <property name="jom" value="&#1501;&#1493;&#1497;"/>
+  <!-- german -->
+  <property name="aent" value="&#227;nt"/> 
   <target name="setUp">
     <property name="tmp" location="${basedir}/${ant.project.name}.tmp" />
     <mkdir dir="${tmp}" />
@@ -161,4 +164,40 @@
     </manifestclasspath>
   </target>
 
+  <target name="international-german" depends="setUp">
+      <antcall target="run-two-jars">
+          <param name="ext.dir" value="${aent}"/>
+      </antcall>
+  </target>
+  <target name="international-hebrew" depends="setUp">
+      <antcall target="run-two-jars">
+          <param name="ext.dir" value="${jom}"/>
+      </antcall>
+  </target>
+  <target name="run-two-jars">
+     <mkdir dir="${tmp}/${ext.dir}"/>
+      <javac srcdir="manifestclasspath" destdir="${tmp}" />
+       <jar destfile="${tmp}/${ext.dir}/alpha.jar">
+          <fileset dir="${tmp}">
+              <include name="Alpha.class"/>
+          </fileset>
+       </jar>
+        <manifestclasspath property="jar.classpath"
+                       jarfile="${tmp}/beta.jar">
+        <classpath>
+           <pathelement location="${tmp}/beta.jar"/>
+           <pathelement location="${tmp}/${ext.dir}/alpha.jar"/>
+        </classpath>
+       </manifestclasspath>
+      <jar destfile="${tmp}/beta.jar" >
+          <fileset dir="${tmp}">
+              <include name="Beta.class"/>
+          </fileset>
+          <manifest>
+             <attribute name="Main-Class" value="Beta"/>
+             <attribute name="Class-Path" value="${jar.classpath}"/>
+          </manifest>
+      </jar>
+      <java fork="true" jar="${tmp}/beta.jar"/>
+    </target>
 </project>
diff --git a/src/etc/testcases/taskdefs/manifestclasspath/Alpha.java b/src/etc/testcases/taskdefs/manifestclasspath/Alpha.java
new file mode 100644
index 000000000..757cc79a2
--- /dev/null
+++ b/src/etc/testcases/taskdefs/manifestclasspath/Alpha.java
@@ -0,0 +1,5 @@
+public class Alpha {
+    public String toString() {
+	return "alpha";
+    }
+}
diff --git a/src/etc/testcases/taskdefs/manifestclasspath/Beta.java b/src/etc/testcases/taskdefs/manifestclasspath/Beta.java
new file mode 100644
index 000000000..b0afe43f5
--- /dev/null
+++ b/src/etc/testcases/taskdefs/manifestclasspath/Beta.java
@@ -0,0 +1,9 @@
+public class Beta extends Alpha {
+    public String toString() {
+	return "beta " + super.toString();
+    }
+    public static void main(String [] args) {
+	Beta myBeta = new Beta();
+	System.out.println(myBeta.toString());
+    }
+}
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java
index e65b16bf3..eb573578d 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ManifestClassPathTest.java
@@ -16,11 +16,8 @@
  */
 package org.apache.tools.ant.taskdefs;
 
-import java.io.File;
-
-import java.util.Map;
-import java.util.Properties;
 
+import org.apache.tools.ant.taskdefs.condition.Os;
 import org.apache.tools.ant.BuildFileTest;
 
 /**
@@ -134,6 +131,19 @@ public class ManifestClassPathTest
                                               "../../resources/dsp-pres/ " +
                                               "../../resources/dsp-void/");
     }
+    public void testInternationalGerman() {
+        executeTarget("international-german");
+        expectLogContaining("run-two-jars", "beta alpha");
+    }
+    public void testInternationalHebrew() {
+        if (!Os.isFamily("windows")) {
+            executeTarget("international-hebrew");
+            expectLogContaining("run-two-jars", "beta alpha");
+        } else {
+            System.out.println("Test with hebrew path not attempted under Windows");
+        }
+
+    }
 
 } // END class ManifestClassPathTest