From 91731736990da48ebb60554eeaf4e22146eafc32 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 24 Jun 2020 16:58:52 -0400 Subject: [PATCH] [LANG-1568] org.apache.commons.lang3.function.FailableBiConsumer.andThen(FailableBiConsumer) --- .../lang3/function/FailableBiConsumer.java | 39 ++- .../commons/lang3/function/package-info.java | 2 +- .../lang3/function/FailableFunctionsTest.java | 265 ++++++++---------- 3 files changed, 161 insertions(+), 145 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/function/FailableBiConsumer.java b/src/main/java/org/apache/commons/lang3/function/FailableBiConsumer.java index 342f5ece6..34ace1b03 100644 --- a/src/main/java/org/apache/commons/lang3/function/FailableBiConsumer.java +++ b/src/main/java/org/apache/commons/lang3/function/FailableBiConsumer.java @@ -17,6 +17,7 @@ package org.apache.commons.lang3.function; +import java.util.Objects; import java.util.function.BiConsumer; /** @@ -30,13 +31,45 @@ @FunctionalInterface public interface FailableBiConsumer { + /** NOP singleton */ + @SuppressWarnings("rawtypes") + final FailableBiConsumer NOP = (t, u) -> {/* NOP */}; + + /** + * Returns The NOP singleton. + * + * @param Consumed type 1. + * @param Consumed type 2. + * @param Thrown exception. + * @return The NOP singleton. + */ + static FailableBiConsumer nop() { + return NOP; + } + /** * Accepts the consumer. * - * @param object1 the first parameter for the consumable to accept - * @param object2 the second parameter for the consumable to accept + * @param t the first parameter for the consumable to accept + * @param u the second parameter for the consumable to accept * @throws E Thrown when the consumer fails. */ - void accept(T object1, U object2) throws E; + void accept(T t, U u) throws E; + /** + * Returns a composed {@code FailableBiConsumer} that performs like {@link BiConsumer#andThen(BiConsumer)}. + * + * @param after the operation to perform after this one. + * @return a composed {@code FailableBiConsumer} that performs like {@link BiConsumer#andThen(BiConsumer)}. + * @throws E Thrown when a consumer fails. + * @throws NullPointerException if {@code after} is null + */ + default FailableBiConsumer andThen(FailableBiConsumer after) throws E { + Objects.requireNonNull(after); + + return (t, u) -> { + accept(t, u); + after.accept(t, u); + }; + } } diff --git a/src/main/java/org/apache/commons/lang3/function/package-info.java b/src/main/java/org/apache/commons/lang3/function/package-info.java index aae4c7dd3..5cc1d9a63 100644 --- a/src/main/java/org/apache/commons/lang3/function/package-info.java +++ b/src/main/java/org/apache/commons/lang3/function/package-info.java @@ -19,7 +19,7 @@ * for working with Java 8 lambdas. * *

