JUnitMatchers.matches creates any type

phillbaker · Jun 1, 2009 · 3762b9a · 3762b9a
1 parent 68e573b
commit 3762b9a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/build.xml b/build.xml
@@ -5,7 +5,7 @@
 	<property name="src" value="src/main/java" />
 	<property name="target" location="target" />
 	<property name="bin" location="${target}/main" />
-	<property name="version" value="4.7-SNAPSHOT-20090527-0039" />
+	<property name="version" value="4.7-SNAPSHOT-20090529-1159" />
 	<property name="dist" value="junit${version}" />
 	<property name="versionfile" value="${src}/junit/runner/Version.java" />
 	<property name="zipfile"  value="${dist}/${dist}.zip" />

diff --git a/src/main/java/junit/runner/Version.java b/src/main/java/junit/runner/Version.java
@@ -9,7 +9,7 @@ private Version() {
 	}
 
 	public static String id() {
-		return "4.7-SNAPSHOT-20090527-0039";
+		return "4.7-SNAPSHOT-20090529-1159";
 	}
 
 	public static void main(String[] args) {

diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java
@@ -133,7 +133,7 @@ public static <T> Matcher<T> isOneOf(T... objects) {
 	 * </pre>
 	 */
 	@SuppressWarnings("unchecked")
-	public static Matcher<Object> matches(Matcher<?> matcher) {
-		return (Matcher<Object>)matcher;
+	public static <T> Matcher<T> matches(Matcher<?> matcher) {
+		return (Matcher<T>)matcher;
 	}
 }
diff --git a/src/test/java/org/junit/tests/assertion/AssertionTest.java b/src/test/java/org/junit/tests/assertion/AssertionTest.java
@@ -10,7 +10,9 @@
 import static org.junit.Assert.fail;
 import static org.junit.matchers.JUnitMatchers.matches;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Map;
 
 import org.junit.Assert;
 import org.junit.ComparisonFailure;
@@ -466,7 +468,5 @@ public void compareBigDecimalAndInteger() {
 		final BigDecimal bigDecimal = new BigDecimal("1.2");
 		final Integer integer = Integer.valueOf("1");
 		assertEquals(bigDecimal, integer);
-	}
-
-
+	}	
 }