[commons-compress] branch master updated: Fix broken tests.

[ggregory]

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


The following commit(s) were added to refs/heads/master by this push:
     new bd332676 Fix broken tests.
bd332676 is described below

commit bd3326765b98b2e01ce724483e0fe747ac22f43a
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu May 5 15:25:12 2022 -0400

    Fix broken tests.
---
 .../compress/archivers/zip/ZipArchiveInputStreamTest.java     |  3 ---
 .../compress/compressors/DetectCompressorTestCase.java        | 11 +++++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

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 466cce76..fe8ee996 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
@@ -54,9 +54,6 @@ import org.junit.rules.ExpectedException;
 
 public class ZipArchiveInputStreamTest {
 
-    @Rule
-    public final ExpectedException thrown = ExpectedException.none();
-
     /**
      * @see "https://issues.apache.org/jira/browse/COMPRESS-176";
      */
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 81cbefe0..b4776a64 100644
--- 
a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java
+++ 
b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java
@@ -32,6 +32,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 
+import org.apache.commons.compress.MemoryLimitException;
 import org.apache.commons.compress.MockEvilInputStream;
 import 
org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
 import 
org.apache.commons.compress.compressors.deflate.DeflateCompressorInputStream;
@@ -61,10 +62,12 @@ public final class DetectCompressorTestCase {
     }
 
     static class TestData {
+
         final String fileName; // The multiple file name
         final char[] entryNames; // expected entries ...
         final CompressorStreamFactory factory; // ... when using this factory
         final boolean concat; // expected value for decompressConcatenated
+
         TestData(final String name, final char[] names, final 
CompressorStreamFactory factory, final boolean concat) {
             this.fileName = name;
             this.entryNames = names;
@@ -170,12 +173,12 @@ public final class DetectCompressorTestCase {
 
     @Test
     public void testLZMAMemoryLimit() throws Exception {
-        getStreamFor("COMPRESS-382", 100);
+        assertThrows(MemoryLimitException.class, () -> 
getStreamFor("COMPRESS-382", 100));
     }
 
     @Test
     public void testZMemoryLimit() throws Exception {
-        getStreamFor("COMPRESS-386", 100);
+        assertThrows(MemoryLimitException.class, () -> 
getStreamFor("COMPRESS-386", 100));
     }
 
     @Test
@@ -187,14 +190,14 @@ public final class DetectCompressorTestCase {
         //This test is here instead of the xz unit test to make sure
         //that the parameter is properly passed via the CompressorStreamFactory
         try (InputStream compressorIs = getStreamFor("bla.tar.xz", 100)) {
-            compressorIs.read();
+            assertThrows(MemoryLimitException.class, () -> 
compressorIs.read());
         }
     }
 
     @Test
     public void testXZMemoryLimitOnSkip() throws Exception {
         try (InputStream compressorIs = getStreamFor("bla.tar.xz", 100)) {
-            compressorIs.skip(10);
+            assertThrows(MemoryLimitException.class, () -> 
compressorIs.skip(10));
         }
     }