ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject ant git commit: try to fix test errors in Gump build
Date Sun, 23 Oct 2016 15:48:00 GMT
Repository: ant
Updated Branches:
  refs/heads/1.9.x 173c28f76 -> 8cf0c0bb4


try to fix test errors in Gump build


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

Branch: refs/heads/1.9.x
Commit: 8cf0c0bb49bddf92d95b6fa9e41b9b23ada63abf
Parents: 173c28f
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Sun Oct 23 17:47:35 2016 +0200
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Sun Oct 23 17:47:35 2016 +0200

----------------------------------------------------------------------
 .../apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java  | 8 ++++++++
 .../tools/ant/taskdefs/optional/junit/JUnitTaskTest.java     | 8 ++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/8cf0c0bb/src/tests/junit/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
index f36a4db..648e644 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
@@ -65,6 +65,14 @@ public class TraXLiaisonTest extends AbstractXSLTLiaisonTest
         } catch (Exception exc) {
             Assume.assumeNoException("xalan redirect is not on the classpath", exc);
         }
+        try {
+            String factoryName = TransformerFactory.newInstance().getClass().getName();
+            Assume.assumeFalse("TraxFactory is Xalan",
+                              "org.apache.xalan.processor.TransformerFactoryImpl"
+                              .equals(factoryName));
+        } catch (TransformerFactoryConfigurationError exc) {
+            throw new RuntimeException(exc);
+        }
         File xsl = getFile("/taskdefs/optional/xalan-redirect-in.xsl");
         liaison.setStylesheet(xsl);
         ((TraXLiaison) liaison)

http://git-wip-us.apache.org/repos/asf/ant/blob/8cf0c0bb/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
index 470d8bc..9787aab 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
@@ -485,7 +485,9 @@ public class JUnitTaskTest {
                 }
             }
             assertTrue("No exports", resExports.isEmpty());
-            assertEquals("Expected classpath", cp.toString(), resCp);
+            if (System.getProperty(MagicNames.BUILD_SYSCLASSPATH) == null) {
+                assertEquals("Expected classpath", cp.toString(), resCp);
+            }
             assertEquals("Expected modulepath", mp.toString(), resMp);
         } finally {
             delete(workDir);
@@ -539,7 +541,9 @@ public class JUnitTaskTest {
                 }
             }
             assertTrue("No exports", resExports.isEmpty());
-            assertNull("No classpath", resCp);
+            if (System.getProperty(MagicNames.BUILD_SYSCLASSPATH) == null) {
+                assertNull("No classpath", resCp);
+            }
             assertEquals("Expected modulepath", mp.toString(), resMp);
         } finally {
             delete(workDir);


Mime
View raw message