From 060d1290cfd0c4d0d653f9416fd406c3ee2cacee Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Fri, 10 Jan 2025 16:51:22 -0800
Subject: [PATCH] Yet more junit4 removal

---
 .../ext/jdk8/StreamSerializerTest.java        |  2 -
 .../databind/ext/jdk8/StreamTestBase.java     | 69 -------------------
 2 files changed, 71 deletions(-)

diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/StreamSerializerTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/StreamSerializerTest.java
index 1803384ab3..d4fcb46d81 100644
--- a/src/test/java/tools/jackson/databind/ext/jdk8/StreamSerializerTest.java
+++ b/src/test/java/tools/jackson/databind/ext/jdk8/StreamSerializerTest.java
@@ -1,7 +1,5 @@
 package tools.jackson.databind.ext.jdk8;
 
-import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.util.*;
 import java.util.stream.Stream;
 
diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/StreamTestBase.java b/src/test/java/tools/jackson/databind/ext/jdk8/StreamTestBase.java
index b5e2c8457a..7849ed8c45 100644
--- a/src/test/java/tools/jackson/databind/ext/jdk8/StreamTestBase.java
+++ b/src/test/java/tools/jackson/databind/ext/jdk8/StreamTestBase.java
@@ -4,26 +4,12 @@
 import java.util.function.Consumer;
 import java.util.stream.BaseStream;
 
-import org.hamcrest.CustomMatcher;
-import org.hamcrest.Description;
-import org.hamcrest.core.AllOf;
-import org.hamcrest.core.Is;
-import org.junit.Rule;
-import org.junit.rules.ExpectedException;
-
-import tools.jackson.databind.DatabindException;
 import tools.jackson.databind.ObjectMapper;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public abstract class StreamTestBase
-    // 19-Sep-2017, tatu: For some reason doing this will break `ExpectedException` rule.
-    //    Typical auto-magic that I hate -- but this code came as contribution.
-    //extends tools.jackson.databind.DatabindTestUtil
 {
-    @Rule
-    public final ExpectedException expectedException = ExpectedException.none();
-
     protected final ObjectMapper objectMapper = new ObjectMapper();
 
     /**
@@ -49,59 +35,4 @@ <T, S extends BaseStream<T, S>> void assertClosesOnSuccess(S baseStream, Consume
         roundTrip.accept(baseStream.onClose(() -> closed.set(true)));
         assertTrue(closed.get());
     }
-
-    <T, S extends BaseStream<T, S>> void assertClosesOnRuntimeException(String exceptionMessage,
-            Consumer<S> roundTrip, S baseStream) {
-        AtomicBoolean closed = new AtomicBoolean();
-        initExpectedException(RuntimeException.class, exceptionMessage,closed);
-        roundTrip.accept(baseStream.onClose(() -> closed.set(true)));
-    }
-
-    <T, S extends BaseStream<T, S>> void assertClosesOnIoException(String exceptionMessage, Consumer<S> roundTrip,
-            S baseStream) {
-        AtomicBoolean closed = new AtomicBoolean();
-        this.expectedException.expect(new IsClosedMatcher(closed));
-        this.expectedException.expect(Is.isA(DatabindException.class));
-        this.expectedException.expectMessage(exceptionMessage);
-        roundTrip.accept(baseStream.onClose(() -> closed.set(true)));
-    }
-
-    <T, S extends BaseStream<T, S>> void assertClosesOnWrappedIoException(String exceptionMessage,
-            Consumer<S> roundTrip, S baseStream) {
-        AtomicBoolean closed = new AtomicBoolean();
-        final String actualMessage = exceptionMessage;
-        this.expectedException.expect(new IsClosedMatcher(closed));
-        this.expectedException.expect(Is.isA(DatabindException.class));
-        this.expectedException.expectMessage(actualMessage);
-        roundTrip.accept(baseStream.onClose(() -> closed.set(true)));
-    }
-
-    void initExpectedException(Class<? extends Throwable> cause, final String exceptionMessage, AtomicBoolean closed) {
-        this.expectedException.expect(AllOf.allOf(Is.isA(DatabindException.class), new IsClosedMatcher(closed)));
-        this.expectedException.expect(Is.isA(DatabindException.class));
-        this.expectedException.expectCause(Is.isA(cause));
-        this.expectedException.expectMessage(exceptionMessage);
-    }
-
-    /**
-     * Matcher that matches when the <code>StreamTestBase.closed()</code> value is set to true.
-     */
-    static class IsClosedMatcher extends CustomMatcher<Object> {
-        final AtomicBoolean closed;
-
-        public IsClosedMatcher(AtomicBoolean closed) {
-            super("Check flag closed");
-            this.closed = closed;
-        }
-
-        @Override
-        public void describeMismatch(Object item, Description description) {
-            description.appendText("The onClose method was not called");
-        }
-
-        @Override
-        public boolean matches(Object item) {
-            return closed.get();
-        }
-    }
 }