IsInstanceOf now matches classes of basic types

smgfreeman · smgfreeman · commit b15c66f7d528 · 2009-03-25T16:46:19.000Z
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsInstanceOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsInstanceOf.java
@@ -10,18 +10,33 @@
 
 /**
  * Tests whether the value is an instance of a class.
+ * Classes of basic types will be converted to the relevant "Object" classes
  */
 public class IsInstanceOf extends DiagnosingMatcher<Object> {
-    private final Class<?> theClass;
+    private final Class<?> expectedClass;
+    private final Class<?> matchableClass;
 
     /**
      * Creates a new instance of IsInstanceOf
      *
-     * @param theClass The predicate evaluates to true for instances of this class
+     * @param expectedClass The predicate evaluates to true for instances of this class
      *                 or one of its subclasses.
      */
-    public IsInstanceOf(Class<?> theClass) {
-        this.theClass = theClass;
+    public IsInstanceOf(Class<?> expectedClass) {
+        this.expectedClass = expectedClass;
+        this.matchableClass = matchableClass(expectedClass);
+    }
+
+    private static Class<?> matchableClass(Class<?> expectedClass) {
+      if (boolean.class.equals(expectedClass)) return Boolean.class; 
+      if (byte.class.equals(expectedClass)) return Byte.class; 
+      if (char.class.equals(expectedClass)) return Character.class; 
+      if (double.class.equals(expectedClass)) return Double.class; 
+      if (float.class.equals(expectedClass)) return Float.class; 
+      if (int.class.equals(expectedClass)) return Integer.class; 
+      if (long.class.equals(expectedClass)) return Long.class; 
+      if (short.class.equals(expectedClass)) return Short.class; 
+      return expectedClass;
     }
 
     @Override
@@ -31,7 +46,7 @@ protected boolean matches(Object item, Description mismatchDescription) {
         return false;
       }
       
-      if (!theClass.isInstance(item)) {
+      if (!matchableClass.isInstance(item)) {
         mismatchDescription.appendValue(item).appendText(" is a " + item.getClass().getName());
         return false;
       }
@@ -41,7 +56,7 @@ protected boolean matches(Object item, Description mismatchDescription) {
 
     public void describeTo(Description description) {
         description.appendText("an instance of ")
-                .appendText(theClass.getName());
+                .appendText(expectedClass.getName());
     }
 
     /**
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/core/IsInstanceOfTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/core/IsInstanceOfTest.java
@@ -1,4 +1,4 @@
-/*  Copyright (c) 2000-2006 hamcrest.org
+/*  Copyright (c) 2000-2009 hamcrest.org
  */
 package org.hamcrest.core;
 
@@ -29,12 +29,23 @@ public void testHasAReadableDescription() {
     public void testDecribesActualClassInMismatchMessage() {
       assertMismatchDescription("\"some text\" is a java.lang.String", instanceOf(Number.class), "some text");
     }
+
+    public void testMatchesPrimitiveTypes() {
+      assertThat(true, any(boolean.class));
+      assertThat((byte)1, any(byte.class));
+      assertThat('x', any(char.class));
+      assertThat(5.0, any(double.class));
+      assertThat(5.0f, any(float.class));
+      assertThat(2, any(int.class));
+      assertThat(4L, any(long.class));
+      assertThat((short)1, any(short.class));
+    }
     
     public void testInstanceOfRequiresACastToReturnTheCorrectTypeForUseInJMock() {
       @SuppressWarnings("unused")
       Integer anInteger = (Integer)with(instanceOf(Integer.class));
     }
-
+    
     public void testAnyWillReturnTheCorrectTypeForUseInJMock() {
       @SuppressWarnings("unused")
       Integer anInteger = with(any(Integer.class));
