[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 0f85792c Fix broken tests.
0f85792c is described below

commit 0f85792cac60ea302a215c8830ea4f358d31ec5a
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu May 5 15:35:21 2022 -0400

    Fix broken tests.
---
 .../lz4/FramedLZ4CompressorInputStreamTest.java    | 30 +++++++++-------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git 
a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
 
b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
index 08f12a32..c9b1f6c1 100644
--- 
a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
+++ 
b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
@@ -19,33 +19,28 @@
 package org.apache.commons.compress.compressors.lz4;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.Arrays;
 
 import org.apache.commons.compress.AbstractTestCase;
 import org.apache.commons.compress.compressors.CompressorStreamFactory;
 import org.apache.commons.compress.utils.IOUtils;
-import org.junit.Rule;
 import org.junit.jupiter.api.Test;
-import org.junit.rules.ExpectedException;
-
-public final class FramedLZ4CompressorInputStreamTest
-    extends AbstractTestCase {
 
-    @Rule
-    public final ExpectedException thrown = ExpectedException.none();
+public final class FramedLZ4CompressorInputStreamTest extends AbstractTestCase 
{
 
     @Test
     public void testMatches() throws IOException {
@@ -158,9 +153,7 @@ public final class FramedLZ4CompressorInputStreamTest
 
     @Test
     public void rejectsNonLZ4Stream() throws IOException {
-        try (InputStream a = new 
FramedLZ4CompressorInputStream(Files.newInputStream(getFile("bla.tar").toPath())))
 {
-             fail("expected exception");
-        }
+        assertThrows(IOException.class, () -> new 
FramedLZ4CompressorInputStream(Files.newInputStream(getFile("bla.tar").toPath())));
     }
 
     @Test
@@ -635,12 +628,13 @@ public final class FramedLZ4CompressorInputStreamTest
         return to;
     }
 
-    private void expectIOException(final String fileName) throws IOException {
-        thrown.expect(IOException.class);
-        try (InputStream is = 
Files.newInputStream(getFile(fileName).toPath())) {
-            final FramedLZ4CompressorInputStream in = new 
FramedLZ4CompressorInputStream(is);
-            IOUtils.toByteArray(in);
-        }
+    private void expectIOException(final String fileName) {
+        assertThrows(IOException.class, () -> {
+            try (InputStream is = 
Files.newInputStream(getFile(fileName).toPath())) {
+                final FramedLZ4CompressorInputStream in = new 
FramedLZ4CompressorInputStream(is);
+                IOUtils.toByteArray(in);
+            }
+        });
     }
 
 }