Repository: commons-compress Updated Branches: refs/heads/master a0aec901f -> 6b12eab8e
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/main/java/org/apache/commons/compress/utils/Iterators.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/utils/Iterators.java b/src/main/java/org/apache/commons/compress/utils/Iterators.java index eb57643..0db0c36 100644 --- a/src/main/java/org/apache/commons/compress/utils/Iterators.java +++ b/src/main/java/org/apache/commons/compress/utils/Iterators.java @@ -25,7 +25,7 @@ import java.util.Objects; /** * Iterator utilities. - * + * * @since 1.13. */ public class Iterators { @@ -33,7 +33,7 @@ public class Iterators { /** * Adds all the elements in the source {@code iterator} to the target * {@code collection}. - * + * * <p> * When this method returns, the {@code iterator} will be "empty": its * {@code hasNext()} method returns {@code false}. http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/main/java/org/apache/commons/compress/utils/Lists.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/utils/Lists.java b/src/main/java/org/apache/commons/compress/utils/Lists.java index 9916bd3..e7a82dc 100644 --- a/src/main/java/org/apache/commons/compress/utils/Lists.java +++ b/src/main/java/org/apache/commons/compress/utils/Lists.java @@ -31,7 +31,7 @@ public class Lists { /** * Creates a new {@link ArrayList}. - * + * * @param <E> type of elements contained in new list * @return a new {@link ArrayList} */ @@ -42,7 +42,7 @@ public class Lists { /** * Creates a new {@link ArrayList} filled with the contents of the given * {@code iterator}. - * + * * @param iterator * the source iterator * @param <E> type of elements contained in new list http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/main/java/org/apache/commons/compress/utils/ServiceLoaderIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/utils/ServiceLoaderIterator.java b/src/main/java/org/apache/commons/compress/utils/ServiceLoaderIterator.java index 134ff2e..aeda857 100644 --- a/src/main/java/org/apache/commons/compress/utils/ServiceLoaderIterator.java +++ b/src/main/java/org/apache/commons/compress/utils/ServiceLoaderIterator.java @@ -27,7 +27,7 @@ import java.util.ServiceLoader; /** * Iterates all services for a given class through the standard * {@link ServiceLoader} mechanism. - * + * * @param <E> * The service to load * @since 1.13 http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/main/java/org/apache/commons/compress/utils/Sets.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/utils/Sets.java b/src/main/java/org/apache/commons/compress/utils/Sets.java index 556a023..2998120 100644 --- a/src/main/java/org/apache/commons/compress/utils/Sets.java +++ b/src/main/java/org/apache/commons/compress/utils/Sets.java @@ -35,7 +35,7 @@ public class Sets { /** * Creates a new HashSet filled with the given elements - * + * * @param elements * the elements to fill the new set * @param <E> type of elements contained in new set http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/ArchiveReadTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/ArchiveReadTest.java b/src/test/java/org/apache/commons/compress/ArchiveReadTest.java index e217035..ad016a2 100644 --- a/src/test/java/org/apache/commons/compress/ArchiveReadTest.java +++ b/src/test/java/org/apache/commons/compress/ArchiveReadTest.java @@ -13,7 +13,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * */ package org.apache.commons.compress; @@ -39,9 +39,9 @@ import org.junit.runners.Parameterized.Parameters; /** * Test that can read various archive file examples. - * + * * This is a very simple implementation. - * + * * Files must be in resources/archives, and there must be a file.txt containing * the list of files in the archives. */ @@ -90,7 +90,7 @@ public class ArchiveReadTest extends AbstractTestCase { public boolean accept(final File dir, final String name) { return !name.endsWith(".txt"); } - })) + })) { params.add(new Object[] { f }); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java b/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java index 54a2451..9e4c51b 100644 --- a/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java +++ b/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java @@ -13,7 +13,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * */ package org.apache.commons.compress; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/ChainingTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/ChainingTestCase.java b/src/test/java/org/apache/commons/compress/ChainingTestCase.java index 69e67fa..62d2779 100644 --- a/src/test/java/org/apache/commons/compress/ChainingTestCase.java +++ b/src/test/java/org/apache/commons/compress/ChainingTestCase.java @@ -13,7 +13,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * */ package org.apache.commons.compress; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java b/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java index f8e643c..07a0b73 100644 --- a/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java +++ b/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java @@ -65,7 +65,7 @@ public final class DetectArchiverTestCase extends AbstractTestCase { @Test public void testDetection() throws Exception { - final ArchiveInputStream ar = getStreamFor("bla.ar"); + final ArchiveInputStream ar = getStreamFor("bla.ar"); assertNotNull(ar); assertTrue(ar instanceof ArArchiveInputStream); @@ -84,7 +84,7 @@ public final class DetectArchiverTestCase extends AbstractTestCase { final ArchiveInputStream cpio = getStreamFor("bla.cpio"); assertNotNull(cpio); assertTrue(cpio instanceof CpioArchiveInputStream); - + final ArchiveInputStream arj = getStreamFor("bla.arj"); assertNotNull(arj); assertTrue(arj instanceof ArjArchiveInputStream); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/IOMethodsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/IOMethodsTest.java b/src/test/java/org/apache/commons/compress/IOMethodsTest.java index cb2c260..481a9d5 100644 --- a/src/test/java/org/apache/commons/compress/IOMethodsTest.java +++ b/src/test/java/org/apache/commons/compress/IOMethodsTest.java @@ -13,7 +13,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * */ package org.apache.commons.compress; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java b/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java index ff8010f..f7113ac 100644 --- a/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java @@ -101,7 +101,7 @@ public class ArchiveStreamFactoryTest { } /** - * Test case for + * Test case for * <a href="https://issues.apache.org/jira/browse/COMPRESS-267" * >COMPRESS-267</a>. */ @@ -118,7 +118,7 @@ public class ArchiveStreamFactoryTest { } /** - * Test case for + * Test case for * <a href="https://issues.apache.org/jira/browse/COMPRESS-208" * >COMPRESS-208</a>. */ @@ -132,7 +132,7 @@ public class ArchiveStreamFactoryTest { } } } - + @Test public void testEncodingCtor() { ArchiveStreamFactory fac = new ArchiveStreamFactory(); @@ -169,7 +169,7 @@ public class ArchiveStreamFactoryTest { final String fieldName; final String type; final boolean hasOutputStream; - + TestData(final String testFile, final String type, final boolean hasOut, final String expectedEncoding, final ArchiveStreamFactory fac, final String fieldName) { this.testFile = testFile; this.expectedEncoding = expectedEncoding; @@ -178,7 +178,7 @@ public class ArchiveStreamFactoryTest { this.type = type; this.hasOutputStream = hasOut; } - + @Override public String toString() { return "TestData [testFile=" + testFile + ", expectedEncoding=" + expectedEncoding + ", fac=" + fac @@ -388,7 +388,7 @@ public class ArchiveStreamFactoryTest { } catch (final NoSuchFieldException e) { System.out.println("Cannot find " + name + " in class " + instance.getClass().getSimpleName()); return UNKNOWN; - } + } } final boolean isAccessible = fld.isAccessible(); try { http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java b/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java index 2573583..a2f47ba 100644 --- a/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java @@ -13,7 +13,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * */ package org.apache.commons.compress.archivers; @@ -46,7 +46,7 @@ import org.junit.runners.Parameterized.Parameters; /** * Test that can read various tar file examples. - * + * * Files must be in resources/longpath, and there must be a file.txt containing * the list of files in the archives. */ @@ -96,7 +96,7 @@ public class LongPathTest extends AbstractTestCase { public boolean accept(final File dir, final String name) { return !name.endsWith(".txt"); } - })) + })) { params.add(new Object[] { f }); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java b/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java index 7279de1..b4d0cf4 100644 --- a/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java @@ -13,7 +13,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * */ package org.apache.commons.compress.archivers; @@ -46,7 +46,7 @@ import org.junit.runners.Parameterized.Parameters; /** * Test that can read various tar file examples. - * + * * Files must be in resources/longsymlink, and there must be a file.txt containing * the list of files in the archives. */ @@ -94,7 +94,7 @@ public class LongSymLinkTest extends AbstractTestCase { public boolean accept(final File dir, final String name) { return !name.endsWith(".txt"); } - })) + })) { params.add(new Object[] { f }); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java b/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java index d898be1..c5499c9 100644 --- a/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java +++ b/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java @@ -36,7 +36,7 @@ public class SevenZTestCase extends AbstractTestCase { public void testSevenZArchiveCreationUsingCopy() throws Exception { testSevenZArchiveCreation(SevenZMethod.COPY); } - + @Test public void testSevenZArchiveCreationUsingLZMA() throws Exception { testSevenZArchiveCreation(SevenZMethod.LZMA); @@ -46,17 +46,17 @@ public class SevenZTestCase extends AbstractTestCase { public void testSevenZArchiveCreationUsingLZMA2() throws Exception { testSevenZArchiveCreation(SevenZMethod.LZMA2); } - + @Test public void testSevenZArchiveCreationUsingBZIP2() throws Exception { testSevenZArchiveCreation(SevenZMethod.BZIP2); } - + @Test public void testSevenZArchiveCreationUsingDeflate() throws Exception { testSevenZArchiveCreation(SevenZMethod.DEFLATE); } - + private void testSevenZArchiveCreation(final SevenZMethod method) throws Exception { final File output = new File(dir, "bla.7z"); final File file1 = getFile("test1.xml"); @@ -66,12 +66,12 @@ public class SevenZTestCase extends AbstractTestCase { outArchive.setContentCompression(method); try { SevenZArchiveEntry entry; - + entry = outArchive.createArchiveEntry(file1, file1.getName()); outArchive.putArchiveEntry(entry); copy(file1, outArchive); outArchive.closeArchiveEntry(); - + entry = outArchive.createArchiveEntry(file2, file2.getName()); outArchive.putArchiveEntry(entry); copy(file2, outArchive); @@ -95,7 +95,7 @@ public class SevenZTestCase extends AbstractTestCase { } } - private void copy(final File src, final SevenZOutputFile dst) throws IOException { + private void copy(final File src, final SevenZOutputFile dst) throws IOException { FileInputStream fis = null; try { fis = new FileInputStream(src); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java b/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java index 7988e23..a608112 100644 --- a/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java +++ b/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java @@ -22,10 +22,10 @@ import static org.junit.Assert.*; import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; import java.util.Enumeration; @@ -37,9 +37,9 @@ import org.apache.commons.compress.AbstractTestCase; import org.apache.commons.compress.archivers.zip.Zip64Mode; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipArchiveEntryPredicate; -import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream; -import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; -import org.apache.commons.compress.archivers.zip.ZipFile; +import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream; +import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; +import org.apache.commons.compress.archivers.zip.ZipFile; import org.apache.commons.compress.archivers.zip.ZipMethod; import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.compress.utils.SeekableInMemoryByteChannel; @@ -170,7 +170,7 @@ public final class ZipTestCase extends AbstractTestCase { } /** - * Test case for + * Test case for * <a href="https://issues.apache.org/jira/browse/COMPRESS-208" * >COMPRESS-208</a>. */ @@ -197,7 +197,7 @@ public final class ZipTestCase extends AbstractTestCase { assertTrue(bla.canReadEntryData(bla.getEntry("test1.xml"))); bla.close(); */ - + final ZipFile moby = new ZipFile(getFile("moby.zip")); final ZipArchiveEntry entry = moby.getEntry("README"); assertEquals("method", ZipMethod.TOKENIZATION.getCode(), entry.getMethod()); @@ -206,7 +206,7 @@ public final class ZipTestCase extends AbstractTestCase { } /** - * Test case for being able to skip an entry in an + * Test case for being able to skip an entry in an * {@link ZipArchiveInputStream} even if the compression method of that * entry is unsupported. * @@ -234,9 +234,9 @@ public final class ZipTestCase extends AbstractTestCase { * Checks if all entries from a nested archive can be read. * The archive: OSX_ArchiveWithNestedArchive.zip contains: * NestedArchiv.zip and test.xml3. - * + * * The nested archive: NestedArchive.zip contains test1.xml and test2.xml - * + * * @throws Exception */ @Test http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java index 94147d9..4592523 100644 --- a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java @@ -280,7 +280,7 @@ public class SevenZFileTest extends AbstractTestCase { assertEquals(5, entries); } } - + private void test7zUnarchive(final File f, final SevenZMethod m, final byte[] password) throws Exception { try (SevenZFile sevenZFile = new SevenZFile(f, password)) { SevenZArchiveEntry entry = sevenZFile.getNextEntry(); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java index 5e35d33..489ce68 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java @@ -132,7 +132,7 @@ public class TarArchiveEntryTest implements TarConstants { @Test public void testExtraPaxHeaders() throws IOException { ByteArrayOutputStream bos = new ByteArrayOutputStream(); TarArchiveOutputStream tos = new TarArchiveOutputStream(bos); - + TarArchiveEntry entry = new TarArchiveEntry("./weasels"); entry.addPaxHeader("APACHE.mustelida","true"); entry.addPaxHeader("SCHILY.xattr.user.org.apache.weasels","maximum weasels"); @@ -148,7 +148,7 @@ public class TarArchiveEntryTest implements TarConstants { tos.write('W'); tos.closeArchiveEntry(); tos.close(); - assertNotEquals("should have extra headers before clear",0,entry.getExtraPaxHeaders().size()); + assertNotEquals("should have extra headers before clear",0,entry.getExtraPaxHeaders().size()); entry.clearExtraPaxHeaders(); assertEquals("extra headers should be empty after clear",0,entry.getExtraPaxHeaders().size()); TarArchiveInputStream tis = new TarArchiveInputStream(new ByteArrayInputStream(bos.toByteArray())); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java index 71c9641..6d2a32e 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarLister.java @@ -102,5 +102,5 @@ public final class TarLister { } System.out.println(sb); } - + } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java index 50d7d3b..393c0aa 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java @@ -13,7 +13,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * */ package org.apache.commons.compress.archivers.tar; @@ -53,7 +53,7 @@ public class TarUtilsTest { @Test public void testParseOctal() throws Exception{ - long value; + long value; byte [] buffer; final long MAX_OCTAL = 077777777777L; // Allowed 11 digits final long MAX_OCTAL_OVERFLOW = 0777777777777L; // in fact 12 for some implementations http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java index bd17cea..844623c 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java @@ -30,7 +30,7 @@ public class AsiExtraFieldTest implements UnixStat { /** * Test file mode magic. - */ + */ @Test public void testModes() { final AsiExtraField a = new AsiExtraField(); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/zip/BinaryTreeTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/BinaryTreeTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/BinaryTreeTest.java index fc0e94a..ae4ba9d 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/BinaryTreeTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/BinaryTreeTest.java @@ -32,11 +32,11 @@ public class BinaryTreeTest { @Test public void testDecode() throws IOException { final InputStream in = new ByteArrayInputStream(new byte[] { 0x02, 0x42, 0x01, 0x13 }); - + final BinaryTree tree = BinaryTree.decode(in, 8); - + assertNotNull(tree); - + final BitStream stream = new BitStream(new ByteArrayInputStream(new byte[] { (byte) 0x8D, (byte) 0xC5, (byte) 0x11, 0x00 })); assertEquals(0, tree.read(stream)); assertEquals(1, tree.read(stream)); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/zip/BitStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/BitStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/BitStreamTest.java index a0525fa..f330c29 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/BitStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/BitStreamTest.java @@ -57,7 +57,7 @@ public class BitStreamTest { assertEquals("bit 13", 0, stream.nextBit()); assertEquals("bit 14", 0, stream.nextBit()); assertEquals("bit 15", 0, stream.nextBit()); - + assertEquals("next bit", -1, stream.nextBit()); stream.close(); } @@ -86,7 +86,7 @@ public class BitStreamTest { assertEquals("bit 1", 1, stream.nextBit()); assertEquals("bit 2", 0, stream.nextBit()); assertEquals("bit 3", 1, stream.nextBit()); - + assertEquals("next byte", 0x5E, stream.nextByte()); assertEquals("next byte", -1, stream.nextByte()); // not enough bits left to read a byte stream.close(); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/zip/CircularBufferTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/CircularBufferTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/CircularBufferTest.java index 442d5e6..57b6b01 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/CircularBufferTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/CircularBufferTest.java @@ -46,15 +46,15 @@ public class CircularBufferTest { @Test public void testCopy() throws Exception { final CircularBuffer buffer = new CircularBuffer(16); - + buffer.put(1); buffer.put(2); buffer.get(); buffer.get(); - + // copy uninitialized data buffer.copy(6, 8); - + for (int i = 2; i < 6; i++) { assertEquals("buffer[" + i + "]", 0, buffer.get()); } @@ -62,17 +62,17 @@ public class CircularBufferTest { assertEquals("buffer[" + 7 + "]", 2, buffer.get()); assertEquals("buffer[" + 8 + "]", 0, buffer.get()); assertEquals("buffer[" + 9 + "]", 0, buffer.get()); - + for (int i = 10; i < 14; i++) { buffer.put(i); buffer.get(); } - + assertFalse("available", buffer.available()); - + // copy data and wrap buffer.copy(2, 8); - + for (int i = 14; i < 18; i++) { assertEquals("buffer[" + i + "]", i % 2 == 0 ? 12 : 13, buffer.get()); } http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/zip/ExplodeSupportTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ExplodeSupportTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ExplodeSupportTest.java index 13bdb53..67fbbb1 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ExplodeSupportTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ExplodeSupportTest.java @@ -76,7 +76,7 @@ public class ExplodeSupportTest { assertEquals("method", ZipMethod.IMPLODING.getCode(), entry.getMethod()); final InputStream bio = new BoundedInputStream(zin, entry.getSize()); - + final ByteArrayOutputStream bout = new ByteArrayOutputStream(); final CheckedOutputStream out = new CheckedOutputStream(bout, new CRC32()); IOUtils.copy(bio, out); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java index efa38a3..19a8fe9 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java @@ -46,7 +46,7 @@ public class ParallelScatterZipCreatorTest { private File result; private File tmp; - + @After public void cleanup() { tryHardToDelete(result); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java index 388b2ca..124cf9a 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java @@ -42,7 +42,7 @@ public class ScatterZipOutputStreamTest { tryHardToDelete(scatterFile); tryHardToDelete(target); } - + @Test public void putArchiveEntry() throws Exception { scatterFile = File.createTempFile("scattertest", ".notzip"); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java index aecc005..da9bb24 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java @@ -265,7 +265,7 @@ public class UTF8ZipFilesTest extends AbstractTestCase { zos = new ZipArchiveOutputStream(file); zos.setEncoding(encoding); zos.setUseLanguageEncodingFlag(withEFS); - zos.setCreateUnicodeExtraFields(withExplicitUnicodeExtra ? + zos.setCreateUnicodeExtraFields(withExplicitUnicodeExtra ? ZipArchiveOutputStream .UnicodeExtraFieldPolicy.NEVER : ZipArchiveOutputStream http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java index fbf6c95..e3bd60e 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java @@ -439,7 +439,7 @@ public class X5455_ExtendedTimestampTest { } } out.close(); - + final ZipFile zf = new ZipFile(output); final ZipArchiveEntry ze = zf.getEntry("foo"); final X5455_ExtendedTimestamp ext = http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java index cd7efdc..a0a5c50 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java @@ -133,22 +133,22 @@ public class ZipArchiveInputStreamTest { @Test public void testUnshrinkEntry() throws Exception { final ZipArchiveInputStream in = new ZipArchiveInputStream(new FileInputStream(getFile("SHRUNK.ZIP"))); - + ZipArchiveEntry entry = in.getNextZipEntry(); assertEquals("method", ZipMethod.UNSHRINKING.getCode(), entry.getMethod()); assertTrue(in.canReadEntryData(entry)); - + FileInputStream original = new FileInputStream(getFile("test1.xml")); try { assertArrayEquals(IOUtils.toByteArray(original), IOUtils.toByteArray(in)); } finally { original.close(); } - + entry = in.getNextZipEntry(); assertEquals("method", ZipMethod.UNSHRINKING.getCode(), entry.getMethod()); assertTrue(in.canReadEntryData(entry)); - + original = new FileInputStream(getFile("test2.xml")); try { assertArrayEquals(IOUtils.toByteArray(original), IOUtils.toByteArray(in)); @@ -159,7 +159,7 @@ public class ZipArchiveInputStreamTest { /** - * Test case for + * Test case for * <a href="https://issues.apache.org/jira/browse/COMPRESS-264" * >COMPRESS-264</a>. */ http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java index 6efaba4..87a3ded 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java @@ -207,7 +207,7 @@ public class ZipFileTest { } /** - * Test case for + * Test case for * <a href="https://issues.apache.org/jira/browse/COMPRESS-208" * >COMPRESS-208</a>. */ @@ -314,7 +314,7 @@ public class ZipFileTest { } /** - * Test case for + * Test case for * <a href="https://issues.apache.org/jira/browse/COMPRESS-264" * >COMPRESS-264</a>. */ http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java ---------------------------------------------------------------------- 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 366989a..9565ae9 100644 --- a/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java +++ b/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java @@ -74,7 +74,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { * Adds an ArchiveEntry with the same name two times. * Only the latest addition should be found in the ChangeSet, * the first add should be replaced. - * + * * @throws Exception */ @Test @@ -109,7 +109,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { * Adds an ArchiveEntry with the same name two times. * Only the first addition should be found in the ChangeSet, * the second add should never be added since replace = false - * + * * @throws Exception */ @Test @@ -145,7 +145,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { * the deletion of bla/*, which actually means bla/test4.xml should be * removed from the archive. The file something/bla (without ending, named * like the folder) should not be deleted. - * + * * @throws Exception */ @Test @@ -187,7 +187,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Tries to delete the folder "la" from an archive file. This should result in * the deletion of la/*, which should not match any files/folders. - * + * * @throws Exception */ @Test @@ -229,7 +229,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Tries to delete the folder "test.txt" from an archive file. * This should not match any files/folders. - * + * * @throws Exception */ @Test @@ -271,7 +271,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Tries to delete the file "bla/test5.xml" from an archive. This should * result in the deletion of "bla/test5.xml". - * + * * @throws Exception */ @Test @@ -314,7 +314,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Tries to delete the file "bla" from an archive. This should * result in the deletion of nothing. - * + * * @throws Exception */ @Test @@ -358,7 +358,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { * Tries to delete and then add a file with the same name. * Should delete test/test3.xml and adds test.txt with the name * test/test3.xml - * + * * @throws Exception */ @Test @@ -425,12 +425,12 @@ public final class ChangeSetTestCase extends AbstractTestCase { in.close(); } rmdir(check); - } + } } /** * Checks for the correct ChangeSetResults - * + * * @throws Exception */ @Test @@ -494,7 +494,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { * Tries to delete a directory with a file and adds a new directory with a * new file and with the same name. Should delete dir1/* and add * dir1/test.txt at the end - * + * * @throws Exception */ @Test @@ -541,7 +541,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Adds a file to a zip archive. Deletes an other file. - * + * * @throws Exception */ @Test @@ -588,7 +588,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Adds a file to a zip archive. Deletes an other file. - * + * * @throws Exception */ @Test @@ -634,7 +634,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * add blub/test.txt + delete blub Should add blub/test.txt and delete it * afterwards. In this example, the archive should stay untouched. - * + * * @throws Exception */ @Test @@ -683,7 +683,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * delete bla + add bla/test.txt + delete bla Deletes dir1/* first, then * suppresses the add of bla.txt because there is a delete operation later. - * + * * @throws Exception */ @Test @@ -733,7 +733,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Simple Delete from a zip file. - * + * * @throws Exception */ @Test @@ -774,7 +774,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Simple delete from a tar file - * + * * @throws Exception */ @Test @@ -812,7 +812,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Simple delete from a jar file - * + * * @throws Exception */ @Test @@ -902,7 +902,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Delete from a jar file and add another file - * + * * @throws Exception */ @Test @@ -948,7 +948,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Simple delete from an ar file - * + * * @throws Exception */ @Test @@ -987,7 +987,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Deletes a file from an AR-archive and adds another - * + * * @throws Exception */ @Test @@ -1033,10 +1033,10 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * TODO: Move operations are not supported currently - * + * * mv dir1/test.text dir2/test.txt + delete dir1 Moves the file to dir2 and * deletes everything in dir1 - * + * * @throws Exception */ @Test @@ -1045,12 +1045,12 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * TODO: Move operations are not supported currently - * + * * add dir1/bla.txt + mv dir1/test.text dir2/test.txt + delete dir1 - * + * * Add dir1/bla.txt should be surpressed. All other dir1 files will be * deleted, except dir1/test.text will be moved - * + * * @throws Exception */ @Test @@ -1059,7 +1059,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Check can add a file to an empty archive. - * + * * @throws Exception */ @Test @@ -1094,7 +1094,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { out.close(); } if (ais != null) { - ais.close(); // will close is + ais.close(); // will close is } else if (is != null){ is.close(); } @@ -1105,7 +1105,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Check can delete and add a file to an archive with a single file - * + * * @throws Exception */ @Test @@ -1143,7 +1143,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { out.close(); } if (ais != null) { - ais.close(); // will close is + ais.close(); // will close is } else if (is != null){ is.close(); } @@ -1154,7 +1154,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Check can add and delete a file to an archive with a single file - * + * * @throws Exception */ @Test @@ -1176,7 +1176,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { out = factory.createArchiveOutputStream(archivename, new FileOutputStream(result)); final File file = getFile("test.txt"); - final ArchiveEntry entry = out.createArchiveEntry(file,"bla/test.txt"); + final ArchiveEntry entry = out.createArchiveEntry(file,"bla/test.txt"); changes.add(entry, new FileInputStream(file)); archiveList.add("bla/test.txt"); @@ -1192,7 +1192,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { out.close(); } if (ais != null) { - ais.close(); // will close is + ais.close(); // will close is } else if (is != null){ is.close(); } @@ -1204,7 +1204,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Adds a file with the same filename as an existing file from the stream. * Should lead to a replacement. - * + * * @throws Exception */ @Test @@ -1249,7 +1249,7 @@ public final class ChangeSetTestCase extends AbstractTestCase { /** * Adds a file with the same filename as an existing file from the stream. * Should lead to a replacement. - * + * * @throws Exception */ @Test http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java b/src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java index 81f0d77..468cb57 100644 --- a/src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java @@ -35,7 +35,7 @@ public final class DeflateTestCase extends AbstractTestCase { /** * Tests the creation of a DEFLATE archive with zlib header - * + * * @throws Exception */ @Test @@ -52,7 +52,7 @@ public final class DeflateTestCase extends AbstractTestCase { /** * Tests the creation of a "raw" DEFLATE archive (without zlib header) - * + * * @throws Exception */ @Test @@ -70,7 +70,7 @@ public final class DeflateTestCase extends AbstractTestCase { /** * Tests the extraction of a DEFLATE archive with zlib header - * + * * @throws Exception */ @Test @@ -95,7 +95,7 @@ public final class DeflateTestCase extends AbstractTestCase { /** * Tests the extraction of a "raw" DEFLATE archive (without zlib header) - * + * * @throws Exception */ @Test http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java index 7f3d316..a59bc60 100644 --- a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java @@ -56,7 +56,7 @@ public final class DetectCompressorTestCase { factorySetTrue = new CompressorStreamFactory(); factorySetTrue.setDecompressConcatenated(true); factorySetFalse = new CompressorStreamFactory(); - factorySetFalse.setDecompressConcatenated(false); + factorySetFalse.setDecompressConcatenated(false); } static class TestData { @@ -91,17 +91,17 @@ public final class DetectCompressorTestCase { new TestData("multiple.xz", new char[]{'a'}, factorySetFalse, false), new TestData("multiple.xz", new char[]{'a'}, factory, false), }; - + @Test public void testDetection() throws Exception { - final CompressorInputStream bzip2 = getStreamFor("bla.txt.bz2"); + final CompressorInputStream bzip2 = getStreamFor("bla.txt.bz2"); assertNotNull(bzip2); assertTrue(bzip2 instanceof BZip2CompressorInputStream); final CompressorInputStream gzip = getStreamFor("bla.tgz"); assertNotNull(gzip); assertTrue(gzip instanceof GzipCompressorInputStream); - + final CompressorInputStream pack200 = getStreamFor("bla.pack"); assertNotNull(pack200); assertTrue(pack200 instanceof Pack200CompressorInputStream); @@ -262,7 +262,7 @@ public final class DetectCompressorTestCase { final CompressorInputStream in = getStreamFor(test.fileName, fac); assertNotNull("Test entry "+i,in); for (final char entry : test.entryNames) { - assertEquals("Test entry" + i, entry, in.read()); + assertEquals("Test entry" + i, entry, in.read()); } assertEquals(0, in.available()); assertEquals(-1, in.read()); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java b/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java index 62c7b15..02fda3e 100644 --- a/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java @@ -145,7 +145,7 @@ public final class GZipTestCase extends AbstractTestCase { try (FileInputStream fis = new FileInputStream(getFile("test3.xml"))) { content = IOUtils.toByteArray(fis); } - + final ByteArrayOutputStream bout = new ByteArrayOutputStream(); final GzipParameters parameters = new GzipParameters(); @@ -171,7 +171,7 @@ public final class GZipTestCase extends AbstractTestCase { try (FileInputStream fis = new FileInputStream(getFile("test3.xml"))) { content = IOUtils.toByteArray(fis); } - + final ByteArrayOutputStream bout = new ByteArrayOutputStream(); final GzipParameters parameters = new GzipParameters(); @@ -200,7 +200,7 @@ public final class GZipTestCase extends AbstractTestCase { } catch (final IllegalArgumentException e) { // expected } - + try { parameters.setCompressionLevel(-5); fail("IllegalArgumentException not thrown"); @@ -214,16 +214,16 @@ public final class GZipTestCase extends AbstractTestCase { try (FileInputStream fis = new FileInputStream(getFile("test3.xml"))) { content = IOUtils.toByteArray(fis); } - + final ByteArrayOutputStream bout = new ByteArrayOutputStream(); - + final GzipParameters parameters = new GzipParameters(); parameters.setCompressionLevel(compressionLevel); final GzipCompressorOutputStream out = new GzipCompressorOutputStream(bout, parameters); IOUtils.copy(new ByteArrayInputStream(content), out); out.flush(); out.close(); - + assertEquals("extra flags (XFL)", flag, bout.toByteArray()[8]); } @@ -241,7 +241,7 @@ public final class GZipTestCase extends AbstractTestCase { public void testExtraFlagsDefaultCompression() throws Exception { testExtraFlags(Deflater.DEFAULT_COMPRESSION, 0); } - + @Test public void testOverWrite() throws Exception { final GzipCompressorOutputStream out = new GzipCompressorOutputStream(new ByteArrayOutputStream()); @@ -257,7 +257,7 @@ public final class GZipTestCase extends AbstractTestCase { @Test public void testMetadataRoundTrip() throws Exception { final ByteArrayOutputStream bout = new ByteArrayOutputStream(); - + final GzipParameters parameters = new GzipParameters(); parameters.setCompressionLevel(Deflater.BEST_COMPRESSION); parameters.setModificationTime(123456000); @@ -268,7 +268,7 @@ public final class GZipTestCase extends AbstractTestCase { ".xml"))) { IOUtils.copy(fis, out); } - + final GzipCompressorInputStream input = new GzipCompressorInputStream(new ByteArrayInputStream(bout.toByteArray())); input.close(); http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java index 208224f..e26b637 100644 --- a/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java @@ -37,7 +37,7 @@ import org.junit.Test; public class BrotliCompressorInputStreamTest extends AbstractTestCase { /** - * Test bridge works fine + * Test bridge works fine * @throws {@link IOException} */ @Test @@ -55,9 +55,9 @@ public class BrotliCompressorInputStreamTest extends AbstractTestCase { bos.write(readByte); } Assert.assertArrayEquals(b, bos.toByteArray()); - } + } } - + @Test public void testCachingIsEnabledByDefaultAndBrotliIsPresent() { assertEquals(BrotliUtils.CachedAvailability.CACHED_AVAILABLE, BrotliUtils.getCachedBrotliAvailability()); @@ -86,7 +86,7 @@ public class BrotliCompressorInputStreamTest extends AbstractTestCase { BrotliUtils.setCacheBrotliAvailablity(true); } } - + @Test public void availableShouldReturnZero() throws IOException { http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java b/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java index ee30d37..37b27ef 100644 --- a/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/bzip2/BlockSortTest.java @@ -62,19 +62,19 @@ public class BlockSortTest { and the original line has been 0 */ - private static final byte[] FIXTURE_BWT = { (byte) 128, 0, 3, (byte) 254, 2, 1, + private static final byte[] FIXTURE_BWT = { (byte) 128, 0, 3, (byte) 254, 2, 1, (byte) 252, (byte) 255, (byte) 253 }; private static final int[] FIXTURE_SORTED = { 0, 1, 7, 6, 8, 2, 3, 5, 4 }; - private static final byte[] FIXTURE2 = { - 'C', 'o', 'm', 'm', 'o', 'n', 's', ' ', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', + private static final byte[] FIXTURE2 = { + 'C', 'o', 'm', 'm', 'o', 'n', 's', ' ', 'C', 'o', 'm', 'p', 'r', 'e', 's', 's', }; private static final byte[] FIXTURE2_BWT = { - 's', 's', ' ', 'r', 'o', 'm', 'o', 'o', 'C', 'C', 'm', 'm', 'p', 'n', 's', 'e', + 's', 's', ' ', 'r', 'o', 'm', 'o', 'o', 'C', 'C', 'm', 'm', 'p', 'n', 's', 'e', }; @Test http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/utils/CharsetsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/utils/CharsetsTest.java b/src/test/java/org/apache/commons/compress/utils/CharsetsTest.java index 2433448..5823edc 100644 --- a/src/test/java/org/apache/commons/compress/utils/CharsetsTest.java +++ b/src/test/java/org/apache/commons/compress/utils/CharsetsTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,7 +25,7 @@ import org.junit.Test; /** * Sanity checks for {@link Charsets}. - * + * * @version $Id$ */ public class CharsetsTest { http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6b12eab8/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java b/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java index 042acad..2bba435 100644 --- a/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java +++ b/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.