1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
/*
* Copyright (c) 2021, 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.
*/
/*
* @test
* @bug 8276764
* @summary test that the jar content ordering is sorted
* @library /test/lib
* @modules jdk.jartool
* @build jdk.test.lib.Platform
* jdk.test.lib.util.FileUtils
* @run testng ContentOrder
*/
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.io.UncheckedIOException;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.spi.ToolProvider;
import java.util.stream.Stream;
import java.util.zip.ZipException;
import jdk.test.lib.util.FileUtils;
public class ContentOrder {
private static final ToolProvider JAR_TOOL = ToolProvider.findFirst("jar")
.orElseThrow(() ->
new RuntimeException("jar tool not found")
);
private final String nl = System.lineSeparator();
private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
private final PrintStream out = new PrintStream(baos);
private Runnable onCompletion;
@BeforeMethod
public void reset() {
onCompletion = null;
}
@AfterMethod
public void run() {
if (onCompletion != null) {
onCompletion.run();
}
}
// Test that the jar content ordering when processing a single directory is sorted
@Test
public void testSingleDir() throws IOException {
mkdir("testjar/Ctest1", "testjar/Btest2/subdir1", "testjar/Atest3");
touch("testjar/Ctest1/testfile1", "testjar/Ctest1/testfile2", "testjar/Ctest1/testfile3");
touch("testjar/Btest2/subdir1/testfileC", "testjar/Btest2/subdir1/testfileB", "testjar/Btest2/subdir1/testfileA");
touch("testjar/Atest3/fileZ", "testjar/Atest3/fileY", "testjar/Atest3/fileX");
onCompletion = () -> rm("test.jar", "testjar");
jar("cf test.jar testjar");
jar("tf test.jar");
System.out.println(new String(baos.toByteArray()));
String output = "META-INF/" + nl +
"META-INF/MANIFEST.MF" + nl +
"testjar/" + nl +
"testjar/Atest3/" + nl +
"testjar/Atest3/fileX" + nl +
"testjar/Atest3/fileY" + nl +
"testjar/Atest3/fileZ" + nl +
"testjar/Btest2/" + nl +
"testjar/Btest2/subdir1/" + nl +
"testjar/Btest2/subdir1/testfileA" + nl +
"testjar/Btest2/subdir1/testfileB" + nl +
"testjar/Btest2/subdir1/testfileC" + nl +
"testjar/Ctest1/" + nl +
"testjar/Ctest1/testfile1" + nl +
"testjar/Ctest1/testfile2" + nl +
"testjar/Ctest1/testfile3" + nl;
Assert.assertEquals(baos.toByteArray(), output.getBytes());
}
// Test that when specifying multiple directories or releases that the sort
// ordering is done on each directory and release, reserving the order of
// the directories/releases specified on the command line
@Test
public void testMultiDirWithReleases() throws IOException {
mkdir("testjar/foo/classes",
"testjar/foo11/classes/Zclasses",
"testjar/foo11/classes/Yclasses",
"testjar/foo17/classes/Bclasses",
"testjar/foo17/classes/Aclasses");
touch("testjar/foo/classes/testfile1", "testjar/foo/classes/testfile2");
touch("testjar/foo11/classes/Zclasses/testfile1", "testjar/foo11/classes/Zclasses/testfile2");
touch("testjar/foo11/classes/Yclasses/testfileA", "testjar/foo11/classes/Yclasses/testfileB");
touch("testjar/foo17/classes/Bclasses/testfile1", "testjar/foo17/classes/Bclasses/testfile2");
touch("testjar/foo17/classes/Aclasses/testfileA", "testjar/foo17/classes/Aclasses/testfileB");
onCompletion = () -> rm("test.jar", "testjar");
jar("cf test.jar -C testjar/foo classes " +
"--release 17 -C testjar/foo17 classes/Bclasses -C testjar/foo17 classes/Aclasses " +
"--release 11 -C testjar/foo11 classes/Zclasses -C testjar/foo11 classes/Yclasses");
jar("tf test.jar");
System.out.println(new String(baos.toByteArray()));
String output = "META-INF/" + nl +
"META-INF/MANIFEST.MF" + nl +
"classes/" + nl +
"classes/testfile1" + nl +
"classes/testfile2" + nl +
"META-INF/versions/17/classes/Bclasses/" + nl +
"META-INF/versions/17/classes/Bclasses/testfile1" + nl +
"META-INF/versions/17/classes/Bclasses/testfile2" + nl +
"META-INF/versions/17/classes/Aclasses/" + nl +
"META-INF/versions/17/classes/Aclasses/testfileA" + nl +
"META-INF/versions/17/classes/Aclasses/testfileB" + nl +
"META-INF/versions/11/classes/Zclasses/" + nl +
"META-INF/versions/11/classes/Zclasses/testfile1" + nl +
"META-INF/versions/11/classes/Zclasses/testfile2" + nl +
"META-INF/versions/11/classes/Yclasses/" + nl +
"META-INF/versions/11/classes/Yclasses/testfileA" + nl +
"META-INF/versions/11/classes/Yclasses/testfileB" + nl;
Assert.assertEquals(baos.toByteArray(), output.getBytes());
}
private Stream<Path> mkpath(String... args) {
return Arrays.stream(args).map(d -> Paths.get(".", d.split("/")));
}
private void mkdir(String... dirs) {
System.out.println("mkdir -p " + Arrays.toString(dirs));
Arrays.stream(dirs).forEach(p -> {
try {
Files.createDirectories((new File(p)).toPath());
} catch (IOException x) {
throw new UncheckedIOException(x);
}
});
}
private void touch(String... files) {
System.out.println("touch " + Arrays.toString(files));
Arrays.stream(files).forEach(p -> {
try {
Files.createFile((new File(p)).toPath());
} catch (IOException x) {
throw new UncheckedIOException(x);
}
});
}
private void rm(String... files) {
System.out.println("rm -rf " + Arrays.toString(files));
Arrays.stream(files).forEach(p -> {
try {
Path path = (new File(p)).toPath();
if (Files.isDirectory(path)) {
FileUtils.deleteFileTreeWithRetry(path);
} else {
FileUtils.deleteFileIfExistsWithRetry(path);
}
} catch (IOException x) {
throw new UncheckedIOException(x);
}
});
}
private void jar(String cmdline) throws IOException {
System.out.println("jar " + cmdline);
baos.reset();
// the run method catches IOExceptions, we need to expose them
ByteArrayOutputStream baes = new ByteArrayOutputStream();
PrintStream err = new PrintStream(baes);
PrintStream saveErr = System.err;
System.setErr(err);
int rc = JAR_TOOL.run(out, err, cmdline.split(" +"));
System.setErr(saveErr);
if (rc != 0) {
String s = baes.toString();
if (s.startsWith("java.util.zip.ZipException: duplicate entry: ")) {
throw new ZipException(s);
}
throw new IOException(s);
}
}
}
|
