author | herrick |
Fri, 01 Nov 2019 10:25:15 -0400 | |
branch | JDK-8200758-branch |
changeset 58890 | 6539ad1d90aa |
parent 58417 | 67ffaf3a2b75 |
permissions | -rw-r--r-- |
58417
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
1 |
/* |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
2 |
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
4 |
* |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
10 |
* |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
15 |
* accompanied this code). |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
16 |
* |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
20 |
* |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
23 |
* questions. |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
24 |
*/ |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
25 |
package jdk.jpackage.internal; |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
26 |
|
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
27 |
import java.nio.file.Path; |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
28 |
import static org.hamcrest.CoreMatchers.is; |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
29 |
import static org.hamcrest.CoreMatchers.not; |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
30 |
import static org.junit.Assert.*; |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
31 |
import org.junit.Test; |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
32 |
|
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
33 |
|
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
34 |
public class ToolValidatorTest { |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
35 |
|
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
36 |
@Test |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
37 |
public void testAvailable() { |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
38 |
assertNull(new ToolValidator(TOOL_JAVA).validate()); |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
39 |
} |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
40 |
|
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
41 |
@Test |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
42 |
public void testNotAvailable() { |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
43 |
assertValidationFailure(new ToolValidator(TOOL_UNKNOWN).validate(), true); |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
44 |
} |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
45 |
|
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
46 |
@Test |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
47 |
public void testVersionParserUsage() { |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
48 |
// Without minimal version configured, version parser should not be used |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
49 |
new ToolValidator(TOOL_JAVA).setVersionParser(unused -> { |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
50 |
throw new RuntimeException(); |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
51 |
}).validate(); |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
52 |
|
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
53 |
// Minimal version is 1, actual is 10. Should be OK. |
58890
6539ad1d90aa
8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents:
58417
diff
changeset
|
54 |
assertNull(new ToolValidator(TOOL_JAVA).setMinimalVersion( |
6539ad1d90aa
8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents:
58417
diff
changeset
|
55 |
new DottedVersion("1")).setVersionParser(unused -> "10").validate()); |
58417
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
56 |
|
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
57 |
// Minimal version is 5, actual is 4.99.37. Error expected. |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
58 |
assertValidationFailure(new ToolValidator(TOOL_JAVA).setMinimalVersion( |
58890
6539ad1d90aa
8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents:
58417
diff
changeset
|
59 |
new DottedVersion("5")).setVersionParser(unused -> "4.99.37").validate(), |
6539ad1d90aa
8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents:
58417
diff
changeset
|
60 |
false); |
6539ad1d90aa
8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents:
58417
diff
changeset
|
61 |
|
6539ad1d90aa
8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents:
58417
diff
changeset
|
62 |
// Minimal version is 8, actual is 10, lexicographical comparison is used. Error expected. |
6539ad1d90aa
8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents:
58417
diff
changeset
|
63 |
assertValidationFailure(new ToolValidator(TOOL_JAVA).setMinimalVersion( |
6539ad1d90aa
8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents:
58417
diff
changeset
|
64 |
"8").setVersionParser(unused -> "10").validate(), false); |
6539ad1d90aa
8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents:
58417
diff
changeset
|
65 |
|
6539ad1d90aa
8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents:
58417
diff
changeset
|
66 |
// Minimal version is 8, actual is 10, Use DottedVersion class for comparison. Should be OK. |
6539ad1d90aa
8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents:
58417
diff
changeset
|
67 |
assertNull(new ToolValidator(TOOL_JAVA).setMinimalVersion( |
6539ad1d90aa
8233333 : Incorrect comparison of number version strings in ToolValidator
herrick
parents:
58417
diff
changeset
|
68 |
new DottedVersion("8")).setVersionParser(unused -> "10").validate()); |
58417
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
69 |
} |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
70 |
|
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
71 |
private static void assertValidationFailure(ConfigException v, |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
72 |
boolean withCause) { |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
73 |
assertNotNull(v); |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
74 |
assertThat("", is(not(v.getMessage().strip()))); |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
75 |
assertThat("", is(not(v.advice.strip()))); |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
76 |
if (withCause) { |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
77 |
assertNotNull(v.getCause()); |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
78 |
} else { |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
79 |
assertNull(v.getCause()); |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
80 |
} |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
81 |
} |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
82 |
|
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
83 |
private final static String TOOL_JAVA; |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
84 |
private final static String TOOL_UNKNOWN = Path.of(System.getProperty( |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
85 |
"java.home"), "bin").toString(); |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
86 |
|
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
87 |
static { |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
88 |
String fname = "java"; |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
89 |
if (Platform.isWindows()) { |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
90 |
fname = fname + ".exe"; |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
91 |
} |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
92 |
TOOL_JAVA = Path.of(System.getProperty("java.home"), "bin", fname).toString(); |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
93 |
} |
67ffaf3a2b75
8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents:
diff
changeset
|
94 |
} |