You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2009/02/20 17:46:38 UTC
svn commit: r746291 -
/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
Author: bodewig
Date: Fri Feb 20 16:46:37 2009
New Revision: 746291
URL: http://svn.apache.org/viewvc?rev=746291&view=rev
Log:
separate unicode tests with and without EFS flag
Modified:
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
Modified: commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java?rev=746291&r1=746290&r2=746291&view=diff
==============================================================================
--- commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java (original)
+++ commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java Fri Feb 20 16:46:37 2009
@@ -37,19 +37,22 @@
private static final String OIL_BARREL_TXT = "\u00D6lf\u00E4sser.txt";
public void testUtf8FileRoundtrip() throws IOException {
- testFileRoundtrip(UTF_8);
+ testFileRoundtrip(UTF_8, true);
}
+ public void testUtf8FileRoundtripNoEFS() throws IOException {
+ testFileRoundtrip(UTF_8, false);
+ }
public void testCP437FileRoundtrip() throws IOException {
- testFileRoundtrip(CP437);
+ testFileRoundtrip(CP437, false);
}
public void testASCIIFileRoundtrip() throws IOException {
- testFileRoundtrip(US_ASCII);
+ testFileRoundtrip(US_ASCII, false);
}
- private static void testFileRoundtrip(String encoding)
+ private static void testFileRoundtrip(String encoding, boolean withEFS)
throws IOException {
try {
@@ -62,7 +65,7 @@
File file = File.createTempFile(encoding + "-test", ".zip");
try {
- createTestFile(file, encoding);
+ createTestFile(file, encoding, withEFS);
testFile(file, encoding);
} finally {
if (file.exists()) {
@@ -71,13 +74,15 @@
}
}
- private static void createTestFile(File file, String encoding)
+ private static void createTestFile(File file, String encoding,
+ boolean withEFS)
throws UnsupportedEncodingException, IOException {
ZipArchiveOutputStream zos = null;
try {
zos = new ZipArchiveOutputStream(file);
zos.setEncoding(encoding);
+ zos.setUseEFS(withEFS);
ZipArchiveEntry ze = new ZipArchiveEntry(OIL_BARREL_TXT);
if (!ZipEncodingHelper.canEncodeName(ze.getName(),