db4d383614
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282 Co-authored-by: Alex Buckley <alex.buckley@oracle.com> Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com> Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com> Co-authored-by: Mandy Chung <mandy.chung@oracle.com> Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com> Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com> Co-authored-by: Alexandr Scherbatiy <alexandr.scherbatiy@oracle.com> Co-authored-by: Amy Lu <amy.lu@oracle.com> Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com> Co-authored-by: Daniel Fuchs <daniel.fuchs@oracle.com> Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com> Co-authored-by: Harold Seigel <harold.seigel@oracle.com> Co-authored-by: Jaroslav Bachorik <jaroslav.bachorik@oracle.com> Co-authored-by: Jean-Francois Denise <jean-francois.denise@oracle.com> Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com> Co-authored-by: James Laskey <james.laskey@oracle.com> Co-authored-by: Lois Foltan <lois.foltan@oracle.com> Co-authored-by: Miroslav Kos <miroslav.kos@oracle.com> Co-authored-by: Huaming Li <huaming.li@oracle.com> Co-authored-by: Sean Mullan <sean.mullan@oracle.com> Co-authored-by: Naoto Sato <naoto.sato@oracle.com> Co-authored-by: Masayoshi Okutsu <masayoshi.okutsu@oracle.com> Co-authored-by: Peter Levart <peter.levart@gmail.com> Co-authored-by: Philip Race <philip.race@oracle.com> Co-authored-by: Claes Redestad <claes.redestad@oracle.com> Co-authored-by: Sergey Bylokhov <sergey.bylokhov@oracle.com> Co-authored-by: Alexandre Iline <alexandre.iline@oracle.com> Co-authored-by: Volker Simonis <volker.simonis@gmail.com> Co-authored-by: Staffan Larsen <staffan.larsen@oracle.com> Co-authored-by: Stuart Marks <stuart.marks@oracle.com> Co-authored-by: Semyon Sadetsky <semyon.sadetsky@oracle.com> Co-authored-by: Serguei Spitsyn <serguei.spitsyn@oracle.com> Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com> Co-authored-by: Valerie Peng <valerie.peng@oracle.com> Co-authored-by: Vincent Ryan <vincent.x.ryan@oracle.com> Co-authored-by: Weijun Wang <weijun.wang@oracle.com> Co-authored-by: Yuri Nesterenko <yuri.nesterenko@oracle.com> Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com> Co-authored-by: Alexander Kulyakthin <alexander.kulyakhtin@oracle.com> Co-authored-by: Felix Yang <felix.yang@oracle.com> Co-authored-by: Andrei Eremeev <andrei.eremeev@oracle.com> Co-authored-by: Frank Yuan <frank.yuan@oracle.com> Co-authored-by: Sergei Pikalev <sergei.pikalev@oracle.com> Co-authored-by: Sibabrata Sahoo <sibabrata.sahoo@oracle.com> Co-authored-by: Tiantian Du <tiantian.du@oracle.com> Co-authored-by: Sha Jiang <sha.jiang@oracle.com> Reviewed-by: alanb, mchung, naoto, rriggs, psandoz, plevart, mullan, ascarpino, vinnie, prr, sherman, dfuchs, mhaupt
182 lines
6.9 KiB
Java
182 lines
6.9 KiB
Java
/*
|
|
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
*
|
|
* This code is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License version 2 only, as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* version 2 for more details (a copy is included in the LICENSE file that
|
|
* accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU General Public License version
|
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
* or visit www.oracle.com if you need additional information or have any
|
|
* questions.
|
|
*/
|
|
|
|
/*
|
|
* Asm plugin testing.
|
|
* @test
|
|
* @summary Test resource sorting.
|
|
* @author Jean-Francois Denise
|
|
* @modules jdk.jlink/jdk.tools.jlink.internal
|
|
* jdk.jlink/jdk.tools.jlink.internal.plugins.asm
|
|
* @build AsmPluginTestBase
|
|
* @run main SortingTest
|
|
*/
|
|
|
|
import java.io.IOException;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.stream.Collectors;
|
|
|
|
import jdk.tools.jlink.internal.plugins.asm.AsmModulePool;
|
|
import jdk.tools.jlink.plugin.PluginException;
|
|
import jdk.tools.jlink.plugin.Pool;
|
|
import jdk.tools.jlink.plugin.Pool.ModuleData;
|
|
|
|
public class SortingTest extends AsmPluginTestBase {
|
|
|
|
public static void main(String[] args) throws Exception {
|
|
if (!isImageBuild()) {
|
|
System.err.println("Test not run. Not image build.");
|
|
return;
|
|
}
|
|
new SortingTest().test();
|
|
}
|
|
|
|
@Override
|
|
public void test() {
|
|
try {
|
|
classSorting();
|
|
moduleSorting();
|
|
} catch (Exception ex) {
|
|
throw new PluginException(ex);
|
|
}
|
|
}
|
|
|
|
private void classSorting() throws Exception {
|
|
List<String> sorted = new ArrayList<>(getResources());
|
|
sorted.sort(null);
|
|
ClassSorterPlugin sorterPlugin = new ClassSorterPlugin(sorted);
|
|
Pool resourcePool = sorterPlugin.visit(getPool());
|
|
sorterPlugin.test(getPool(), resourcePool);
|
|
}
|
|
|
|
private String getModuleName(String p) {
|
|
return p.substring(1, p.indexOf('/', 1));
|
|
}
|
|
|
|
private void moduleSorting() throws Exception {
|
|
List<String> sorted = new ArrayList<>(getResources());
|
|
sorted.sort((s1, s2) -> -getModuleName(s1).compareTo(getModuleName(s2)));
|
|
ModuleSorterPlugin sorterPlugin = new ModuleSorterPlugin();
|
|
Pool resourcePool = sorterPlugin.visit(getPool());
|
|
sorterPlugin.test(getPool(), resourcePool);
|
|
}
|
|
|
|
private class ModuleSorterPlugin extends TestPlugin {
|
|
|
|
@Override
|
|
public void visit() {
|
|
for (AsmModulePool modulePool : getPools().getModulePools()) {
|
|
modulePool.setSorter(resources -> {
|
|
List<String> sort = resources.getContent().stream()
|
|
.map(ModuleData::getPath)
|
|
.collect(Collectors.toList());
|
|
sort.sort(null);
|
|
return sort;
|
|
});
|
|
}
|
|
getPools().setModuleSorter(modules -> {
|
|
modules.sort((s1, s2) -> -s1.compareTo(s2));
|
|
return modules;
|
|
});
|
|
}
|
|
|
|
@Override
|
|
public void test(Pool inResources, Pool outResources) throws Exception {
|
|
if (!isVisitCalled()) {
|
|
throw new AssertionError("Resources not visited");
|
|
}
|
|
List<String> sortedResourcePaths = outResources.getContent().stream()
|
|
.map(ModuleData::getPath)
|
|
.collect(Collectors.toList());
|
|
|
|
List<String> defaultResourceOrder = new ArrayList<>();
|
|
for (ModuleData r : inResources.getContent()) {
|
|
if (!inResources.getContent().contains(r)) {
|
|
throw new AssertionError("Resource " + r.getPath() + " not in result pool");
|
|
}
|
|
defaultResourceOrder.add(r.getPath());
|
|
}
|
|
// Check that default sorting is not equal to sorted one
|
|
if (defaultResourceOrder.equals(sortedResourcePaths)) {
|
|
throw new AssertionError("Sorting not applied, default ordering");
|
|
}
|
|
// Check module order.
|
|
for (int i = 0; i < sortedResourcePaths.size() - 1; ++i) {
|
|
String first = sortedResourcePaths.get(i);
|
|
String p1 = getModuleName(first);
|
|
String second = sortedResourcePaths.get(i + 1);
|
|
String p2 = getModuleName(second);
|
|
if (p1.compareTo(p2) < 0 || p1.compareTo(p2) == 0 &&
|
|
removeModule(first).compareTo(removeModule(second)) >= 0) {
|
|
throw new AssertionError("Modules are not sorted properly: resources: " + first + " " + second);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private class ClassSorterPlugin extends TestPlugin {
|
|
|
|
private final List<String> expectedClassesOrder;
|
|
|
|
private ClassSorterPlugin(List<String> expectedClassesOrder) {
|
|
this.expectedClassesOrder = expectedClassesOrder;
|
|
}
|
|
|
|
@Override
|
|
public void visit() {
|
|
getPools().getGlobalPool().setSorter(
|
|
(resources) -> expectedClassesOrder.stream()
|
|
.map(resources::get)
|
|
.map(ModuleData::getPath)
|
|
.collect(Collectors.toList()));
|
|
}
|
|
|
|
@Override
|
|
public void test(Pool inResources, Pool outResources) throws Exception {
|
|
if (!isVisitCalled()) {
|
|
throw new AssertionError("Resources not visited");
|
|
}
|
|
List<String> sortedResourcePaths = outResources.getContent().stream()
|
|
.map(ModuleData::getPath)
|
|
.collect(Collectors.toList());
|
|
|
|
List<String> defaultResourceOrder = new ArrayList<>();
|
|
for (ModuleData r : getPool().getContent()) {
|
|
if (!getPool().getContent().contains(r)) {
|
|
throw new AssertionError("Resource " + r.getPath() + " not in result pool");
|
|
}
|
|
defaultResourceOrder.add(r.getPath());
|
|
}
|
|
// Check that default sorting is not equal to sorted one
|
|
if (defaultResourceOrder.equals(sortedResourcePaths)) {
|
|
throw new AssertionError("Sorting not applied, default ordering");
|
|
}
|
|
// Check that sorted is equal to result.
|
|
if (!expectedClassesOrder.equals(sortedResourcePaths)) {
|
|
throw new AssertionError("Sorting not properly applied");
|
|
}
|
|
}
|
|
}
|
|
}
|