Contains failable functional interfaces that address the fact that lambdas are supposed not to - * throw Exceptions, at least not checked Exceptions, AKA instances of {@link java.lang.Exception}. + * throw Exceptions, at least not checked Exceptions, A.K.A. instances of {@link java.lang.Exception}. * A failable functional interface declares a type of Exception that may be raised if the function * fails. * diff --git a/src/test/java/org/apache/commons/lang3/function/FailableFunctionsTest.java b/src/test/java/org/apache/commons/lang3/function/FailableFunctionsTest.java index 7390ab683..056072594 100644 --- a/src/test/java/org/apache/commons/lang3/function/FailableFunctionsTest.java +++ b/src/test/java/org/apache/commons/lang3/function/FailableFunctionsTest.java @@ -45,6 +45,9 @@ */ public class FailableFunctionsTest { + private static final IllegalStateException ILLEGAL_STATE_EXCEPTION = new IllegalStateException(); + private static final OutOfMemoryError ERROR = new OutOfMemoryError(); + public static class CloseableObject { private boolean closed; @@ -267,14 +270,12 @@ public void testObjLong(final T object, final long i) throws Throwable { @Test void testAcceptBiConsumer() { - final IllegalStateException ise = new IllegalStateException(); final Testable testable = new Testable<>(null); - Throwable e = assertThrows(IllegalStateException.class, () -> Failable.accept(Testable::test, testable, ise)); - assertSame(ise, e); + Throwable e = assertThrows(IllegalStateException.class, () -> Failable.accept(Testable::test, testable, ILLEGAL_STATE_EXCEPTION)); + assertSame(ILLEGAL_STATE_EXCEPTION, e); - final Error error = new OutOfMemoryError(); - e = assertThrows(OutOfMemoryError.class, () -> Failable.accept(Testable::test, testable, error)); - assertSame(error, e); + e = assertThrows(OutOfMemoryError.class, () -> Failable.accept(Testable::test, testable, ERROR)); + assertSame(ERROR, e); final IOException ioe = new IOException("Unknown I/O error"); testable.setThrowable(ioe); @@ -289,15 +290,13 @@ void testAcceptBiConsumer() { @Test void testAcceptConsumer() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); Throwable e = assertThrows(IllegalStateException.class, () -> Failable.accept(Testable::test, testable)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); + testable.setThrowable(ERROR); e = assertThrows(OutOfMemoryError.class, () -> Failable.accept(Testable::test, testable)); - assertSame(error, e); + assertSame(ERROR, e); final IOException ioe = new IOException("Unknown I/O error"); testable.setThrowable(ioe); @@ -312,16 +311,14 @@ void testAcceptConsumer() { @Test void testAcceptDoubleConsumer() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); Throwable e = assertThrows(IllegalStateException.class, () -> Failable.accept(testable::testDouble, 1d)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); assertNull(testable.getAcceptedPrimitiveObject1()); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); + testable.setThrowable(ERROR); e = assertThrows(OutOfMemoryError.class, () -> Failable.accept(testable::testDouble, 1d)); - assertSame(error, e); + assertSame(ERROR, e); assertNull(testable.getAcceptedPrimitiveObject1()); final IOException ioe = new IOException("Unknown I/O error"); @@ -339,16 +336,14 @@ void testAcceptDoubleConsumer() { @Test void testAcceptIntConsumer() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); Throwable e = assertThrows(IllegalStateException.class, () -> Failable.accept(testable::testInt, 1)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); assertNull(testable.getAcceptedPrimitiveObject1()); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); + testable.setThrowable(ERROR); e = assertThrows(OutOfMemoryError.class, () -> Failable.accept(testable::testInt, 1)); - assertSame(error, e); + assertSame(ERROR, e); assertNull(testable.getAcceptedPrimitiveObject1()); final IOException ioe = new IOException("Unknown I/O error"); @@ -366,16 +361,14 @@ void testAcceptIntConsumer() { @Test void testAcceptLongConsumer() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); Throwable e = assertThrows(IllegalStateException.class, () -> Failable.accept(testable::testLong, 1L)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); assertNull(testable.getAcceptedPrimitiveObject1()); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); + testable.setThrowable(ERROR); e = assertThrows(OutOfMemoryError.class, () -> Failable.accept(testable::testLong, 1L)); - assertSame(error, e); + assertSame(ERROR, e); assertNull(testable.getAcceptedPrimitiveObject1()); final IOException ioe = new IOException("Unknown I/O error"); @@ -393,18 +386,16 @@ void testAcceptLongConsumer() { @Test void testAcceptObjDoubleConsumer() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); Throwable e = assertThrows(IllegalStateException.class, () -> Failable.accept(testable::testObjDouble, "X", 1d)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); assertNull(testable.getAcceptedObject()); assertNull(testable.getAcceptedPrimitiveObject1()); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); + testable.setThrowable(ERROR); e = assertThrows(OutOfMemoryError.class, () -> Failable.accept(testable::testObjDouble, "X", 1d)); - assertSame(error, e); + assertSame(ERROR, e); assertNull(testable.getAcceptedObject()); assertNull(testable.getAcceptedPrimitiveObject1()); @@ -425,17 +416,15 @@ void testAcceptObjDoubleConsumer() { @Test void testAcceptObjIntConsumer() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); Throwable e = assertThrows(IllegalStateException.class, () -> Failable.accept(testable::testObjInt, "X", 1)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); assertNull(testable.getAcceptedObject()); assertNull(testable.getAcceptedPrimitiveObject1()); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); + testable.setThrowable(ERROR); e = assertThrows(OutOfMemoryError.class, () -> Failable.accept(testable::testObjInt, "X", 1)); - assertSame(error, e); + assertSame(ERROR, e); assertNull(testable.getAcceptedObject()); assertNull(testable.getAcceptedPrimitiveObject1()); @@ -456,17 +445,15 @@ void testAcceptObjIntConsumer() { @Test void testAcceptObjLongConsumer() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); Throwable e = assertThrows(IllegalStateException.class, () -> Failable.accept(testable::testObjLong, "X", 1L)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); assertNull(testable.getAcceptedObject()); assertNull(testable.getAcceptedPrimitiveObject1()); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); + testable.setThrowable(ERROR); e = assertThrows(OutOfMemoryError.class, () -> Failable.accept(testable::testObjLong, "X", 1L)); - assertSame(error, e); + assertSame(ERROR, e); assertNull(testable.getAcceptedObject()); assertNull(testable.getAcceptedPrimitiveObject1()); @@ -487,15 +474,13 @@ void testAcceptObjLongConsumer() { @Test public void testApplyBiFunction() { - final IllegalStateException ise = new IllegalStateException(); final Testable testable = new Testable<>(null); Throwable e = assertThrows(IllegalStateException.class, - () -> Failable.apply(Testable::testAsInteger, testable, ise)); - assertSame(ise, e); + () -> Failable.apply(Testable::testAsInteger, testable, ILLEGAL_STATE_EXCEPTION)); + assertSame(ILLEGAL_STATE_EXCEPTION, e); - final Error error = new OutOfMemoryError(); - e = assertThrows(OutOfMemoryError.class, () -> Failable.apply(Testable::testAsInteger, testable, error)); - assertSame(error, e); + e = assertThrows(OutOfMemoryError.class, () -> Failable.apply(Testable::testAsInteger, testable, ERROR)); + assertSame(ERROR, e); final IOException ioe = new IOException("Unknown I/O error"); e = assertThrows(UncheckedIOException.class, () -> Failable.apply(Testable::testAsInteger, testable, ioe)); @@ -510,11 +495,10 @@ public void testApplyBiFunction() { @Test public void testApplyDoubleBinaryOperator() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); final Throwable e = assertThrows(IllegalStateException.class, () -> Failable.applyAsDouble(testable::testDoubleDouble, 1d, 2d)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); final Testable testable2 = new Testable<>(null); final double i = Failable.applyAsDouble(testable2::testDoubleDouble, 1d, 2d); @@ -523,16 +507,14 @@ public void testApplyDoubleBinaryOperator() { @Test public void testApplyFunction() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); Throwable e = assertThrows(IllegalStateException.class, () -> Failable.apply(Testable::testAsInteger, testable)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); + testable.setThrowable(ERROR); e = assertThrows(OutOfMemoryError.class, () -> Failable.apply(Testable::testAsInteger, testable)); - assertSame(error, e); + assertSame(ERROR, e); final IOException ioe = new IOException("Unknown I/O error"); testable.setThrowable(ioe); @@ -568,16 +550,14 @@ void testAsCallable() { @Test void testAsConsumer() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); final Consumer> consumer = Failable.asConsumer(Testable::test); Throwable e = assertThrows(IllegalStateException.class, () -> consumer.accept(testable)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); + testable.setThrowable(ERROR); e = assertThrows(OutOfMemoryError.class, () -> consumer.accept(testable)); - assertSame(error, e); + assertSame(ERROR, e); final IOException ioe = new IOException("Unknown I/O error"); testable.setThrowable(ioe); @@ -618,20 +598,22 @@ public void testAsSupplier() { } @Test - void testBiConsumer() { - final IllegalStateException ise = new IllegalStateException(); + void testBiConsumer() throws Throwable { final Testable testable = new Testable<>(null); final FailableBiConsumer, Throwable, Throwable> failableBiConsumer = (t, th) -> { t.setThrowable(th); t.test(); }; final BiConsumer, Throwable> consumer = Failable.asBiConsumer(failableBiConsumer); - Throwable e = assertThrows(IllegalStateException.class, () -> consumer.accept(testable, ise)); - assertSame(ise, e); + Throwable e = assertThrows(IllegalStateException.class, + () -> consumer.accept(testable, ILLEGAL_STATE_EXCEPTION)); + assertSame(ILLEGAL_STATE_EXCEPTION, e); - final Error error = new OutOfMemoryError(); - e = assertThrows(OutOfMemoryError.class, () -> consumer.accept(testable, error)); - assertSame(error, e); + e = assertThrows(OutOfMemoryError.class, () -> consumer.accept(testable, ERROR)); + assertSame(ERROR, e); + + e = assertThrows(OutOfMemoryError.class, () -> failableBiConsumer.accept(testable, ERROR)); + assertSame(ERROR, e); final IOException ioe = new IOException("Unknown I/O error"); testable.setThrowable(ioe); @@ -643,9 +625,27 @@ void testBiConsumer() { consumer.accept(testable, null); } + @Test + void testBiConsumerAndThen() throws Throwable { + final Testable testable = new Testable<>(null); + final FailableBiConsumer, Throwable, Throwable> failableBiConsumer = (t, th) -> { + t.setThrowable(th); + t.test(); + }; + Throwable e; + final FailableBiConsumer, Throwable, Throwable> nop = FailableBiConsumer.nop(); + e = assertThrows(OutOfMemoryError.class, () -> nop.andThen(failableBiConsumer).accept(testable, ERROR)); + assertSame(ERROR, e); + // Does not throw + nop.andThen(nop); + // Documented in Javadoc edge-case. + assertThrows(NullPointerException.class, () -> failableBiConsumer.andThen(null)); + + } + @Test public void testBiFunction() { - final IllegalStateException ise = new IllegalStateException(); + final IllegalStateException ise = ILLEGAL_STATE_EXCEPTION; final Testable testable = new Testable<>(ise); final FailableBiFunction, Throwable, Integer, Throwable> failableBiFunction = (t, th) -> { t.setThrowable(th); @@ -655,10 +655,9 @@ public void testBiFunction() { Throwable e = assertThrows(IllegalStateException.class, () -> biFunction.apply(testable, ise)); assertSame(ise, e); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); - e = assertThrows(OutOfMemoryError.class, () -> biFunction.apply(testable, error)); - assertSame(error, e); + testable.setThrowable(ERROR); + e = assertThrows(OutOfMemoryError.class, () -> biFunction.apply(testable, ERROR)); + assertSame(ERROR, e); final IOException ioe = new IOException("Unknown I/O error"); testable.setThrowable(ioe); @@ -674,8 +673,8 @@ public void testBiFunction() { @DisplayName("Test that asPredicate(FailableBiPredicate) is converted to -> BiPredicate ") public void testBiPredicate() { FailureOnOddInvocations.invocations = 0; - final FailableBiPredicate failableBiPredicate = (t1, - t2) -> FailureOnOddInvocations.failingBool(); + final FailableBiPredicate failableBiPredicate = (t1, t2) -> FailureOnOddInvocations + .failingBool(); final BiPredicate predicate = Failable.asBiPredicate(failableBiPredicate); final UndeclaredThrowableException e = assertThrows(UndeclaredThrowableException.class, () -> predicate.test(null, null)); @@ -717,20 +716,18 @@ public void testDoublePredicate() throws Throwable { @Test public void testFunction() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); final FailableFunction failableFunction = th -> { testable.setThrowable(th); return Integer.valueOf(testable.testAsInteger()); }; final Function function = Failable.asFunction(failableFunction); - Throwable e = assertThrows(IllegalStateException.class, () -> function.apply(ise)); - assertSame(ise, e); + Throwable e = assertThrows(IllegalStateException.class, () -> function.apply(ILLEGAL_STATE_EXCEPTION)); + assertSame(ILLEGAL_STATE_EXCEPTION, e); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); - e = assertThrows(OutOfMemoryError.class, () -> function.apply(error)); - assertSame(error, e); + testable.setThrowable(ERROR); + e = assertThrows(OutOfMemoryError.class, () -> function.apply(ERROR)); + assertSame(ERROR, e); final IOException ioe = new IOException("Unknown I/O error"); testable.setThrowable(ioe); @@ -744,16 +741,14 @@ public void testFunction() { @Test public void testGetAsBooleanSupplier() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); Throwable e = assertThrows(IllegalStateException.class, () -> Failable.getAsBoolean(testable::testAsBooleanPrimitive)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); + testable.setThrowable(ERROR); e = assertThrows(OutOfMemoryError.class, () -> Failable.getAsBoolean(testable::testAsBooleanPrimitive)); - assertSame(error, e); + assertSame(ERROR, e); final IOException ioe = new IOException("Unknown I/O error"); testable.setThrowable(ioe); @@ -768,16 +763,14 @@ public void testGetAsBooleanSupplier() { @Test public void testGetAsDoubleSupplier() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); Throwable e = assertThrows(IllegalStateException.class, () -> Failable.getAsDouble(testable::testAsDoublePrimitive)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); + testable.setThrowable(ERROR); e = assertThrows(OutOfMemoryError.class, () -> Failable.getAsDouble(testable::testAsDoublePrimitive)); - assertSame(error, e); + assertSame(ERROR, e); final IOException ioe = new IOException("Unknown I/O error"); testable.setThrowable(ioe); @@ -792,15 +785,13 @@ public void testGetAsDoubleSupplier() { @Test public void testGetAsIntSupplier() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); Throwable e = assertThrows(IllegalStateException.class, () -> Failable.getAsInt(testable::testAsIntPrimitive)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); + testable.setThrowable(ERROR); e = assertThrows(OutOfMemoryError.class, () -> Failable.getAsInt(testable::testAsIntPrimitive)); - assertSame(error, e); + assertSame(ERROR, e); final IOException ioe = new IOException("Unknown I/O error"); testable.setThrowable(ioe); @@ -816,16 +807,14 @@ public void testGetAsIntSupplier() { @Test public void testGetAsLongSupplier() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); Throwable e = assertThrows(IllegalStateException.class, () -> Failable.getAsLong(testable::testAsLongPrimitive)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); + testable.setThrowable(ERROR); e = assertThrows(OutOfMemoryError.class, () -> Failable.getAsLong(testable::testAsLongPrimitive)); - assertSame(error, e); + assertSame(ERROR, e); final IOException ioe = new IOException("Unknown I/O error"); testable.setThrowable(ioe); @@ -854,15 +843,13 @@ public void testGetFromSupplier() { @Test public void testGetSupplier() { - final IllegalStateException ise = new IllegalStateException(); - final Testable testable = new Testable<>(ise); + final Testable testable = new Testable<>(ILLEGAL_STATE_EXCEPTION); Throwable e = assertThrows(IllegalStateException.class, () -> Failable.get(testable::testAsInteger)); - assertSame(ise, e); + assertSame(ILLEGAL_STATE_EXCEPTION, e); - final Error error = new OutOfMemoryError(); - testable.setThrowable(error); + testable.setThrowable(ERROR); e = assertThrows(OutOfMemoryError.class, () -> Failable.get(testable::testAsInteger)); - assertSame(error, e); + assertSame(ERROR, e); final IOException ioe = new IOException("Unknown I/O error"); testable.setThrowable(ioe); @@ -897,8 +884,7 @@ public void testLongPredicate() throws Throwable { @DisplayName("Test that asPredicate(FailablePredicate) is converted to -> Predicate ") public void testPredicate() { FailureOnOddInvocations.invocations = 0; - final FailablePredicate failablePredicate = t -> FailureOnOddInvocations - .failingBool(); + final FailablePredicate failablePredicate = t -> FailureOnOddInvocations.failingBool(); final Predicate predicate = Failable.asPredicate(failablePredicate); final UndeclaredThrowableException e = assertThrows(UndeclaredThrowableException.class, () -> predicate.test(null)); @@ -1047,7 +1033,6 @@ public boolean getAsBoolean() throws IOException { /////////////////////////////////////////////// - /** * Tests that our failable interface is properly defined to throw any exception. using the top level generic types * Object and Throwable. @@ -2050,32 +2035,30 @@ public long applyAsLong(final String t) throws IOException { @Test public void testTryWithResources() { - final CloseableObject co = new CloseableObject(); - final FailableConsumer consumer = co::run; - final IllegalStateException ise = new IllegalStateException(); + final CloseableObject closeable = new CloseableObject(); + final FailableConsumer consumer = closeable::run; Throwable e = assertThrows(IllegalStateException.class, - () -> Failable.tryWithResources(() -> consumer.accept(ise), co::close)); - assertSame(ise, e); + () -> Failable.tryWithResources(() -> consumer.accept(ILLEGAL_STATE_EXCEPTION), closeable::close)); + assertSame(ILLEGAL_STATE_EXCEPTION, e); - assertTrue(co.isClosed()); - co.reset(); - final Error error = new OutOfMemoryError(); + assertTrue(closeable.isClosed()); + closeable.reset(); e = assertThrows(OutOfMemoryError.class, - () -> Failable.tryWithResources(() -> consumer.accept(error), co::close)); - assertSame(error, e); + () -> Failable.tryWithResources(() -> consumer.accept(ERROR), closeable::close)); + assertSame(ERROR, e); - assertTrue(co.isClosed()); - co.reset(); + assertTrue(closeable.isClosed()); + closeable.reset(); final IOException ioe = new IOException("Unknown I/O error"); final UncheckedIOException uioe = assertThrows(UncheckedIOException.class, - () -> Failable.tryWithResources(() -> consumer.accept(ioe), co::close)); + () -> Failable.tryWithResources(() -> consumer.accept(ioe), closeable::close)); final IOException cause = uioe.getCause(); assertSame(ioe, cause); - assertTrue(co.isClosed()); - co.reset(); - Failable.tryWithResources(() -> consumer.accept(null), co::close); - assertTrue(co.isClosed()); + assertTrue(closeable.isClosed()); + closeable.reset(); + Failable.tryWithResources(() -> consumer.accept(null), closeable::close); + assertTrue(closeable.isClosed()); } }