Browse Source

try to fix test errors in Gump build

master
Stefan Bodewig 8 years ago
parent
commit
8cf0c0bb49
2 changed files with 14 additions and 2 deletions
  1. +8
    -0
      src/tests/junit/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
  2. +6
    -2
      src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java

+ 8
- 0
src/tests/junit/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java View File

@@ -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)


+ 6
- 2
src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java View File

@@ -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);


Loading…
Cancel
Save