-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #903 from jansupol/20.m3
Merge remote-tracking branch '2.0.x' into '2.1.x'
- Loading branch information
Showing
6 changed files
with
193 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
128 changes: 128 additions & 0 deletions
128
tests/release-test/src/test/java/org/glassfish/tyrus/test/artifacts/MultiReleaseTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| /* | ||
| * Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v. 2.0, which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following Secondary | ||
| * Licenses when the conditions for such availability set forth in the | ||
| * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, | ||
| * version 2 with the GNU Classpath Exception, which is available at | ||
| * https://www.gnu.org/software/classpath/license.html. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
| */ | ||
|
|
||
| package org.glassfish.tyrus.test.artifacts; | ||
|
|
||
| import org.apache.maven.model.Dependency; | ||
| import org.codehaus.plexus.util.xml.pull.XmlPullParserException; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import java.util.Properties; | ||
| import java.util.jar.JarEntry; | ||
| import java.util.jar.JarFile; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.Stream; | ||
| import java.util.zip.ZipEntry; | ||
|
|
||
| public class MultiReleaseTest { | ||
| private static final String s = ""; | ||
| private static final File localRepository = MavenUtil.getLocalMavenRepository(); | ||
| private static final Properties properties = MavenUtil.getMavenProperties(); | ||
|
|
||
| @Test | ||
| public void testIsJdkMultiRelease() throws IOException, XmlPullParserException { | ||
| TestResult result = testJdkVersions("11", jdk11multiRelease(properties)); | ||
| //Assertions.assertTrue(result.result(), "Some error occurred, see previous messages"); | ||
| Assert.assertTrue("Some error occurred, see previous messages", result.result()); | ||
| } | ||
|
|
||
| private static TestResult testJdkVersions(String version, DependencyPair... dependencies) | ||
| throws XmlPullParserException, IOException { | ||
| final TestResult result = new TestResult(); | ||
| if (dependencies == null || dependencies.length == 0) { | ||
| System.out.append("No dependencies found for jdk ").println(version); | ||
| return result; | ||
| } | ||
|
|
||
| Stream<Dependency> deps = MavenUtil.streamTyrusJars(); | ||
| List<File> files = MavenUtil.keepTyrusJars(deps, dependencies) | ||
| .map(dependency -> MavenUtil.getArtifactJar(localRepository, dependency, properties)) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| //Assertions.assertEquals(dependencies.length, files.size(), "Some jdk " + version + " dependencies not found"); | ||
| if (dependencies.length != files.size()) { | ||
| System.out.println("Expected:"); | ||
| for (DependencyPair pair : dependencies) { | ||
| System.out.println(pair); | ||
| } | ||
| System.out.println("Resolved:"); | ||
| for (File file : files) { | ||
| System.out.println(file.getName()); | ||
| } | ||
| Assert.assertEquals("Some jdk " + version + " dependencies not found", dependencies.length, files.size()); | ||
| } | ||
|
|
||
| for (File jar : files) { | ||
| JarFile jarFile = new JarFile(jar); | ||
| if (!jarFile.isMultiRelease()) { | ||
| result.exception().append("Not a multirelease jar ").append(jar.getName()).println("!"); | ||
| } | ||
| ZipEntry versions = jarFile.getEntry("META-INF/versions/" + version); | ||
| System.out.append("Accessing META-INF/versions/").append(version).append(" of ").println(jar.getName()); | ||
| if (versions == null) { | ||
| result.exception().append("No classes for JDK ").append(version).append(" for ").println(jar.getName()); | ||
| } | ||
| result.ok().append("Classes for JDK ").append(version).append(" found for ").println(jar.getName()); | ||
|
|
||
| Optional<JarEntry> file = jarFile.stream() | ||
| .filter(entry -> !entry.isDirectory()) | ||
| .filter(entry -> !entry.getName().contains("versions")) | ||
| .filter(entry -> entry.getName().endsWith(".class")) | ||
| .findAny(); | ||
| JarEntry jarEntry = file.get(); | ||
| result.append(ClassVersionChecker.checkClassVersion(jarFile, jarEntry, properties)); | ||
| } | ||
|
|
||
| // Verify that number of multirelease jars matches the expected dependencies | ||
| StringBuilder multi = new StringBuilder(); | ||
| int multiCnt = 0; | ||
| List<File> allFiles = MavenUtil.streamTyrusJars() | ||
| .map(dependency -> MavenUtil.getArtifactJar(localRepository, dependency, properties)) | ||
| .collect(Collectors.toList()); | ||
| for (File jar : files) { | ||
| JarFile jarFile = new JarFile(jar); | ||
| if (jarFile.isMultiRelease()) { | ||
| multiCnt++; | ||
| multi.append("Multirelease jar ").append(jar.getName()).append('\n'); | ||
| } | ||
| } | ||
| if (files.size() == multiCnt) { | ||
| result.ok().println("There is expected number of multirelease jars"); | ||
| } else { | ||
| result.exception().println("There is unexpected number of multirelease jars:"); | ||
| result.exception().append(multi).println(""); | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| private static DependencyPair[] jdk11multiRelease(Properties properties) throws XmlPullParserException, IOException { | ||
| String tyrusVersion = MavenUtil.getTyrusVersion(properties); | ||
| if (tyrusVersion.startsWith("2.0")) { | ||
| return MavenUtil.streamTyrusJars() | ||
| .map(d -> new DependencyPair(d.getGroupId(), d.getArtifactId())) | ||
| .collect(Collectors.toList()) | ||
| .toArray(new DependencyPair[0]); | ||
| } | ||
| return new DependencyPair[]{}; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -50,6 +50,4 @@ | |
| <module>debug</module> | ||
| </modules> | ||
|
|
||
| <dependencies> | ||
| </dependencies> | ||
| </project> | ||