diff options
author | Gary Gregory <garydgregory@gmail.com> | 2020-06-17 17:37:14 -0400 |
---|---|---|
committer | Gary Gregory <garydgregory@gmail.com> | 2020-06-17 17:37:14 -0400 |
commit | 8fcefb4f98856998d857e90f73bb88af043ef3b8 (patch) | |
tree | 8c791a076344b81cfd59cfa729431308bccd15af /src/test/java/org/apache | |
parent | 724c00f0e86926e758b56bea03cdc517c475ad6a (diff) | |
download | apache-commons-lang-8fcefb4f98856998d857e90f73bb88af043ef3b8.tar.gz |
Centralize stream code in our own 'stream' package as
a parallel to the JRE's java.util.stream package.
- Re-implement use of failable function interfaces based on our function
package.
- Deprecate old class.
- Remove trainling whitespace.
Diffstat (limited to 'src/test/java/org/apache')
-rw-r--r-- | src/test/java/org/apache/commons/lang3/StreamsTest.java | 16 | ||||
-rw-r--r-- | src/test/java/org/apache/commons/lang3/stream/StreamsTest.java | 187 |
2 files changed, 195 insertions, 8 deletions
diff --git a/src/test/java/org/apache/commons/lang3/StreamsTest.java b/src/test/java/org/apache/commons/lang3/StreamsTest.java index a0b79f60c..df1316036 100644 --- a/src/test/java/org/apache/commons/lang3/StreamsTest.java +++ b/src/test/java/org/apache/commons/lang3/StreamsTest.java @@ -41,10 +41,10 @@ import org.junit.jupiter.api.TestFactory; import org.junit.jupiter.api.function.Executable; import org.xml.sax.SAXException; -class StreamsTest { +public class StreamsTest { @Test - void testSimpleStreamMap() { + public void testSimpleStreamMap() { final List<String> input = Arrays.asList("1", "2", "3", "4", "5", "6"); final List<Integer> output = Functions.stream(input).map(Integer::valueOf).collect(Collectors.toList()); assertEquals(6, output.size()); @@ -54,7 +54,7 @@ class StreamsTest { } @Test - void testSimpleStreamMapFailing() { + public void testSimpleStreamMapFailing() { final List<String> input = Arrays.asList("1", "2", "3", "4 ", "5", "6"); final Executable testMethod = () -> Functions.stream(input).map(Integer::valueOf).collect(Collectors.toList()); final NumberFormatException thrown = assertThrows(NumberFormatException.class, testMethod); @@ -62,7 +62,7 @@ class StreamsTest { } @Test - void testSimpleStreamForEach() { + public void testSimpleStreamForEach() { final List<String> input = Arrays.asList("1", "2", "3", "4", "5", "6"); final List<Integer> output = new ArrayList<>(); Functions.stream(input).forEach(s -> output.add(Integer.valueOf(s))); @@ -73,7 +73,7 @@ class StreamsTest { } @Test - void testToArray() { + public void testToArray() { final String[] array = Arrays.asList("2", "3", "1").stream().collect(Streams.toArray(String.class)); assertNotNull(array); assertEquals(3, array.length); @@ -92,7 +92,7 @@ class StreamsTest { } @TestFactory - Stream<DynamicTest> simpleStreamForEachFailing() { + public Stream<DynamicTest> simpleStreamForEachFailing() { final List<String> input = Arrays.asList("1", "2", "3", "4", "5", "6"); return Stream.of( @@ -127,7 +127,7 @@ class StreamsTest { } @Test - void testSimpleStreamFilter() { + public void testSimpleStreamFilter() { final List<String> input = Arrays.asList("1", "2", "3", "4", "5", "6"); final List<Integer> output = Functions.stream(input) .map(Integer::valueOf) @@ -155,7 +155,7 @@ class StreamsTest { } @TestFactory - Stream<DynamicTest> simpleStreamFilterFailing() { + public Stream<DynamicTest> simpleStreamFilterFailing() { final List<String> input = Arrays.asList("1", "2", "3", "4", "5", "6"); final List<Integer> output = Functions.stream(input) .map(Integer::valueOf) diff --git a/src/test/java/org/apache/commons/lang3/stream/StreamsTest.java b/src/test/java/org/apache/commons/lang3/stream/StreamsTest.java new file mode 100644 index 000000000..218fa334a --- /dev/null +++ b/src/test/java/org/apache/commons/lang3/stream/StreamsTest.java @@ -0,0 +1,187 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.commons.lang3.stream; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.core.IsNull.nullValue; +import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.DynamicTest.dynamicTest; + +import java.lang.reflect.UndeclaredThrowableException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.apache.commons.lang3.function.Failable; +import org.apache.commons.lang3.function.FailableConsumer; +import org.apache.commons.lang3.function.FailablePredicate; +import org.junit.jupiter.api.DynamicTest; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestFactory; +import org.junit.jupiter.api.function.Executable; +import org.xml.sax.SAXException; + +public class StreamsTest { + + protected <T extends Throwable> FailableConsumer<String, T> asIntConsumer(final T pThrowable) { + return s -> { + final Integer i = Integer.valueOf(s); + if (i.intValue() == 4) { + throw pThrowable; + } + }; + } + + protected <T extends Throwable> FailablePredicate<Integer, T> asIntPredicate(final T pThrowable) { + return i -> { + if (i.intValue() == 5) { + if (pThrowable != null) { + throw pThrowable; + } + } + return i % 2 == 0; + }; + } + + private void assertEvenNumbers(final List<Integer> output) { + assertEquals(3, output.size()); + for (int i = 0; i < 3; i++) { + assertEquals((i + 1) * 2, output.get(i).intValue()); + } + } + + @TestFactory + public Stream<DynamicTest> simpleStreamFilterFailing() { + final List<String> input = Arrays.asList("1", "2", "3", "4", "5", "6"); + final List<Integer> output = Failable.stream(input).map(Integer::valueOf).filter(asIntPredicate(null)) + .collect(Collectors.toList()); + assertEvenNumbers(output); + + return Stream.of( + + dynamicTest("IllegalArgumentException", () -> { + final IllegalArgumentException iae = new IllegalArgumentException("Invalid argument: " + 5); + final Executable testMethod = () -> Failable.stream(input).map(Integer::valueOf) + .filter(asIntPredicate(iae)).collect(Collectors.toList()); + final IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class, testMethod); + assertThat(thrown.getMessage(), is(equalTo("Invalid argument: " + 5))); + }), + + dynamicTest("OutOfMemoryError", () -> { + final OutOfMemoryError oome = new OutOfMemoryError(); + final Executable testMethod = () -> Failable.stream(input).map(Integer::valueOf) + .filter(asIntPredicate(oome)).collect(Collectors.toList()); + final OutOfMemoryError thrown = assertThrows(OutOfMemoryError.class, testMethod); + assertThat(thrown.getMessage(), is(nullValue())); + }), + + dynamicTest("SAXException", () -> { + final SAXException se = new SAXException(); + final Executable testMethod = () -> Failable.stream(input).map(Integer::valueOf) + .filter(asIntPredicate(se)).collect(Collectors.toList()); + final UndeclaredThrowableException thrown = assertThrows(UndeclaredThrowableException.class, + testMethod); + assertAll(() -> assertThat(thrown.getMessage(), is(nullValue())), + () -> assertThat(thrown.getCause(), is(equalTo(se)))); + })); + } + + @TestFactory + public Stream<DynamicTest> simpleStreamForEachFailing() { + final List<String> input = Arrays.asList("1", "2", "3", "4", "5", "6"); + + return Stream.of( + + dynamicTest("IllegalArgumentException", () -> { + final IllegalArgumentException ise = new IllegalArgumentException(); + final Executable testMethod = () -> Failable.stream(input).forEach(asIntConsumer(ise)); + final IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class, testMethod); + assertThat(thrown.getMessage(), is(nullValue())); + }), + + dynamicTest("OutOfMemoryError", () -> { + final OutOfMemoryError oome = new OutOfMemoryError(); + final Executable oomeTestMethod = () -> Failable.stream(input).forEach(asIntConsumer(oome)); + final OutOfMemoryError oomeThrown = assertThrows(OutOfMemoryError.class, oomeTestMethod); + assertThat(oomeThrown.getMessage(), is(nullValue())); + }), + + dynamicTest("SAXException", () -> { + final SAXException se = new SAXException(); + final Executable seTestMethod = () -> Failable.stream(input).forEach(asIntConsumer(se)); + final UndeclaredThrowableException seThrown = assertThrows(UndeclaredThrowableException.class, + seTestMethod); + assertAll(() -> assertThat(seThrown.getMessage(), is(nullValue())), + () -> assertThat(seThrown.getCause(), is(equalTo(se)))); + })); + } + + @Test + public void testSimpleStreamFilter() { + final List<String> input = Arrays.asList("1", "2", "3", "4", "5", "6"); + final List<Integer> output = Failable.stream(input).map(Integer::valueOf).filter(i -> (i.intValue() % 2 == 0)) + .collect(Collectors.toList()); + assertEvenNumbers(output); + } + + @Test + public void testSimpleStreamForEach() { + final List<String> input = Arrays.asList("1", "2", "3", "4", "5", "6"); + final List<Integer> output = new ArrayList<>(); + Failable.stream(input).forEach(s -> output.add(Integer.valueOf(s))); + assertEquals(6, output.size()); + for (int i = 0; i < 6; i++) { + assertEquals(i + 1, output.get(i).intValue()); + } + } + + @Test + public void testSimpleStreamMap() { + final List<String> input = Arrays.asList("1", "2", "3", "4", "5", "6"); + final List<Integer> output = Failable.stream(input).map(Integer::valueOf).collect(Collectors.toList()); + assertEquals(6, output.size()); + for (int i = 0; i < 6; i++) { + assertEquals(i + 1, output.get(i).intValue()); + } + } + + @Test + public void testSimpleStreamMapFailing() { + final List<String> input = Arrays.asList("1", "2", "3", "4 ", "5", "6"); + final Executable testMethod = () -> Failable.stream(input).map(Integer::valueOf).collect(Collectors.toList()); + final NumberFormatException thrown = assertThrows(NumberFormatException.class, testMethod); + assertEquals("For input string: \"4 \"", thrown.getMessage()); + } + + @Test + public void testToArray() { + final String[] array = Arrays.asList("2", "3", "1").stream().collect(Streams.toArray(String.class)); + assertNotNull(array); + assertEquals(3, array.length); + assertEquals("2", array[0]); + assertEquals("3", array[1]); + assertEquals("1", array[2]); + } + +} |