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 d47b9968c75e29f930f82bce513828237878c60a
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Sep 30 09:12:06 2022 -0400
Format tweaks
---
.../archivers/tar/TarArchiveOutputStreamTest.java | 82 +++++++++++-----------
1 file changed, 42 insertions(+), 40 deletions(-)
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 e2fc01b2..4a95b898 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
@@ -706,46 +706,48 @@ public class TarArchiveOutputStreamTest extends
AbstractTestCase {
}
return bos.toByteArray();
}
- @Test public void testPutGlobalPaxHeaderEntry() throws IOException {
- final ByteArrayOutputStream bos = new ByteArrayOutputStream();
- final TarArchiveOutputStream tos = new TarArchiveOutputStream(bos);
- final int pid = 73;
- final int globCount = 1;
- final byte lfPaxGlobalExtendedHeader =
TarConstants.LF_PAX_GLOBAL_EXTENDED_HEADER;
- final TarArchiveEntry globalHeader = new
TarArchiveEntry("/tmp/GlobalHead." + pid + "." + globCount,
- lfPaxGlobalExtendedHeader);
-
globalHeader.addPaxHeader("SCHILLY.xattr.user.org.apache.weasels","global-weasels");
- tos.putArchiveEntry(globalHeader);
- TarArchiveEntry entry = new TarArchiveEntry("message");
- final String x = "If at first you don't succeed, give up";
- entry.setSize(x.length());
- tos.putArchiveEntry(entry);
- tos.write(x.getBytes());
- tos.closeArchiveEntry();
- entry = new TarArchiveEntry("counter-message");
- final String y = "Nothing succeeds like excess";
- entry.setSize(y.length());
-
entry.addPaxHeader("SCHILLY.xattr.user.org.apache.weasels.species","unknown");
- tos.putArchiveEntry(entry);
- tos.write(y.getBytes());
- tos.closeArchiveEntry();
- tos.close();
- final TarArchiveInputStream in = new TarArchiveInputStream(new
ByteArrayInputStream(bos.toByteArray()));
- TarArchiveEntry entryIn = in.getNextTarEntry();
- assertNotNull(entryIn);
- assertEquals("message",entryIn.getName());
-
assertEquals("global-weasels",entryIn.getExtraPaxHeader("SCHILLY.xattr.user.org.apache.weasels"));
- final Reader reader = new InputStreamReader(in);
- for(int i=0;i<x.length();i++) {
- assertEquals(x.charAt(i),reader.read());
- }
- assertEquals(-1,reader.read());
- entryIn = in.getNextTarEntry();
- assertEquals("counter-message",entryIn.getName());
-
assertEquals("global-weasels",entryIn.getExtraPaxHeader("SCHILLY.xattr.user.org.apache.weasels"));
-
assertEquals("unknown",entryIn.getExtraPaxHeader("SCHILLY.xattr.user.org.apache.weasels.species"));
- assertNull(in.getNextTarEntry());
- }
+
+ @Test
+ public void testPutGlobalPaxHeaderEntry() throws IOException {
+ final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ final TarArchiveOutputStream tos = new
TarArchiveOutputStream(bos);
+ final int pid = 73;
+ final int globCount = 1;
+ final byte lfPaxGlobalExtendedHeader =
TarConstants.LF_PAX_GLOBAL_EXTENDED_HEADER;
+ final TarArchiveEntry globalHeader = new
TarArchiveEntry("/tmp/GlobalHead." + pid + "." + globCount,
+ lfPaxGlobalExtendedHeader);
+
globalHeader.addPaxHeader("SCHILLY.xattr.user.org.apache.weasels",
"global-weasels");
+ tos.putArchiveEntry(globalHeader);
+ TarArchiveEntry entry = new TarArchiveEntry("message");
+ final String x = "If at first you don't succeed, give up";
+ entry.setSize(x.length());
+ tos.putArchiveEntry(entry);
+ tos.write(x.getBytes());
+ tos.closeArchiveEntry();
+ entry = new TarArchiveEntry("counter-message");
+ final String y = "Nothing succeeds like excess";
+ entry.setSize(y.length());
+
entry.addPaxHeader("SCHILLY.xattr.user.org.apache.weasels.species", "unknown");
+ tos.putArchiveEntry(entry);
+ tos.write(y.getBytes());
+ tos.closeArchiveEntry();
+ tos.close();
+ final TarArchiveInputStream in = new TarArchiveInputStream(new
ByteArrayInputStream(bos.toByteArray()));
+ TarArchiveEntry entryIn = in.getNextTarEntry();
+ assertNotNull(entryIn);
+ assertEquals("message", entryIn.getName());
+ assertEquals("global-weasels",
entryIn.getExtraPaxHeader("SCHILLY.xattr.user.org.apache.weasels"));
+ final Reader reader = new InputStreamReader(in);
+ for (int i = 0; i < x.length(); i++) {
+ assertEquals(x.charAt(i), reader.read());
+ }
+ assertEquals(-1, reader.read());
+ entryIn = in.getNextTarEntry();
+ assertEquals("counter-message", entryIn.getName());
+ assertEquals("global-weasels",
entryIn.getExtraPaxHeader("SCHILLY.xattr.user.org.apache.weasels"));
+ assertEquals("unknown",
entryIn.getExtraPaxHeader("SCHILLY.xattr.user.org.apache.weasels.species"));
+ assertNull(in.getNextTarEntry());
+ }
/**
* When using long file names the longLinkEntry included the current
timestamp as the Entry
