Fix deprecations in tests

aNNiMON · Oct 21, 2020 · 171073f · 171073f
1 parent 16f5c68
commit 171073f
Show file tree

Hide file tree

Showing 162 changed files with 412 additions and 333 deletions.
diff --git a/stream/nbproject/project.properties b/stream/nbproject/project.properties
diff --git a/stream/src/test/java/com/annimon/stream/CollectorsTest.java b/stream/src/test/java/com/annimon/stream/CollectorsTest.java
@@ -1,7 +1,6 @@
 package com.annimon.stream;
 
 import com.annimon.stream.function.*;
-import static com.annimon.stream.test.hamcrest.CommonMatcher.hasOnlyPrivateConstructors;
 import java.util.AbstractMap;
 import java.util.Arrays;
 import java.util.Collection;
@@ -10,22 +9,23 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.function.ThrowingRunnable;
+import static com.annimon.stream.test.hamcrest.CommonMatcher.hasOnlyPrivateConstructors;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.fail;
 
 /**
  * Tests {@code Collectors}.
  *
  * @see com.annimon.stream.Collectors
  */
+@SuppressWarnings("ConstantConditions")
 public class CollectorsTest {
 
-    @Rule
-    public final ExpectedException expectedException = ExpectedException.none();
-
     @Test
     public void testToCollection() {
         Collection<Integer> result = Stream.range(0, 5)
@@ -69,9 +69,8 @@ public void testToUnmodifiableList() {
         } catch (UnsupportedOperationException expected) { }
     }
 
-    @Test
+    @Test(expected = NullPointerException.class)
     public void testToUnmodifiableListWithNullValues() {
-        expectedException.expect(NullPointerException.class);
         Stream.of(0, 1, null, 3, 4, null)
                 .collect(Collectors.toUnmodifiableList());
     }
@@ -100,9 +99,8 @@ public void testToUnmodifiableSet() {
         } catch (UnsupportedOperationException expected) { }
     }
 
-    @Test
+    @Test(expected = NullPointerException.class)
     public void testToUnmodifiableSetWithNullValues() {
-        expectedException.expect(NullPointerException.class);
         Stream.of(0, 1, null, 3, 4, null)
                 .collect(Collectors.toUnmodifiableSet());
     }
@@ -144,9 +142,8 @@ public void testToMapWithIdentityValueMapper() {
         ));
     }
 
