ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject [5/5] ant git commit: Merge branch '1.9.x'
Date Mon, 25 Jul 2016 14:22:09 GMT
Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/32f7fdb9
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/32f7fdb9
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/32f7fdb9

Branch: refs/heads/master
Commit: 32f7fdb9beb15c46f15b7047a02cde2639dec4c3
Parents: 8401960 fdfebe8
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Mon Jul 25 16:18:21 2016 +0200
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Mon Jul 25 16:18:21 2016 +0200

----------------------------------------------------------------------
 WHATSNEW                                        |   6 +
 manual/Tasks/rmic.html                          |   8 +-
 src/etc/testcases/taskdefs/rmic/rmic.xml        |  52 ++--
 .../ant/taskdefs/rmic/RmicAdapterFactory.java   |  11 +-
 .../apache/tools/ant/taskdefs/rmic/SunRmic.java |   8 +
 .../tools/ant/taskdefs/RmicAdvancedTest.java    |   7 +-
 .../apache/tools/ant/util/JavaEnvUtilsTest.java | 287 ++++++++++---------
 7 files changed, 205 insertions(+), 174 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/32f7fdb9/WHATSNEW
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ant/blob/32f7fdb9/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
----------------------------------------------------------------------
diff --cc src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
index 8bd229f,80a92a9..e27cc4d
--- a/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
@@@ -1,140 -1,149 +1,147 @@@
- /*
-  *  Licensed to the Apache Software Foundation (ASF) under one or more
-  *  contributor license agreements.  See the NOTICE file distributed with
-  *  this work for additional information regarding copyright ownership.
-  *  The ASF licenses this file to You under the Apache License, Version 2.0
-  *  (the "License"); you may not use this file except in compliance with
-  *  the License.  You may obtain a copy of the License at
-  *
-  *      http://www.apache.org/licenses/LICENSE-2.0
-  *
-  *  Unless required by applicable law or agreed to in writing, software
-  *  distributed under the License is distributed on an "AS IS" BASIS,
-  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  *  See the License for the specific language governing permissions and
-  *  limitations under the License.
-  *
-  */
- package org.apache.tools.ant.util;
- 
- import java.io.File;
- 
- import junit.framework.AssertionFailedError;
- 
- import org.apache.tools.ant.taskdefs.condition.Os;
- import org.junit.Assume;
- import org.junit.Test;
- 
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertFalse;
- import static org.junit.Assert.assertTrue;
- 
- /**
-  * TestCase for JavaEnvUtils.
-  *
-  */
- public class JavaEnvUtilsTest {
- 
-     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
- 
- 
-     @Test
-     public void testGetExecutableNetware() {
-         Assume.assumeTrue("Test only runs on netware", Os.isName("netware"));
-         assertEquals("java", JavaEnvUtils.getJreExecutable("java"));
-         assertEquals("javac", JavaEnvUtils.getJdkExecutable("javac"));
-         assertEquals("foo", JavaEnvUtils.getJreExecutable("foo"));
-         assertEquals("foo", JavaEnvUtils.getJdkExecutable("foo"));
-     }
- 
-     @Test
-     public void testGetExecutableWindows() {
-         Assume.assumeTrue("Test only runs on windows", Os.isFamily("windows"));
-         String javaHome =
-             FILE_UTILS.normalize(System.getProperty("java.home"))
-             .getAbsolutePath();
- 
-         String j = JavaEnvUtils.getJreExecutable("java");
-         assertTrue(j.endsWith(".exe"));
-         assertTrue(j+" is absolute", (new File(j)).isAbsolute());
-         try {
-             assertTrue(j+" is normalized and in the JRE dir",
-                        j.startsWith(javaHome));
-         } catch (AssertionFailedError e) {
-             // java.home is bogus
-             assertEquals("java.exe", j);
-         }
- 
-         j = JavaEnvUtils.getJdkExecutable("javac");
-         assertTrue(j.endsWith(".exe"));
-         try {
-             assertTrue(j+" is absolute", (new File(j)).isAbsolute());
-             String javaHomeParent =
-                 FILE_UTILS.normalize(javaHome+"/..").getAbsolutePath();
-             assertTrue(j+" is normalized and in the JDK dir",
-                        j.startsWith(javaHomeParent));
-             assertTrue(j+" is normalized and not in the JRE dir",
-                        !j.startsWith(javaHome));
- 
-         } catch (AssertionFailedError e) {
-             // java.home is bogus
-             assertEquals("javac.exe", j);
-         }
- 
-         assertEquals("foo.exe", JavaEnvUtils.getJreExecutable("foo"));
-         assertEquals("foo.exe", JavaEnvUtils.getJdkExecutable("foo"));
-     }
- 
-     @Test
-     public void testGetExecutableMostPlatforms() {
-         Assume.assumeTrue("Test only runs on non Netware and non Windows systems",
-                 !Os.isName("netware") && !Os.isFamily("windows"));
-         String javaHome =
-             FILE_UTILS.normalize(System.getProperty("java.home"))
-             .getAbsolutePath();
- 
-         // could still be OS/2
-         String extension = Os.isFamily("dos") ? ".exe" : "";
- 
-         String j = JavaEnvUtils.getJreExecutable("java");
-         if (!extension.equals("")) {
-             assertTrue(j.endsWith(extension));
-         }
-         assertTrue(j+" is absolute", (new File(j)).isAbsolute());
-         assertTrue(j+" is normalized and in the JRE dir",
-                    j.startsWith(javaHome));
- 
-         j = JavaEnvUtils.getJdkExecutable("javac");
-         if (!extension.equals("")) {
-             assertTrue(j.endsWith(extension));
-         }
-         assertTrue(j+" is absolute", (new File(j)).isAbsolute());
- 
-         String javaHomeParent =
-             FILE_UTILS.normalize(javaHome+"/..").getAbsolutePath();
-         assertTrue(j+" is normalized and in the JDK dir",
-                    j.startsWith(javaHomeParent));
- 
-         if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
-             assertTrue(j + " is normalized and in the JRE dir",
-                        j.startsWith(javaHome));
-         } else {
-             assertTrue(j + " is normalized and not in the JRE dir",
-                        !j.startsWith(javaHome));
-         }
- 
-         assertEquals("foo"+extension,
-                      JavaEnvUtils.getJreExecutable("foo"));
-         assertEquals("foo"+extension,
-                      JavaEnvUtils.getJdkExecutable("foo"));
-     }
- 
-     @Test
-     public void testIsAtLeastJavaVersion()
-     {
-         assertTrue(
-                 "Current java version is not at least the current java version...",
-                 JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.getJavaVersion()));
-     }
-   
- }
+ /*
+  *  Licensed to the Apache Software Foundation (ASF) under one or more
+  *  contributor license agreements.  See the NOTICE file distributed with
+  *  this work for additional information regarding copyright ownership.
+  *  The ASF licenses this file to You under the Apache License, Version 2.0
+  *  (the "License"); you may not use this file except in compliance with
+  *  the License.  You may obtain a copy of the License at
+  *
+  *      http://www.apache.org/licenses/LICENSE-2.0
+  *
+  *  Unless required by applicable law or agreed to in writing, software
+  *  distributed under the License is distributed on an "AS IS" BASIS,
+  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  *  See the License for the specific language governing permissions and
+  *  limitations under the License.
+  *
+  */
+ package org.apache.tools.ant.util;
+ 
+ import java.io.File;
+ 
+ import junit.framework.AssertionFailedError;
+ 
+ import org.apache.tools.ant.taskdefs.condition.Os;
+ import org.junit.Assume;
+ import org.junit.Test;
+ 
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertFalse;
+ import static org.junit.Assert.assertTrue;
+ import static org.junit.Assume.assumeTrue;
+ 
+ /**
+  * TestCase for JavaEnvUtils.
+  *
+  */
+ public class JavaEnvUtilsTest {
+ 
+     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
+ 
+ 
+     @Test
+     public void testGetExecutableNetware() {
+         Assume.assumeTrue("Test only runs on netware", Os.isName("netware"));
+         assertEquals("java", JavaEnvUtils.getJreExecutable("java"));
+         assertEquals("javac", JavaEnvUtils.getJdkExecutable("javac"));
+         assertEquals("foo", JavaEnvUtils.getJreExecutable("foo"));
+         assertEquals("foo", JavaEnvUtils.getJdkExecutable("foo"));
+     }
+ 
+     @Test
+     public void testGetExecutableWindows() {
+         Assume.assumeTrue("Test only runs on windows", Os.isFamily("windows"));
+         String javaHome =
+             FILE_UTILS.normalize(System.getProperty("java.home"))
+             .getAbsolutePath();
+ 
+         String j = JavaEnvUtils.getJreExecutable("java");
+         assertTrue(j.endsWith(".exe"));
+         assertTrue(j+" is absolute", (new File(j)).isAbsolute());
+         try {
+             assertTrue(j+" is normalized and in the JRE dir",
+                        j.startsWith(javaHome));
+         } catch (AssertionFailedError e) {
+             // java.home is bogus
+             assertEquals("java.exe", j);
+         }
+ 
+         j = JavaEnvUtils.getJdkExecutable("javac");
+         assertTrue(j.endsWith(".exe"));
+         try {
+             assertTrue(j+" is absolute", (new File(j)).isAbsolute());
+             String javaHomeParent =
+                 FILE_UTILS.normalize(javaHome+"/..").getAbsolutePath();
+             assertTrue(j+" is normalized and in the JDK dir",
+                        j.startsWith(javaHomeParent));
+             assertTrue(j+" is normalized and not in the JRE dir",
+                        !j.startsWith(javaHome));
+ 
+         } catch (AssertionFailedError e) {
+             // java.home is bogus
+             assertEquals("javac.exe", j);
+         }
+ 
+         assertEquals("foo.exe", JavaEnvUtils.getJreExecutable("foo"));
+         assertEquals("foo.exe", JavaEnvUtils.getJdkExecutable("foo"));
+     }
+ 
+     @Test
+     public void testGetExecutableMostPlatforms() {
+         Assume.assumeTrue("Test only runs on non Netware and non Windows systems",
+                 !Os.isName("netware") && !Os.isFamily("windows"));
+         String javaHome =
+             FILE_UTILS.normalize(System.getProperty("java.home"))
+             .getAbsolutePath();
+ 
+         // could still be OS/2
+         String extension = Os.isFamily("dos") ? ".exe" : "";
+ 
+         String j = JavaEnvUtils.getJreExecutable("java");
+         if (!extension.equals("")) {
+             assertTrue(j.endsWith(extension));
+         }
+         assertTrue(j+" is absolute", (new File(j)).isAbsolute());
+         assertTrue(j+" is normalized and in the JRE dir",
+                    j.startsWith(javaHome));
+ 
+         j = JavaEnvUtils.getJdkExecutable("javac");
+         if (!extension.equals("")) {
+             assertTrue(j.endsWith(extension));
+         }
+         assertTrue(j+" is absolute", (new File(j)).isAbsolute());
+ 
+         String javaHomeParent =
+             FILE_UTILS.normalize(javaHome+"/..").getAbsolutePath();
+         assertTrue(j+" is normalized and in the JDK dir",
+                    j.startsWith(javaHomeParent));
+ 
 -        if ((Os.isFamily("mac") && JavaEnvUtils.getJavaVersionNumber() <= JavaEnvUtils.VERSION_1_6)
 -            || JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
 -            assertTrue(j+" is normalized and in the JRE dir",
++        if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
++            assertTrue(j + " is normalized and in the JRE dir",
+                        j.startsWith(javaHome));
+         } else {
 -            assertTrue(j+" is normalized and not in the JRE dir",
++            assertTrue(j + " is normalized and not in the JRE dir",
+                        !j.startsWith(javaHome));
+         }
+ 
+         assertEquals("foo"+extension,
+                      JavaEnvUtils.getJreExecutable("foo"));
+         assertEquals("foo"+extension,
+                      JavaEnvUtils.getJdkExecutable("foo"));
+     }
+ 
+     @Test
+     public void testIsAtLeastJavaVersion()
+     {
+         assertTrue(
+                 "Current java version is not at least the current java version...",
+                 JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.getJavaVersion()));
+     }
+   
+     @Test
+     public void isJavaVersionSupportsBothVersionsOfJava9() {
+         assumeTrue(JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_9));
+         assertTrue("JAVA_1_9 is not considered equal to JAVA_9",
+                 JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_9));
+     }
 -
+ }


Mime
View raw message