Tidy up generics. Test to prove

sf105 · sf105 · commit c445ec3ab2f6 · 2016-04-07T15:12:55.000+02:00
hamcrest#38
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsAnything.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsAnything.java
@@ -33,9 +33,7 @@ public void describeTo(Description description) {
     /**
      * Creates a matcher that always matches, regardless of the examined object.
      */
-    public static Matcher<Object> anything() {
-        return new IsAnything<Object>();
-    }
+    public static Matcher<Object> anything() { return new IsAnything<>(); }
 
     /**
      * Creates a matcher that always matches, regardless of the examined object, but describes
@@ -45,6 +43,6 @@ public static Matcher<Object> anything() {
      *     a meaningful {@link String} used when describing itself
      */
     public static Matcher<Object> anything(String description) {
-        return new IsAnything<Object>(description);
+        return new IsAnything<>(description);
     }
 }
diff --git a/hamcrest-core/src/test/java/org/hamcrest/core/IsAnythingTest.java b/hamcrest-core/src/test/java/org/hamcrest/core/IsAnythingTest.java
@@ -5,22 +5,31 @@
 
 import static org.hamcrest.AbstractMatcherTest.assertDescription;
 import static org.hamcrest.AbstractMatcherTest.assertMatches;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsAnything.anything;
 
 public final class IsAnythingTest {
 
     private final Matcher<Object> matcher = anything();
 
-    private static class CustomThing { }
-    
-    @Test public void
+    private static class CustomThing {
+    }
+
+    @Test
+    public void
     alwaysEvaluatesToTrue() {
         assertMatches("didn't match null", matcher, null);
         assertMatches("didn't match Object", matcher, new Object());
         assertMatches("didn't match custom object", matcher, new CustomThing());
         assertMatches("didn't match String", matcher, "hi");
     }
 
+    @Test
+    public void compilesWithoutTypeWarnings() {
+        assertThat(new CustomThing(), is(anything()));
+    }
+
     @Test public void
     hasUsefulDefaultDescription() {
         assertDescription("ANYTHING", matcher);