-    @Test
+    @Test(expected = NullPointerException.class)
     public void testToMapWithValueMapperThatReturnsNullValue() {
-        expectedException.expect(NullPointerException.class);
         final Function<String, Character> keyMapper = Functions.firstCharacterExtractor();
         Stream.of("a0", "b0", "c0", "d0")
                 .collect(Collectors.toMap(keyMapper, new UnaryOperator<String>() {
@@ -161,25 +158,39 @@ public String apply(String value) {
 
     @Test
     public void testToMapWithDefaultValueMapperAndDuplicatingKeys() {
-        expectedException.expect(IllegalStateException.class);
-        expectedException.expectMessage("Duplicate key a (attempted merging values a0 and a2)");
-        Stream.of("a0", "b1", "a2", "d3")
-                .collect(Collectors.toMap(Functions.firstCharacterExtractor()));
+        IllegalStateException exc =  assertThrows(
+                IllegalStateException.class,
+                new ThrowingRunnable() {
+                    @Override
+                    public void run() {
+                        Stream.of("a0", "b1", "a2", "d3")
+                                .collect(Collectors.toMap(Functions.firstCharacterExtractor()));
+                    }
+                }
+        );
+        assertEquals("Duplicate key a (attempted merging values a0 and a2)", exc.getMessage());
+
     }
 
     @Test
     public void testToUnmodifiableMapDuplicatingKeys() {
-        expectedException.expect(IllegalStateException.class);
-        expectedException.expectMessage("Duplicate key a (attempted merging values a0 and a2)");
-        final Function<String, Character> keyMapper = Functions.firstCharacterExtractor();
-        final UnaryOperator<String> valueMapper = UnaryOperator.Util.identity();
-        Stream.of("a0", "b1", "a2", "d3")
-                .collect(Collectors.toUnmodifiableMap(keyMapper, valueMapper));
+        IllegalStateException exc =  assertThrows(
+                IllegalStateException.class,
+                new ThrowingRunnable() {
+                    @Override
+                    public void run() {
+                        final Function<String, Character> keyMapper = Functions.firstCharacterExtractor();
+                        final UnaryOperator<String> valueMapper = UnaryOperator.Util.identity();
+                        Stream.of("a0", "b1", "a2", "d3")
+                                .collect(Collectors.toUnmodifiableMap(keyMapper, valueMapper));
+                    }
+                }
+        );
+        assertEquals("Duplicate key a (attempted merging values a0 and a2)", exc.getMessage());
     }
 
-    @Test
+    @Test(expected = NullPointerException.class)
     public void testToUnmodifiableMapWithNullKey() {
-        expectedException.expect(NullPointerException.class);
         final Function<String, Character> keyMapper = Functions.firstCharacterExtractor();
         final UnaryOperator<String> valueMapper = new UnaryOperator<String>() {
             @Override
@@ -192,9 +203,8 @@ public String apply(String value) {
                 .collect(Collectors.toUnmodifiableMap(keyMapper, valueMapper));
     }
 
-    @Test
+    @Test(expected = NullPointerException.class)
     public void testToUnmodifiableMapWithNullValue() {
-        expectedException.expect(NullPointerException.class);
         final Function<String, Character> keyMapper = Functions.firstCharacterExtractor();
         final UnaryOperator<String> valueMapper = new UnaryOperator<String>() {
             @Override
@@ -305,9 +315,8 @@ public String apply(String oldValue, String newValue) {
         } catch (UnsupportedOperationException expected) { }
     }
 
-    @Test
+    @Test(expected = NullPointerException.class)
     public void testToUnmodifiableMapWithMergerFunctionAndNullKey() {
-        expectedException.expect(NullPointerException.class);
         final Function<String, Character> keyMapper = Functions.firstCharacterExtractor();
         final UnaryOperator<String> valueMapper = new UnaryOperator<String>() {
             @Override
@@ -642,6 +651,7 @@ public void testGroupingByStudentSpeciality() {
         )));
     }
 
+    @SuppressWarnings("ArraysAsListWithZeroOrOneArgument")
     @Test
     public void testGroupingByStudentCourse() {
         Map<Integer, List<Student>> byCourse = Stream.of(Students.ALL)
@@ -692,7 +702,7 @@ public void testGroupingByStudentCourseCounting() {
     @Test
     public void testPartitioningByStudentCourse() {
         Map<Boolean, List<Student>> byCourse = Stream.of(Students.ALL)
-                .collect(Collectors.partitioningBy(new Predicate<Student>() {
+                .collect(Collectors.partitioningBy(new Predicate<Student>() {
                     @Override
                     public boolean test(Student student) {
                         return student.getCourse() == 2;
@@ -712,7 +722,7 @@ public boolean test(Student student) {
     @Test
     public void testPartitioningByStudentCourseToNames() {
         Map<Boolean, String> byCourse = Stream.of(Students.ALL)
-                .collect(Collectors.partitioningBy(new Predicate<Student>() {
+                .collect(Collectors.partitioningBy(new Predicate<Student>() {
                     @Override
                     public boolean test(Student student) {
                         return student.getCourse() > 2;
@@ -761,23 +771,20 @@ public void testMappingStudentNamesBySpeciality() {
                         Collectors.mapping(Students.studentName, Collectors.<String>toSet())));
 
         assertThat(namesBySpeciality.get("Economics"),
-                containsInAnyOrder(new String[] {
-                    Students.MARIA_ECONOMICS_1.getName(),
-                    Students.SERGEY_ECONOMICS_2.getName(),
-                    Students.SOPHIA_ECONOMICS_2.getName()
-                }));
+                containsInAnyOrder(
+                        Students.MARIA_ECONOMICS_1.getName(),
+                        Students.SERGEY_ECONOMICS_2.getName(),
+                        Students.SOPHIA_ECONOMICS_2.getName()));
         assertThat(namesBySpeciality.get("CS"),
-                containsInAnyOrder(new String[] {
-                    Students.STEVE_CS_4.getName(),
-                    Students.VICTORIA_CS_3.getName(),
-                    Students.JOHN_CS_2.getName(),
-                    Students.MARIA_CS_1.getName()
-                }));
+                containsInAnyOrder(
+                        Students.STEVE_CS_4.getName(),
+                        Students.VICTORIA_CS_3.getName(),
+                        Students.JOHN_CS_2.getName(),
+                        Students.MARIA_CS_1.getName()));
         assertThat(namesBySpeciality.get("Law"),
-                containsInAnyOrder(new String[] {
-                    Students.GEORGE_LAW_3.getName(),
-                    Students.SERGEY_LAW_1.getName()
-                }));
+                containsInAnyOrder(
+                        Students.GEORGE_LAW_3.getName(),
+                        Students.SERGEY_LAW_1.getName()));
     }
 
     @Test

diff --git a/stream/src/test/java/com/annimon/stream/ComparatorCompatTest.java b/stream/src/test/java/com/annimon/stream/ComparatorCompatTest.java
@@ -9,9 +9,9 @@
 import java.util.List;
 import org.junit.Test;
 import static com.annimon.stream.test.hamcrest.StreamMatcher.assertElements;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 
 public class ComparatorCompatTest {
 

diff --git a/stream/src/test/java/com/annimon/stream/ExceptionalTest.java b/stream/src/test/java/com/annimon/stream/ExceptionalTest.java
@@ -9,15 +9,18 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
 import org.junit.Test;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.*;
 
 /**
  * Tests {@code Exceptional}.
  *
  * @see com.annimon.stream.Exceptional
  */
+@SuppressWarnings("ConstantConditions")
 public class ExceptionalTest {
 
     @Test
@@ -106,30 +109,30 @@ public void testGetOrThrowWithException() throws Throwable {
     }
 
     @Test
-    public void testGetOrThrowRuntimeExceptionWithoutException() throws Throwable {
+    public void testGetOrThrowRuntimeExceptionWithoutException() {
         int value = Exceptional
                 .of(tenSupplier)
                 .getOrThrowRuntimeException();
         assertEquals(10, value);
     }
 
     @Test(expected = RuntimeException.class)
-    public void testGetOrThrowRuntimeExceptionWithException() throws Throwable {
+    public void testGetOrThrowRuntimeExceptionWithException() {
         Exceptional
                 .of(ioExceptionSupplier)
                 .getOrThrowRuntimeException();
     }
 
     @Test
-    public void testGetOrThrowNewExceptionWithoutException() throws Throwable {
+    public void testGetOrThrowNewExceptionWithoutException() {
         int value = Exceptional
                 .of(tenSupplier)
                 .getOrThrow(new ArithmeticException());
         assertEquals(10, value);
     }
 
     @Test(expected = ArithmeticException.class)
-    public void testGetOrThrowNewExceptionWithException() throws Throwable {
+    public void testGetOrThrowNewExceptionWithException() {
         Exceptional
                 .of(ioExceptionSupplier)
                 .getOrThrow(new ArithmeticException());
@@ -192,7 +195,7 @@ public Exceptional<Integer> apply(Exceptional<Integer> exceptional) {
                 return exceptional
                         .map(new ThrowableFunction<Integer, Integer, Throwable>() {
                             @Override
-                            public Integer apply(Integer integer) throws Throwable {
+                            public Integer apply(Integer integer) {
                                 return integer + 1;
                             }
                         });
@@ -217,7 +220,7 @@ public void testCustomTerminal() {
             public Integer apply(Exceptional<Integer> exceptional) {
                 return exceptional.map(new ThrowableFunction<Integer, Integer, Throwable>() {
                     @Override
-                    public Integer apply(Integer integer) throws Throwable {
+                    public Integer apply(Integer integer) {
                         return integer + 1;
                     }
                 }).getOrElse(0);
@@ -239,7 +242,7 @@ public void testMapWithoutException() {
                 .of(tenSupplier)
                 .map(new ThrowableFunction<Integer, String, Throwable>() {
                     @Override
-                    public String apply(Integer value) throws Throwable {
+                    public String apply(Integer value) {
                         return Integer.toString(value);
                     }
                 })
@@ -253,7 +256,7 @@ public void testMapWithException() throws Throwable {
                 .of(tenSupplier)
                 .map(new ThrowableFunction<Integer, String, Throwable>() {
                     @Override
-                    public String apply(Integer value) throws Throwable {
+                    public String apply(Integer value) {
                         throw new NumberFormatException();
                     }
                 })
@@ -274,7 +277,7 @@ public void testMapOnAlreadyFailedExceptional() throws Throwable {
                 .of(ioExceptionSupplier)
                 .map(new ThrowableFunction<Integer, String, Throwable>() {
                     @Override
-                    public String apply(Integer value) throws Throwable {
+                    public String apply(Integer value) {
                         return Integer.toString(value);
                     }
                 })
@@ -432,7 +435,7 @@ public Integer apply(Throwable throwable) throws IOException {
                 })
                 .recover(new ThrowableFunction<Throwable, Integer, Throwable>() {
                     @Override
-                    public Integer apply(Throwable throwable) throws IOException {
+                    public Integer apply(Throwable throwable) {
                         assertThat(throwable, instanceOf(FileNotFoundException.class));
                         return 10;
                     }
@@ -460,7 +463,7 @@ public void testRecoverWithOnNormalState() {
         int value = Exceptional
                 .of(new ThrowableSupplier<Integer, Throwable>() {
                     @Override
-                    public Integer get() throws Throwable {
+                    public Integer get() {
                         return 42;
                     }
                 })
@@ -513,6 +516,7 @@ public void testEqualsTransitive() {
         assertEquals(ten1, ten3);
     }
 
+    @SuppressWarnings({"EqualsBetweenInconvertibleTypes", "SimplifiableAssertion"})
     @Test
     public void testEqualsWithDifferentTypes() {
         final Exceptional<Integer> ten1 = Exceptional.of(tenSupplier);
@@ -524,7 +528,7 @@ public void testEqualsWithDifferentNumberTypes() {
         final Exceptional<Integer> ten1 = Exceptional.of(tenSupplier);
         final Exceptional<Byte> tenByte = Exceptional.of(new ThrowableSupplier<Byte, Throwable>() {
             @Override
-            public Byte get() throws Throwable {
+            public Byte get() {
                 return (byte) 10;
             }
         });
@@ -570,7 +574,7 @@ public void testHashCodeWithSameObject() {
     public void testHashCodeWithDifferentGenericType() {
         final Exceptional<Byte> tenByte = Exceptional.of(new ThrowableSupplier<Byte, Throwable>() {
             @Override
-            public Byte get() throws Throwable {
+            public Byte get() {
                 return (byte) 10;
             }
         });
@@ -592,7 +596,7 @@ public void testToStringWithException() {
     private static final ThrowableSupplier<Integer, Throwable> tenSupplier
             = new ThrowableSupplier<Integer, Throwable>() {
         @Override
-        public Integer get() throws IOException {
+        public Integer get() {
             return 10;
         }
     };

diff --git a/stream/src/test/java/com/annimon/stream/Functions.java b/stream/src/test/java/com/annimon/stream/Functions.java
@@ -1,7 +1,6 @@
 package com.annimon.stream;
 
 import com.annimon.stream.function.*;
-
 import java.lang.reflect.Array;
 import java.util.Comparator;
 import java.util.Iterator;

diff --git a/stream/src/test/java/com/annimon/stream/IntPairTest.java b/stream/src/test/java/com/annimon/stream/IntPairTest.java
@@ -1,7 +1,9 @@
 package com.annimon.stream;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 
 public final class IntPairTest {