This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
commit e79aa9839873b3e314d5b083a84783388aa1c7a5
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Oct 19 09:55:29 2023 -0400
Camel-case internal names
---
.../compress/archivers/cpio/CpioArchiveEntry.java | 2 +-
.../apache/commons/compress/AbstractTestCase.java | 26 ++--
.../compress/archivers/ExceptionMessageTest.java | 2 +-
.../archivers/tar/TarArchiveOutputStreamTest.java | 20 +--
.../compress/changes/ChangeSetTestCase.java | 168 ++++++++++-----------
.../deflate/DeflateCompressorInputStreamTest.java | 2 +-
6 files changed, 110 insertions(+), 110 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
index 0012f854..4e1988a3 100644
---
a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
+++
b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
@@ -126,7 +126,7 @@ import org.apache.commons.compress.utils.TimeUtils;
* c_min[8]
* c_rmaj[8] only valid for chr and blk special files
* c_rmin[8] only valid for chr and blk special files
- * c_namesize[8] count includes terminating NUL in pathname
+ * c_namesize[8] count includes terminating NUL in path name
* c_check[8] 0 for "new" portable format; for CRC format
* the sum of all the bytes in the file
* </pre>
diff --git a/src/test/java/org/apache/commons/compress/AbstractTestCase.java
b/src/test/java/org/apache/commons/compress/AbstractTestCase.java
index d06cfe6e..be5055ac 100644
--- a/src/test/java/org/apache/commons/compress/AbstractTestCase.java
+++ b/src/test/java/org/apache/commons/compress/AbstractTestCase.java
@@ -253,7 +253,7 @@ public abstract class AbstractTestCase {
/**
* Creates an archive of text-based files in several directories. The
- * archivename is the factory identifier for the archiver, for example zip,
+ * archive name is the factory identifier for the archiver, for example
zip,
* tar, cpio, jar, ar. The archive is created as a temp file.
*
* The archive contains the following files:
@@ -269,22 +269,22 @@ public abstract class AbstractTestCase {
* <li>test with spaces.txt</li>
* </ul>
*
- * @param archivename
+ * @param archiveName
* the identifier of this archive
* @return the newly created file
* @throws Exception
* in case something goes wrong
*/
- protected Path createArchive(final String archivename) throws Exception {
+ protected Path createArchive(final String archiveName) throws Exception {
ArchiveOutputStream out = null;
OutputStream stream = null;
try {
- archive = Files.createTempFile("test", "." + archivename);
+ archive = Files.createTempFile("test", "." + archiveName);
archive.toFile().deleteOnExit();
archiveList = new ArrayList<>();
stream = Files.newOutputStream(archive);
- out = factory.createArchiveOutputStream(archivename, stream);
+ out = factory.createArchiveOutputStream(archiveName, stream);
final File file1 = getFile("test1.xml");
final File file2 = getFile("test2.xml");
@@ -316,19 +316,19 @@ public abstract class AbstractTestCase {
/**
* Create an empty archive.
- * @param archivename
+ * @param archiveName
* @return the archive File
* @throws Exception
*/
- protected Path createEmptyArchive(final String archivename) throws
Exception {
+ protected Path createEmptyArchive(final String archiveName) throws
Exception {
ArchiveOutputStream out = null;
OutputStream stream = null;
archiveList = new ArrayList<>();
try {
- archive = Files.createTempFile("empty", "." + archivename);
+ archive = Files.createTempFile("empty", "." + archiveName);
archive.toFile().deleteOnExit();
stream = Files.newOutputStream(archive);
- out = factory.createArchiveOutputStream(archivename, stream);
+ out = factory.createArchiveOutputStream(archiveName, stream);
out.finish();
} finally {
if (out != null) {
@@ -343,19 +343,19 @@ public abstract class AbstractTestCase {
/**
* Create an archive with a single file "test1.xml".
*
- * @param archivename
+ * @param archiveName
* @return the archive File
* @throws Exception
*/
- protected Path createSingleEntryArchive(final String archivename) throws
Exception {
+ protected Path createSingleEntryArchive(final String archiveName) throws
Exception {
ArchiveOutputStream out = null;
OutputStream stream = null;
archiveList = new ArrayList<>();
try {
- archive = Files.createTempFile("empty", "." + archivename);
+ archive = Files.createTempFile("empty", "." + archiveName);
archive.toFile().deleteOnExit();
stream = Files.newOutputStream(archive);
- out = factory.createArchiveOutputStream(archivename, stream);
+ out = factory.createArchiveOutputStream(archiveName, stream);
// Use short file name so does not cause problems for ar
addArchiveEntry(out, "test1.xml", getFile("test1.xml"));
out.finish();
diff --git
a/src/test/java/org/apache/commons/compress/archivers/ExceptionMessageTest.java
b/src/test/java/org/apache/commons/compress/archivers/ExceptionMessageTest.java
index 4f9453df..eb0fc977 100644
---
a/src/test/java/org/apache/commons/compress/archivers/ExceptionMessageTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/ExceptionMessageTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
public class ExceptionMessageTest {
- private static final String ARCHIVER_NULL_MESSAGE = "Archivername must not
be null.";
+ private static final String ARCHIVER_NULL_MESSAGE = "Archiver name must
not be null.";
private static final String INPUTSTREAM_NULL_MESSAGE = "InputStream must
not be null.";
diff --git
a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
index 1dc6fe6d..3382baee 100644
---
a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
@@ -53,7 +53,7 @@ import org.junit.jupiter.api.Test;
public class TarArchiveOutputStreamTest extends AbstractTestCase {
- private static byte[] createTarArchiveContainingOneDirectory(final String
fname, final Date modificationDate) throws IOException {
+ private static byte[] createTarArchiveContainingOneDirectory(final String
fileName, final Date modificationDate) throws IOException {
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
try (TarArchiveOutputStream tarOut = new TarArchiveOutputStream(baos,
1024)) {
tarOut.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
@@ -61,7 +61,7 @@ public class TarArchiveOutputStreamTest extends
AbstractTestCase {
tarEntry.setModTime(modificationDate);
tarEntry.setMode(TarArchiveEntry.DEFAULT_DIR_MODE);
tarEntry.setModTime(modificationDate.getTime());
- tarEntry.setName(fname);
+ tarEntry.setName(fileName);
tarOut.putArchiveEntry(tarEntry);
tarOut.closeArchiveEntry();
}
@@ -569,11 +569,11 @@ public class TarArchiveOutputStreamTest extends
AbstractTestCase {
* @see "https://issues.apache.org/jira/browse/COMPRESS-237";
*/
private void testWriteLongLinkName(final int mode) throws Exception {
- final String linkname =
"01234567890123456789012345678901234567890123456789"
+ final String linkName =
"01234567890123456789012345678901234567890123456789"
+ "01234567890123456789012345678901234567890123456789"
+ "01234567890123456789012345678901234567890123456789/test";
final TarArchiveEntry entry = new TarArchiveEntry("test",
TarConstants.LF_SYMLINK);
- entry.setLinkName(linkname);
+ entry.setLinkName(linkName);
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
try (TarArchiveOutputStream tos = new TarArchiveOutputStream(bos,
"ASCII")) {
@@ -586,7 +586,7 @@ public class TarArchiveOutputStreamTest extends
AbstractTestCase {
try (TarArchiveInputStream tin = new TarArchiveInputStream(new
ByteArrayInputStream(data))) {
final TarArchiveEntry e = tin.getNextTarEntry();
assertEquals("test", e.getName(), "Entry name");
- assertEquals(linkname, e.getLinkName(), "Link name");
+ assertEquals(linkName, e.getLinkName(), "Link name");
assertTrue(e.isSymbolicLink(), "The entry is not a symbolic link");
assertEquals(TarConstants.LF_SYMLINK, e.getLinkFlag(), "Link
flag");
}
@@ -597,11 +597,11 @@ public class TarArchiveOutputStreamTest extends
AbstractTestCase {
*/
@Test
public void testWriteLongLinkNameErrorMode() throws Exception {
- final String linkname =
"01234567890123456789012345678901234567890123456789"
+ final String linkName =
"01234567890123456789012345678901234567890123456789"
+ "01234567890123456789012345678901234567890123456789"
+ "01234567890123456789012345678901234567890123456789/test";
final TarArchiveEntry entry = new TarArchiveEntry("test",
TarConstants.LF_SYMLINK);
- entry.setLinkName(linkname);
+ entry.setLinkName(linkName);
assertThrows(RuntimeException.class, () -> {
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -631,11 +631,11 @@ public class TarArchiveOutputStreamTest extends
AbstractTestCase {
@Test
public void testWriteLongLinkNameTruncateMode() throws Exception {
- final String linkname =
"01234567890123456789012345678901234567890123456789"
+ final String linkName =
"01234567890123456789012345678901234567890123456789"
+ "01234567890123456789012345678901234567890123456789"
+ "01234567890123456789012345678901234567890123456789/";
final TarArchiveEntry entry = new TarArchiveEntry("test",
TarConstants.LF_SYMLINK);
- entry.setLinkName(linkname);
+ entry.setLinkName(linkName);
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
try (TarArchiveOutputStream tos = new TarArchiveOutputStream(bos,
"ASCII")) {
@@ -647,7 +647,7 @@ public class TarArchiveOutputStreamTest extends
AbstractTestCase {
final byte[] data = bos.toByteArray();
try (TarArchiveInputStream tin = new TarArchiveInputStream(new
ByteArrayInputStream(data))) {
final TarArchiveEntry e = tin.getNextTarEntry();
- assertEquals(linkname.substring(0, TarConstants.NAMELEN),
e.getLinkName(), "Link name");
+ assertEquals(linkName.substring(0, TarConstants.NAMELEN),
e.getLinkName(), "Link name");
assertEquals(TarConstants.LF_SYMLINK, e.getLinkFlag(), "Link
flag");
}
}
diff --git
a/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java
b/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java
index 54fdea21..83ed59e2 100644
--- a/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java
+++ b/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java
@@ -66,14 +66,14 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testAddAlreadyExistingWithReplaceFalse() throws Exception {
- final String archivename = "zip";
- final Path input = createArchive(archivename);
+ final String archiveName = "zip";
+ final Path input = createArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
try (InputStream is = Files.newInputStream(input);
- ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, is);
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, is);
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final ChangeSet changes = new ChangeSet();
@@ -100,14 +100,14 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testAddAlreadyExistingWithReplaceTrue() throws Exception {
- final String archivename = "zip";
- final Path input = createArchive(archivename);
+ final String archiveName = "zip";
+ final Path input = createArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
try (final InputStream is = Files.newInputStream(input);
- ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, is);
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, is);
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final ChangeSet changes = new ChangeSet();
@@ -181,14 +181,14 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testAddDeleteAdd() throws Exception {
- final String archivename = "cpio";
- final Path input = createArchive(archivename);
+ final String archiveName = "cpio";
+ final Path input = createArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
try (InputStream is = Files.newInputStream(input);
- ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, is);
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, is);
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final ChangeSet changes = new ChangeSet();
@@ -214,15 +214,15 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testAddDeleteToOneFileArchive() throws Exception {
- final String archivename = "cpio";
- final Path input = this.createSingleEntryArchive(archivename);
+ final String archiveName = "cpio";
+ final Path input = this.createSingleEntryArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
final ChangeSet changes = new ChangeSet();
try (InputStream is = Files.newInputStream(input);
- ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, is);
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, is);
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final File file = getFile("test.txt");
final ArchiveEntry entry = out.createArchiveEntry(file,
"bla/test.txt");
changes.add(entry, Files.newInputStream(file.toPath()));
@@ -259,15 +259,15 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testAddToEmptyArchive() throws Exception {
- final String archivename = "zip";
- final Path input = createEmptyArchive(archivename);
+ final String archiveName = "zip";
+ final Path input = createEmptyArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
final ChangeSet changes = new ChangeSet();
try (InputStream is = Files.newInputStream(input);
- ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, is);
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, is);
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final File file1 = getFile("test.txt");
final ArchiveEntry entry = new ZipArchiveEntry("bla/test.txt");
@@ -287,14 +287,14 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testChangeSetResults() throws Exception {
- final String archivename = "cpio";
- final Path input = createArchive(archivename);
+ final String archiveName = "cpio";
+ final Path input = createArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
try (InputStream is = Files.newInputStream(input);
- ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, is);
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, is);
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final ChangeSet changes = new ChangeSet();
changes.deleteDir("bla");
@@ -338,14 +338,14 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testDeleteAddDelete() throws Exception {
- final String archivename = "cpio";
- final Path input = createArchive(archivename);
+ final String archiveName = "cpio";
+ final Path input = createArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
try (InputStream is = Files.newInputStream(input);
- ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, is);
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, is);
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final ChangeSet changes = new ChangeSet();
@@ -373,15 +373,15 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testDeleteAddToOneFileArchive() throws Exception {
- final String archivename = "zip";
- final Path input = createSingleEntryArchive(archivename);
+ final String archiveName = "zip";
+ final Path input = createSingleEntryArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
final ChangeSet changes = new ChangeSet();
try (InputStream is = Files.newInputStream(input);
- ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, is);
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, is);
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
changes.delete("test1.xml");
archiveListDelete("test1.xml");
@@ -407,14 +407,14 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testDeleteDir() throws Exception {
- final String archivename = "cpio";
- final Path input = createArchive(archivename);
+ final String archiveName = "cpio";
+ final Path input = createArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
try (InputStream is = Files.newInputStream(input);
- ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, is);
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, is);
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final ChangeSet changes = new ChangeSet();
changes.deleteDir("bla");
archiveListDeleteDir("bla");
@@ -433,14 +433,14 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testDeleteDir2() throws Exception {
- final String archivename = "cpio";
- final Path input = createArchive(archivename);
+ final String archiveName = "cpio";
+ final Path input = createArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
try (InputStream is = Files.newInputStream(input);
- ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, is);
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, is);
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final ChangeSet changes = new ChangeSet();
changes.deleteDir("la");
@@ -460,14 +460,14 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testDeleteDir3() throws Exception {
- final String archivename = "cpio";
- final Path input = createArchive(archivename);
+ final String archiveName = "cpio";
+ final Path input = createArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
try (InputStream is = Files.newInputStream(input);
- ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, is);
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, is);
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final ChangeSet changes = new ChangeSet();
changes.deleteDir("test.txt");
archiveListDeleteDir("test.txt");
@@ -486,14 +486,14 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testDeleteFile() throws Exception {
- final String archivename = "cpio";
- final Path input = createArchive(archivename);
+ final String archiveName = "cpio";
+ final Path input = createArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
try (InputStream is = Files.newInputStream(input);
- ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, is);
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, is);
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final ChangeSet changes = new ChangeSet();
changes.delete("bla/test5.xml");
@@ -514,14 +514,14 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testDeleteFile2() throws Exception {
- final String archivename = "cpio";
- final Path input = createArchive(archivename);
+ final String archiveName = "cpio";
+ final Path input = createArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
try (final InputStream is = Files.newInputStream(input);
- ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, is);
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, is);
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final ChangeSet changes = new ChangeSet();
changes.delete("bla");
@@ -635,12 +635,12 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testDeleteFromAndAddToZip() throws Exception {
- final String archivename = "zip";
- final Path input = createArchive(archivename);
- final File result = File.createTempFile("test", "." + archivename);
+ final String archiveName = "zip";
+ final Path input = createArchive(archiveName);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
- try (ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, Files.newInputStream(input));
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ try (ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, Files.newInputStream(input));
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final ChangeSet changes = new ChangeSet();
@@ -666,13 +666,13 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testDeleteFromAndAddToZipUsingZipFilePerform() throws
Exception {
- final String archivename = "zip";
- final Path input = createArchive(archivename);
+ final String archiveName = "zip";
+ final Path input = createArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
try (ZipFile ais = new ZipFile(input);
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final ChangeSet changes = new ChangeSet();
@@ -797,13 +797,13 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testDeletePlusAdd() throws Exception {
- final String archivename = "cpio";
- final Path input = createArchive(archivename);
+ final String archiveName = "cpio";
+ final Path input = createArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
- try (ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, Files.newInputStream(input));
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ try (ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, Files.newInputStream(input));
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final ChangeSet changes = new ChangeSet();
changes.deleteDir("bla");
archiveListDeleteDir("bla");
@@ -830,15 +830,15 @@ public final class ChangeSetTestCase extends
AbstractTestCase {
*/
@Test
public void testDeletePlusAddSame() throws Exception {
- final String archivename = "zip";
- final Path input = createArchive(archivename);
+ final String archiveName = "zip";
+ final Path input = createArchive(archiveName);
- final File result = File.createTempFile("test", "." + archivename);
+ final File result = File.createTempFile("test", "." + archiveName);
result.deleteOnExit();
File testtxt;
- try (ArchiveInputStream ais =
factory.createArchiveInputStream(archivename, Files.newInputStream(input));
- ArchiveOutputStream out =
factory.createArchiveOutputStream(archivename,
Files.newOutputStream(result.toPath()))) {
+ try (ArchiveInputStream ais =
factory.createArchiveInputStream(archiveName, Files.newInputStream(input));
+ ArchiveOutputStream out =
factory.createArchiveOutputStream(archiveName,
Files.newOutputStream(result.toPath()))) {
final ChangeSet changes = new ChangeSet();
changes.delete("test/test3.xml");
diff --git
a/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStreamTest.java
b/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStreamTest.java
index 0192beff..df79371a 100644
---
a/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStreamTest.java
@@ -72,7 +72,7 @@ public class DeflateCompressorInputStreamTest {
public void singleByteReadWorksAsExpected() throws IOException {
try (InputStream is =
Files.newInputStream(AbstractTestCase.getPath("bla.tar.deflatez"));
DeflateCompressorInputStream in = new
DeflateCompressorInputStream(is)) {
- // tar header starts with filename "test1.xml"
+ // tar header starts with file name "test1.xml"
assertEquals('t', in.read());
}
}
