remove Java warnings

TNG · Oct 23, 2016 · 36b9208 · 36b9208
1 parent ccd89d8
commit 36b9208
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 23 deletions.
diff --git a/...Test/java/com/tngtech/test/java/junit/dataprovider/DataProviderListArgAcceptanceTest.java b/...Test/java/com/tngtech/test/java/junit/dataprovider/DataProviderListArgAcceptanceTest.java
@@ -1,14 +1,17 @@
 package com.tngtech.test.java.junit.dataprovider;
 
-import com.tngtech.java.junit.dataprovider.DataProvider;
-import com.tngtech.java.junit.dataprovider.DataProviderRunner;
-import com.tngtech.java.junit.dataprovider.UseDataProvider;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
 import java.util.List;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.tngtech.java.junit.dataprovider.DataProvider;
+import com.tngtech.java.junit.dataprovider.DataProviderRunner;
+import com.tngtech.java.junit.dataprovider.UseDataProvider;
+
 @RunWith(DataProviderRunner.class)
 public class DataProviderListArgAcceptanceTest {
 
@@ -24,7 +27,8 @@ public static Object[][] dataProviderListArg() {
     @Test
     @UseDataProvider
     public void testListArg(List<String> list, String string) {
-        // Check output within IDE
+        // Expected:
+        assertThat(list).doesNotContain(string);
     }
 
     @DataProvider
@@ -37,5 +41,7 @@ public static Object[][] stringsData() {
     @Test
     @UseDataProvider("stringsData")
     public void test(List<String> strings, String expectedValue) {
+        // Expected:
+        assertThat(strings).contains(expectedValue);
     }
 }
diff --git a/...est/java/com/tngtech/test/java/junit/dataprovider/DataProviderResolverAcceptanceTest.java b/...est/java/com/tngtech/test/java/junit/dataprovider/DataProviderResolverAcceptanceTest.java
@@ -94,7 +94,7 @@ public static Set<Number> testNumberC() {
     @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE")
     @Test
     @UseDataProvider(resolver = DataProviderStartWithTestMethodNameResolver.class)
-    public void testNumber(Number number) {
+    public void testNumber(@SuppressWarnings("unused") Number number) {
         // When:
         @SuppressWarnings("unused")
         int count = counter.incrementAndGet();

diff --git a/...st/java/com/tngtech/test/java/junit/dataprovider/DataProviderSingleArgAcceptanceTest.java b/...st/java/com/tngtech/test/java/junit/dataprovider/DataProviderSingleArgAcceptanceTest.java
@@ -1,5 +1,7 @@
 package com.tngtech.test.java.junit.dataprovider;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -30,7 +32,8 @@ public static Object[] dataProviderSingleArgObjectArray() {
     @Test
     @UseDataProvider("dataProviderSingleArgObjectArray")
     public void testSingleArgObjectArray(String string) {
-        // Check output within IDE
+        // Expected:
+        assertThat(string).isNotEqualTo("1234");
     }
 
     @DataProvider
@@ -41,7 +44,8 @@ public static List<Object> dataProviderSingleArgListOfObject() {
     @Test
     @UseDataProvider("dataProviderSingleArgListOfObject")
     public void testSingleArgListOfObject(String string) {
-        // Check output within IDE
+        // Expected:
+        assertThat(string).isNotEqualTo("1234");
     }
 
     @DataProvider
@@ -57,6 +61,7 @@ public static Iterable<String> dataProviderSingleArgIterableOfString() {
     @Test
     @UseDataProvider
     public void testSingleArgIterableOfString(String string) {
-        // Check output within IDE
+        // Expected:
+        assertThat(string).isNotEqualTo("1234");
     }
 }
diff --git a/...st/java/com/tngtech/test/java/junit/dataprovider/custom/DateTimeAwareStringConverter.java b/...st/java/com/tngtech/test/java/junit/dataprovider/custom/DateTimeAwareStringConverter.java
@@ -1,13 +1,13 @@
 package com.tngtech.test.java.junit.dataprovider.custom;
 
-import com.tngtech.java.junit.dataprovider.DataProvider;
-import com.tngtech.java.junit.dataprovider.internal.convert.StringConverter;
-
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.tngtech.java.junit.dataprovider.DataProvider;
+import com.tngtech.java.junit.dataprovider.internal.convert.StringConverter;
+
 public class DateTimeAwareStringConverter extends StringConverter {
 
     private final DateFormat dateTimeIso;

diff --git a/src/test/java/com/tngtech/java/junit/dataprovider/DataProviderRunnerTest.java b/src/test/java/com/tngtech/java/junit/dataprovider/DataProviderRunnerTest.java
@@ -4,7 +4,6 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyListOf;
 import static org.mockito.Mockito.doAnswer;
@@ -555,7 +554,7 @@ public void testGetDataProviderMethodShouldReturnSingletonListContainingNullForN
 
         // Then:
         assertThat(result).hasSize(1).containsNull();
-        assertThat(underTest.dataProviderMethods).contains(entry(testMethod, result));
+        assertThat(underTest.dataProviderMethods).containsEntry(testMethod, result);
     }
 
     @Test
@@ -574,11 +573,11 @@ public void testGetDataProviderMethodShouldReturnEmptyListForNotFoundDataProvide
 
         // Then:
         assertThat(result).isEmpty();
-        assertThat(underTest.dataProviderMethods).contains(entry(testMethod, result));
+        assertThat(underTest.dataProviderMethods).containsEntry(testMethod, result);
     }
 
     @Test
-    public void testGetDataProviderMethodShouldReturnEmptyListIfUseDataProviderResolversAreEmpty() throws Exception {
+    public void testGetDataProviderMethodShouldReturnEmptyListIfUseDataProviderResolversAreEmpty() {
         // Given:
         doReturn(useDataProvider).when(testMethod).getAnnotation(UseDataProvider.class);
 
@@ -589,7 +588,7 @@ public void testGetDataProviderMethodShouldReturnEmptyListIfUseDataProviderResol
 
         // Then:
         assertThat(result).isEmpty();
-        assertThat(underTest.dataProviderMethods).contains(entry(testMethod, result));
+        assertThat(underTest.dataProviderMethods).containsEntry(testMethod, result);
     }
 
     @Test
@@ -617,7 +616,7 @@ public void testGetDataProviderMethodShouldReturnFirstNotEmptyListIfResolveStrat
 
         // Then:
         assertThat(result).containsExactlyElementsOf(expected2);
-        assertThat(underTest.dataProviderMethods).contains(entry(testMethod, result));
+        assertThat(underTest.dataProviderMethods).containsEntry(testMethod, result);
     }
 
     @Test
@@ -645,7 +644,7 @@ public void testGetDataProviderMethodShouldReturnFirstNotEmptyListIfResolveStrat
 
         // Then:
         assertThat(result).hasSize(3).containsAll(expected2).containsAll(expected3);
-        assertThat(underTest.dataProviderMethods).contains(entry(testMethod, result));
+        assertThat(underTest.dataProviderMethods).containsEntry(testMethod, result);
     }
 
     @Test(expected = IllegalStateException.class)
@@ -714,7 +713,6 @@ public List<FrameworkMethod> resolve(FrameworkMethod testMethod, UseDataProvider
     }
 
     private static class PrivateDefaultConstructor implements DataProviderMethodResolver {
-        @SuppressWarnings("unused")
         private PrivateDefaultConstructor() {
             // unused
         }

diff --git a/src/test/java/com/tngtech/java/junit/dataprovider/internal/DataConverterTest.java b/src/test/java/com/tngtech/java/junit/dataprovider/internal/DataConverterTest.java
@@ -452,7 +452,7 @@ public static List<Iterable<Number>> methodReturningListOfIterableOfNumber() {
         return null;
     }
 
-    public static <T extends String> Iterable<Iterable<T>> methodReturningIterableOfIterableOfT() {
+    public static <T extends CharSequence> Iterable<Iterable<T>> methodReturningIterableOfIterableOfT() {
         return null;
     }
 

diff --git a/...t/java/com/tngtech/java/junit/dataprovider/internal/convert/ObjectArrayConverterTest.java b/...t/java/com/tngtech/java/junit/dataprovider/internal/convert/ObjectArrayConverterTest.java
@@ -42,7 +42,7 @@ public void testConvertShouldCreateEmptyVarargsArrayForMissingOnlyVarargsArgumen
     }
 
     @Test
-    public void testConvertShouldHandleNullElementAsSingleElement() throws Exception {
+    public void testConvertShouldHandleNullElementAsSingleElement() {
         // Given:
         Object[] data = new Object[] { null };
         Class<?>[] parameterTypes = new Class<?>[] { String.class, int[].class };