author | ohair |
Wed, 06 Apr 2011 22:06:11 -0700 | |
changeset 9035 | 1255eb81cc2f |
parent 8553 | 46c2babb1e44 |
permissions | -rw-r--r-- |
2 | 1 |
/* |
9035
1255eb81cc2f
7033660: Update copyright year to 2011 on any files changed in 2011
ohair
parents:
8553
diff
changeset
|
2 |
* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. |
2 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
5506 | 19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
2 | 22 |
*/ |
23 |
||
24 |
/* @test |
|
25 |
* @bug 6237956 |
|
26 |
* @summary We must be able to read zip files created by Unix Info-Zip |
|
27 |
* @author Martin Buchholz |
|
28 |
*/ |
|
29 |
||
30 |
import java.util.*; |
|
31 |
import java.util.zip.*; |
|
32 |
import java.io.*; |
|
33 |
||
34 |
public class InfoZip { |
|
35 |
static int passed = 0, failed = 0; |
|
36 |
||
37 |
static void fail(String msg) { |
|
38 |
failed++; |
|
39 |
new Exception(msg).printStackTrace(); |
|
40 |
} |
|
41 |
||
42 |
static void unexpected(Throwable t) { |
|
43 |
failed++; |
|
44 |
t.printStackTrace(); |
|
45 |
} |
|
46 |
||
47 |
static void check(boolean condition, String msg) { |
|
48 |
if (! condition) |
|
49 |
fail(msg); |
|
50 |
} |
|
51 |
||
52 |
static void check(boolean condition) { |
|
53 |
check(condition, "Something's wrong"); |
|
54 |
} |
|
55 |
||
56 |
private static String contents(ZipFile zf, ZipEntry ze) throws Exception { |
|
57 |
InputStream is = zf.getInputStream(ze); |
|
58 |
String result = contents(is); |
|
59 |
is.close(); |
|
60 |
return result; |
|
61 |
} |
|
62 |
||
63 |
private static String contents(InputStream is) throws Exception { |
|
64 |
StringBuilder sb = new StringBuilder(); |
|
65 |
int c; |
|
66 |
while ((c = is.read()) != -1) |
|
67 |
sb.append((char)c); |
|
68 |
return sb.toString(); |
|
69 |
} |
|
70 |
||
71 |
private static void checkZipEntry(ZipEntry ze, String contents) { |
|
72 |
check(ze.getName().equals("someFile"), "filename"); |
|
73 |
check(ze.getExtra() != null, "extra"); |
|
74 |
check(contents.equals("Message in a Bottle\n"), "contents"); |
|
75 |
check(ze.getSize() == "Message in a Bottle\n".length()); |
|
76 |
} |
|
77 |
||
78 |
||
79 |
public static void main(String[] args) throws Exception { |
|
80 |
//---------------------------------------------------------------- |
|
81 |
// The file InfoZip.zip was created using Unix Info-Zip's zip, thus: |
|
82 |
// echo Message in a Bottle > someFile; zip InfoZip.zip someFile |
|
83 |
// Such a file has a LOC extra different from the CEN extra, |
|
84 |
// which cannot happen using JDK APIs. |
|
85 |
//---------------------------------------------------------------- |
|
86 |
File f = new File("InfoZip.zip"); |
|
87 |
||
8553
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
88 |
try (OutputStream os = new FileOutputStream(f)) { |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
89 |
os.write(new byte[] |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
90 |
{'P', 'K', 3, 4, 10, 0, 0, 0, 0, 0, -68, 8, 'k', |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
91 |
'2', 'V', -7, 'm', 9, 20, 0, 0, 0, 20, 0, 0, 0, |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
92 |
8, 0, 21, 0, 's', 'o', 'm', 'e', 'F', 'i', 'l', 'e', 'U', |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
93 |
'T', 9, 0, 3, 't', '_', '1', 'B', 't', '_', '1', 'B', 'U', |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
94 |
'x', 4, 0, -14, 'v', 26, 4, 'M', 'e', 's', 's', 'a', 'g', |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
95 |
'e', ' ', 'i', 'n', ' ', 'a', ' ', 'B', 'o', 't', 't', 'l', 'e', |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
96 |
10, 'P', 'K', 1, 2, 23, 3, 10, 0, 0, 0, 0, 0, |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
97 |
-68, 8, 'k', '2', 'V', -7, 'm', 9, 20, 0, 0, 0, 20, |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
98 |
0, 0, 0, 8, 0, 13, 0, 0, 0, 0, 0, 1, 0, |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
99 |
0, 0, -92, -127, 0, 0, 0, 0, 's', 'o', 'm', 'e', 'F', |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
100 |
'i', 'l', 'e', 'U', 'T', 5, 0, 3, 't', '_', '1', 'B', 'U', |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
101 |
'x', 0, 0, 'P', 'K', 5, 6, 0, 0, 0, 0, 1, 0, |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
102 |
1, 0, 'C', 0, 0, 0, 'O', 0, 0, 0, 0, 0, }); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
103 |
} |
2 | 104 |
|
5805
87c7dd70572a
6962067: TEST_BUG: Tests in java/util/zip/ZipFile leave file open
sherman
parents:
5506
diff
changeset
|
105 |
ZipEntry ze = null; |
8553
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
106 |
try (ZipFile zf = new ZipFile(f)) { |
5805
87c7dd70572a
6962067: TEST_BUG: Tests in java/util/zip/ZipFile leave file open
sherman
parents:
5506
diff
changeset
|
107 |
Enumeration<? extends ZipEntry> entries = zf.entries(); |
87c7dd70572a
6962067: TEST_BUG: Tests in java/util/zip/ZipFile leave file open
sherman
parents:
5506
diff
changeset
|
108 |
ze = entries.nextElement(); |
87c7dd70572a
6962067: TEST_BUG: Tests in java/util/zip/ZipFile leave file open
sherman
parents:
5506
diff
changeset
|
109 |
check(! entries.hasMoreElements()); |
87c7dd70572a
6962067: TEST_BUG: Tests in java/util/zip/ZipFile leave file open
sherman
parents:
5506
diff
changeset
|
110 |
checkZipEntry(ze, contents(zf, ze)); |
87c7dd70572a
6962067: TEST_BUG: Tests in java/util/zip/ZipFile leave file open
sherman
parents:
5506
diff
changeset
|
111 |
} |
2 | 112 |
|
8553
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
113 |
try (FileInputStream fis = new FileInputStream(f); |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
114 |
ZipInputStream is = new ZipInputStream(fis)) |
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
5805
diff
changeset
|
115 |
{ |
5805
87c7dd70572a
6962067: TEST_BUG: Tests in java/util/zip/ZipFile leave file open
sherman
parents:
5506
diff
changeset
|
116 |
ze = is.getNextEntry(); |
87c7dd70572a
6962067: TEST_BUG: Tests in java/util/zip/ZipFile leave file open
sherman
parents:
5506
diff
changeset
|
117 |
checkZipEntry(ze, contents(is)); |
87c7dd70572a
6962067: TEST_BUG: Tests in java/util/zip/ZipFile leave file open
sherman
parents:
5506
diff
changeset
|
118 |
check(is.getNextEntry() == null); |
87c7dd70572a
6962067: TEST_BUG: Tests in java/util/zip/ZipFile leave file open
sherman
parents:
5506
diff
changeset
|
119 |
} |
2 | 120 |
f.delete(); |
121 |
System.out.printf("passed = %d, failed = %d%n", passed, failed); |
|
122 |
if (failed > 0) throw new Exception("Some tests failed"); |
|
123 |
} |
|
124 |
} |