Addressed some analysis warnings

npryce · npryce · commit 142c8a95d3bd · 2014-12-22T13:09:17.000Z
diff --git a/hamcrest-core/src/main/java/org/hamcrest/FeatureMatcher.java b/hamcrest-core/src/main/java/org/hamcrest/FeatureMatcher.java
@@ -44,7 +44,7 @@ protected boolean matchesSafely(T actual, Description mismatch) {
       return false;
     }
     return true;
-  };
+  }
       
   @Override
   public final void describeTo(Description description) {
diff --git a/hamcrest-core/src/main/java/org/hamcrest/TypeSafeMatcher.java b/hamcrest-core/src/main/java/org/hamcrest/TypeSafeMatcher.java
@@ -71,7 +71,7 @@ public final boolean matches(Object item) {
     @Override
     final public void describeMismatch(Object item, Description description) {
         if (item == null) {
-            super.describeMismatch(item, description);
+            super.describeMismatch(null, description);
         } else if (! expectedType.isInstance(item)) {
             description.appendText("was a ")
                        .appendText(item.getClass().getName())
diff --git a/hamcrest-core/src/test/java/org/hamcrest/MatcherAssertTest.java b/hamcrest-core/src/test/java/org/hamcrest/MatcherAssertTest.java
@@ -91,9 +91,6 @@ public void describeMismatch(Object item, Description mismatchDescription) {
 
     @Test public void
     canAssertSubtypes() {
-        Integer aSub = new Integer(1);
-        Number aSuper = aSub;
-
-        assertThat(aSub, equalTo(aSuper));
+        assertThat(1, equalTo((Number) 1));
     }
 }
diff --git a/hamcrest-core/src/test/java/org/hamcrest/TypeSafeMatcherTest.java b/hamcrest-core/src/test/java/org/hamcrest/TypeSafeMatcherTest.java
@@ -34,7 +34,7 @@ public void describeTo(Description description) {
     @Test public void
     describesMismatches() {
       assertMismatchDescription("was null", matcher, null);
-      assertMismatchDescription("was a java.lang.Integer (<3>)", (Matcher)matcher, new Integer(3));
+      assertMismatchDescription("was a java.lang.Integer (<3>)", (Matcher)matcher, 3);
       assertMismatchDescription("The mismatch", matcher, "a string");
     }
 }
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/CombinableTest.java b/hamcrest-core/src/test/java/org/hamcrest/core/CombinableTest.java
@@ -63,6 +63,6 @@ public final class CombinableTest {
     @Test public void
     picksUpTypeFromLeftHandSideOfExpression() {
         @SuppressWarnings("unused")
-        Matcher<String> matcher = CombinableMatcher.<String>both(equalTo("yellow")).and(notNullValue(String.class));
+        Matcher<String> matcher = CombinableMatcher.both(equalTo("yellow")).and(notNullValue(String.class));
     }
 }
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/IsEqualTest.java b/hamcrest-core/src/test/java/org/hamcrest/core/IsEqualTest.java
@@ -42,6 +42,7 @@ public final class IsEqualTest {
         assertDoesNotMatch(matcher, new String[] {"a", "b"});
     }
 
+    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
     @Test public void
     honoursIsEqualImplementationEvenWithNullValues() {
         Object alwaysEqual = new Object() {
@@ -57,7 +58,8 @@ public boolean equals(Object obj) {
             }
         };
 
-        final Matcher<Object> matcher = equalTo(null);
+        Matcher<Object> matcher = equalTo(null);
+
         assertMatches(matcher, alwaysEqual);
         assertDoesNotMatch(matcher, neverEqual);
     }
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/IsTest.java b/hamcrest-core/src/test/java/org/hamcrest/core/IsTest.java
@@ -44,7 +44,7 @@ public final class IsTest {
     @Test public void
     providesConvenientShortcutForIsInstanceOf() {
         final Matcher matcher = isA(Integer.class);
-        assertMatches(matcher, Integer.valueOf(1));
+        assertMatches(matcher, 1);
         assertDoesNotMatch(matcher, new Object());
         assertDoesNotMatch(matcher, null);
     }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArray.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArray.java
@@ -44,6 +44,7 @@ public void describeMismatchSafely(T[] actual, Description mismatchDescription)
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public void describeTo(Description description) {
         description.appendList(descriptionStart(), descriptionSeparator(), descriptionEnd(), 
                                Arrays.asList(elementMatchers));
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContaining.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContaining.java
@@ -31,7 +31,7 @@ public boolean matchesSafely(T[] array) {
     @Override
     public void describeMismatchSafely(T[] item, Description mismatchDescription) {
         super.describeMismatch(Arrays.asList(item), mismatchDescription);
-    };
+    }
 
     @Override
     public void describeTo(Description description) {
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
@@ -28,7 +28,7 @@ public boolean matchesSafely(E[] item) {
     @Override
     public void describeMismatchSafely(E[] item, Description mismatchDescription) {
       iterableMatcher.describeMismatch(Arrays.asList(item), mismatchDescription);
-    };
+    }
 
     @Override
     public void describeTo(Description description) {
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsCollectionWithSize.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsCollectionWithSize.java
@@ -2,10 +2,11 @@
 
 import org.hamcrest.FeatureMatcher;
 import org.hamcrest.Matcher;
-import org.hamcrest.core.IsEqual;
 
 import java.util.Collection;
 
+import static org.hamcrest.core.IsEqual.equalTo;
+
 /**
  * Matches if collection size satisfies a nested matcher.
  */
@@ -43,7 +44,7 @@ public static <E> Matcher<Collection<? extends E>> hasSize(Matcher<? super Integ
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public static <E> Matcher<Collection<? extends E>> hasSize(int size) {
-    	return (Matcher)IsCollectionWithSize.hasSize(IsEqual.<Integer>equalTo(size));
+    	return (Matcher)IsCollectionWithSize.hasSize(equalTo(size));
     }
 
 }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapWithSize.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapWithSize.java
@@ -44,7 +44,7 @@ protected Integer featureValueOf(Map<? extends K, ? extends V> actual) {
      */
     public static <K, V> Matcher<Map<? extends K, ? extends V>> aMapWithSize(int size) {
         Matcher<? super Integer> matcher = equalTo(size);
-        return IsMapWithSize.<K, V>aMapWithSize(matcher);
+        return IsMapWithSize.aMapWithSize(matcher);
     }
     
     /**
@@ -55,6 +55,6 @@ protected Integer featureValueOf(Map<? extends K, ? extends V> actual) {
      * 
      */
     public static <K, V> Matcher<Map<? extends K, ? extends V>> anEmptyMap() {
-        return IsMapWithSize.<K, V>aMapWithSize(equalTo(0));
+        return IsMapWithSize.aMapWithSize(equalTo(0));
     }
 }
diff --git a/hamcrest-library/src/test/java/org/hamcrest/beans/HasPropertyWithValueTest.java b/hamcrest-library/src/test/java/org/hamcrest/beans/HasPropertyWithValueTest.java
@@ -23,6 +23,7 @@
  * @author Steve Freeman
  * @since 1.1.0
  */
+@SuppressWarnings("UnusedDeclaration")
 public class HasPropertyWithValueTest extends AbstractMatcherTest {
   private final BeanWithoutInfo shouldMatch = new BeanWithoutInfo("is expected");
   private final BeanWithoutInfo shouldNotMatch = new BeanWithoutInfo("not expected");
diff --git a/hamcrest-library/src/test/java/org/hamcrest/beans/SamePropertyValuesAsTest.java b/hamcrest-library/src/test/java/org/hamcrest/beans/SamePropertyValuesAsTest.java
@@ -7,6 +7,7 @@
 
 import static org.hamcrest.beans.SamePropertyValuesAs.samePropertyValuesAs;
 
+@SuppressWarnings("UnusedDeclaration")
 public class SamePropertyValuesAsTest extends AbstractMatcherTest {
   private static final Value aValue = new Value("expected");
   private static final ExampleBean expectedBean = new ExampleBean("same", 1, aValue);
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsMapContainingKeyTest.java b/hamcrest-library/src/test/java/org/hamcrest/collection/IsMapContainingKeyTest.java
@@ -51,7 +51,7 @@ public void testMatchesMapContainingKeyWithIntegerKeys() throws Exception {
         map.put(1, "A");
         map.put(2, "B");
 
-        assertThat(map, hasKey(Integer.valueOf(1)));
+        assertThat(map, hasKey(1));
     }
 
     public void testMatchesMapContainingKeyWithNumberKeys() throws Exception {
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsMapWithSizeTest.java b/hamcrest-library/src/test/java/org/hamcrest/collection/IsMapWithSizeTest.java
@@ -72,7 +72,7 @@ public void testCompilesWithATypedMap() {
       MatcherAssert.assertThat(arrayList, aMapWithSize(0));
     }
     
-    private static final <K, V> Map<K, V> mapWithKeys(K... keys) {
+    private static <K, V> Map<K, V> mapWithKeys(K... keys) {
         final Map<K, V> result = new HashMap<K, V>();
         for (K key : keys) {
             result.put(key, null);
diff --git a/hamcrest-library/src/test/java/org/hamcrest/comparator/ComparatorMatcherBuilderTest.java b/hamcrest-library/src/test/java/org/hamcrest/comparator/ComparatorMatcherBuilderTest.java
@@ -122,6 +122,7 @@ public CustomInt(int value) {
             this.value = value;
         }
 
+        @Override
         public int compareTo(CustomInt other) {
             return value - other.value;
         }
diff --git a/hamcrest-library/src/test/java/org/hamcrest/io/FileMatchersTest.java b/hamcrest-library/src/test/java/org/hamcrest/io/FileMatchersTest.java
@@ -2,12 +2,12 @@
 
 import org.hamcrest.AbstractMatcherTest;
 import org.hamcrest.Matcher;
-import org.junit.Test;
 
 import java.io.File;
 
 import static org.hamcrest.core.IsEqual.equalTo;
 
+@SuppressWarnings("ResultOfMethodCallIgnored")
 public class FileMatchersTest extends AbstractMatcherTest {
 
     private File directory;
@@ -23,28 +23,24 @@ protected void setUp() throws Exception {
         file.createNewFile();
     }
     
-    @Test
     public void testAnExistingDirectory() {
         assertMatches("matches existing directory", FileMatchers.anExistingDirectory(), directory);
         assertDoesNotMatch("doesn't match existing file", FileMatchers.anExistingDirectory(), file);
         assertDoesNotMatch("doesn't match missing file", FileMatchers.anExistingDirectory(), new File("foo"));
     }
 
-    @Test
     public void testAnExistingFileOrDirectory() {
         assertMatches("matches existing file", FileMatchers.anExistingFileOrDirectory(), file);
         assertMatches("matches existing directory", FileMatchers.anExistingFileOrDirectory(), directory);
         assertDoesNotMatch("doesn't match missing file", FileMatchers.anExistingFileOrDirectory(), new File("foo"));
     }
 
-    @Test
     public void testAnExistingFile() {
         assertMatches("matches existing file", FileMatchers.anExistingFile(), file);
         assertDoesNotMatch("doesn't match existing directory", FileMatchers.anExistingFile(), directory);
         assertDoesNotMatch("doesn't match missing file", FileMatchers.anExistingFile(), new File("foo"));
     }
 
-    @Test
     public void testAReadableFile() {
         file.setReadable(true);
         assertMatches("matches readable file", FileMatchers.aReadableFile(), file);
@@ -53,42 +49,36 @@ public void testAReadableFile() {
         }
     }
 
-    @Test
     public void testAWritableFile() {
         assertMatches("matches writable file", FileMatchers.aWritableFile(), file);
         file.setWritable(false);
         assertDoesNotMatch("doesn't match unwritable file", FileMatchers.aWritableFile(), file);
     }
 
-    @Test
     public void testAFileWithSizeLong() {
         assertMatches("matches file size", FileMatchers.aFileWithSize(0L), file);
         file.setWritable(false);
         assertDoesNotMatch("doesn't match incorrect file size", FileMatchers.aFileWithSize(34L), file);
     }
 
-    @Test
     public void testAFileWithSizeMatcherOfLong() {
         assertMatches("matches file size", FileMatchers.aFileWithSize(equalTo(0L)), file);
         file.setWritable(false);
         assertDoesNotMatch("doesn't match incorrect file size", FileMatchers.aFileWithSize(equalTo(23L)), file);
     }
 
-    @Test
     public void testAFileNamed() {
         assertMatches("matches file name", FileMatchers.aFileNamed(equalTo(file.getName())), file);
         file.setWritable(false);
         assertDoesNotMatch("doesn't match incorrect file name", FileMatchers.aFileNamed(equalTo("foo")), file);
     }
 
-    @Test
     public void testAFileWithCanonicalPath() throws Exception {
         assertMatches("matches file canonical path", FileMatchers.aFileWithCanonicalPath(equalTo(file.getCanonicalPath())), file);
         file.setWritable(false);
         assertDoesNotMatch("doesn't match incorrect canonical path", FileMatchers.aFileWithCanonicalPath(equalTo("foo")), file);
     }
 
-    @Test
     public void testAFileWithAbsolutePath() {
         assertMatches("matches file absolute path", FileMatchers.aFileWithAbsolutePath(equalTo(file.getAbsolutePath())), file);
         file.setWritable(false);

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ protected boolean matchesSafely(T actual, Description mismatch) {`
`44`	`44`	`return false;`
`45`	`45`	`}`
`46`	`46`	`return true;`
`47`		`- };`
	`47`	`+ }`
`48`	`48`
`49`	`49`	`@Override`
`50`	`50`	`public final void describeTo(Description description) {`
Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,6 @@ public void describeMismatch(Object item, Description mismatchDescription) {`
`91`	`91`
`92`	`92`	`@Test public void`
`93`	`93`	`canAssertSubtypes() {`
`94`		`- Integer aSub = new Integer(1);`
`95`		`- Number aSuper = aSub;`
`96`		`-`
`97`		`- assertThat(aSub, equalTo(aSuper));`
	`94`	`+ assertThat(1, equalTo((Number) 1));`
`98`	`95`	`}`
`99`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void describeTo(Description description) {`
`34`	`34`	`@Test public void`
`35`	`35`	`describesMismatches() {`
`36`	`36`	`assertMismatchDescription("was null", matcher, null);`
`37`		`- assertMismatchDescription("was a java.lang.Integer (<3>)", (Matcher)matcher, new Integer(3));`
	`37`	`+ assertMismatchDescription("was a java.lang.Integer (<3>)", (Matcher)matcher, 3);`
`38`	`38`	`assertMismatchDescription("The mismatch", matcher, "a string");`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,6 @@ public final class CombinableTest {`
`63`	`63`	`@Test public void`
`64`	`64`	`picksUpTypeFromLeftHandSideOfExpression() {`
`65`	`65`	`@SuppressWarnings("unused")`
`66`		`- Matcher<String> matcher = CombinableMatcher.<String>both(equalTo("yellow")).and(notNullValue(String.class));`
	`66`	`+ Matcher<String> matcher = CombinableMatcher.both(equalTo("yellow")).and(notNullValue(String.class));`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public final class IsEqualTest {`
`42`	`42`	`assertDoesNotMatch(matcher, new String[] {"a", "b"});`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")`
`45`	`46`	`@Test public void`
`46`	`47`	`honoursIsEqualImplementationEvenWithNullValues() {`
`47`	`48`	`Object alwaysEqual = new Object() {`
`@@ -57,7 +58,8 @@ public boolean equals(Object obj) {`
`57`	`58`	`}`
`58`	`59`	`};`
`59`	`60`
`60`		`- final Matcher<Object> matcher = equalTo(null);`
	`61`	`+ Matcher<Object> matcher = equalTo(null);`
	`62`	`+`
`61`	`63`	`assertMatches(matcher, alwaysEqual);`
`62`	`64`	`assertDoesNotMatch(matcher, neverEqual);`
`63`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public final class IsTest {`
`44`	`44`	`@Test public void`
`45`	`45`	`providesConvenientShortcutForIsInstanceOf() {`
`46`	`46`	`final Matcher matcher = isA(Integer.class);`
`47`		`- assertMatches(matcher, Integer.valueOf(1));`
	`47`	`+ assertMatches(matcher, 1);`
`48`	`48`	`assertDoesNotMatch(matcher, new Object());`
`49`	`49`	`assertDoesNotMatch(matcher, null);`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ public void describeMismatchSafely(T[] actual, Description mismatchDescription)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`
	`47`	`+ @SuppressWarnings("unchecked")`
`47`	`48`	`public void describeTo(Description description) {`
`48`	`49`	`description.appendList(descriptionStart(), descriptionSeparator(), descriptionEnd(),`
`49`	`50`	`Arrays.asList(elementMatchers));`