natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Skip Pack200 tests from JDK >=14 (since Pack200 tools and API have now been removed from that JDK version)

This commit is contained in:
Jaikiran Pai 2021-01-16 09:54:16 +05:30
parent 27491e3688
commit 824e8eebfe
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/java/org/apache/ivy/ant/IvyCachePathTest.java
View File

@ -23,9 +23,11 @@ import org.apache.ivy.TestHelper;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.condition.JavaVersion;
import org.apache.tools.ant.types.Path;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
@ -290,6 +292,10 @@ public class IvyCachePathTest {
@Test
public void testPackedOSGi() {
final JavaVersion java14OrHigher = new JavaVersion();
java14OrHigher.setAtLeast("14");
Assume.assumeFalse("Pack200 tools and API have been removed since JDK 14", java14OrHigher.eval());
project.setProperty("ivy.dep.file",
"test/repositories/1/packaging/module8/ivys/ivy-1.0.xml");
path.setPathid("testOSGi");

6
test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
View File

@ -37,7 +37,9 @@ import org.apache.ivy.util.Message;
import org.apache.ivy.util.MockMessageLogger;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
import org.apache.tools.ant.taskdefs.condition.JavaVersion;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@ -449,6 +451,10 @@ public class RetrieveTest {
*/
@Test
public void testUnpackExt() throws Exception {
final JavaVersion java14OrHigher = new JavaVersion();
java14OrHigher.setAtLeast("14");
Assume.assumeFalse("Pack200 tools and API have been removed since JDK 14", java14OrHigher.eval());
final ResolveOptions roptions = getResolveOptions(new String[] {"*"});
final URL url = new File("test/repositories/1/packaging/module10/ivys/ivy-1.0.xml").toURI()

6
test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java
View File

@ -34,7 +34,9 @@ import org.apache.ivy.core.resolve.ResolvedModuleRevision;
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.osgi.core.BundleInfo;
import org.apache.ivy.osgi.updatesite.UpdateSiteResolver;
import org.apache.tools.ant.taskdefs.condition.JavaVersion;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
@ -215,6 +217,10 @@ public class P2DescriptorTest {
@Test
public void testResolvePacked() throws Exception {
final JavaVersion java14OrHigher = new JavaVersion();
java14OrHigher.setAtLeast("14");
Assume.assumeFalse("Pack200 tools and API have been removed since JDK 14", java14OrHigher.eval());
settings.setDefaultResolver("p2-with-packed");
ModuleRevisionId mrid = ModuleRevisionId.newInstance(BundleInfo.BUNDLE_TYPE, "org.junit",