From b1d4f59db3efe66713403b0bbd30582e47f266e3 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sat, 29 Apr 2006 15:24:27 +0000
Subject: [PATCH] tests for PR 38732

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@398177 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/rmic/rmic.xml      | 20 +++++++++++++++++++
 .../tools/ant/taskdefs/RmicAdvancedTest.java  | 20 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/etc/testcases/taskdefs/rmic/rmic.xml b/src/etc/testcases/taskdefs/rmic/rmic.xml
index 634229a06..746ad9813 100644
--- a/src/etc/testcases/taskdefs/rmic/rmic.xml
+++ b/src/etc/testcases/taskdefs/rmic/rmic.xml
@@ -108,6 +108,12 @@
     <available property="kaffe.present" classname="jkaffe.rmi.rmic.RMIC"/>
     <available property="rmic.present" classname="sun.rmi.rmic.Main"/>
     <available property="wlrmic.present" classname="weblogic.rmic"/>
+    <condition property="rmic6.present">
+      <and>
+        <isset property="rmic.present"/>
+        <available classname="java.util.Service"/>
+      </and>
+    </condition>
   </target>
 
   <target name="testDefault" depends="init">
@@ -243,4 +249,18 @@
     <assertBaseCompiled/>
   </target>
 
+  <target name="testXnew" if="rmic6.present" depends="init">
+    <base-rmic compiler="sun">
+      <compilerarg value="-Xnew"/>
+    </base-rmic>
+    <assertBaseCompiled/>
+  </target>
+
+  <target name="testXnewForked" if="rmic6.present" depends="init">
+    <base-rmic compiler="forking">
+      <compilerarg value="-Xnew"/>
+    </base-rmic>
+    <assertBaseCompiled/>
+  </target>
+
 </project>
\ No newline at end of file
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java b/src/testcases/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
index 1fdf2293e..d8da7d405 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2004-2005 The Apache Software Foundation
+ * Copyright  2004-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -194,6 +194,24 @@ public class RmicAdvancedTest extends BuildFileTest {
         executeTarget("testVersionCompat");
     }
 
+    /**
+     * test that passes -Xnew to sun's rmic.
+     *
+     * @throws Exception
+     */
+    public void testXnew() throws Exception {
+        executeTarget("testXnew");
+    }
+
+    /**
+     * test that passes -Xnew to sun's rmic running in a different VM.
+     *
+     * @throws Exception
+     */
+    public void testXnewForked() throws Exception {
+        executeTarget("testXnewForked");
+    }
+
     /**
      * this little bunny verifies that we can load stuff, and that
      * a failure to execute is turned into a fault