Started function matcher

sf105 · sf105 · commit 635a41230635 · 2014-12-26T10:57:57.000+01:00
diff --git a/hamcrest-core/src/main/java/org/hamcrest/FunctionMatcher.java b/hamcrest-core/src/main/java/org/hamcrest/FunctionMatcher.java
@@ -0,0 +1,60 @@
+package org.hamcrest;
+
+import org.hamcrest.internal.ReflectiveTypeFinder;
+
+/**
+ * Supporting class for matching a feature of an object. Uses a given function to extract
+ * the feature to be matched against.
+ * In preparation for Java 8.
+ *
+ * @param <T> The type of the object to be matched
+ * @param <U> The type of the feature to be matched
+ */
+public class FunctionMatcher<T, U> extends TypeSafeDiagnosingMatcher<T> {
+  public static interface Feature<T, U> {
+    U from(T actual);
+  }
+
+
+  private static final ReflectiveTypeFinder TYPE_FINDER = new ReflectiveTypeFinder("featureValueOf", 1, 0);
+  private final Matcher<? super U> subMatcher;
+  private final String featureDescription;
+  private final String featureName;
+  private final Feature<T, U> feature;
+
+  /**
+   * Constructor
+   * @param featureDescription Descriptive text to use in describeTo
+   * @param featureName Identifying text for mismatch message
+   * @param subMatcher The matcher to apply to the feature
+   * @param feature A function to extra the value to be matched against.
+   */
+  public FunctionMatcher(String featureDescription, String featureName,
+      Matcher<? super U> subMatcher,
+      Feature<T, U> feature) {
+    super(TYPE_FINDER);
+    this.subMatcher = subMatcher;
+    this.featureDescription = featureDescription;
+    this.featureName = featureName;
+    this.feature = feature;
+  }
+  
+
+  @Override
+  protected boolean matchesSafely(T actual, Description mismatch) {
+    final U featureValue = feature.from(actual);
+    if (subMatcher.matches(featureValue)) {
+      return true;
+    }
+
+    mismatch.appendText(featureName).appendText(" ");
+    subMatcher.describeMismatch(featureValue, mismatch);
+    return false;
+  }
+      
+  @Override
+  public final void describeTo(Description description) {
+    description.appendText(featureDescription).appendText(" ")
+               .appendDescriptionOf(subMatcher);
+  }
+}
diff --git a/hamcrest-library/src/main/java/org/hamcrest/Matchers.java b/hamcrest-library/src/main/java/org/hamcrest/Matchers.java
@@ -577,7 +577,7 @@ public static <E> org.hamcrest.Matcher<E[]> arrayContaining(java.util.List<org.h
      */
     @SafeVarargs
     public static <E> org.hamcrest.Matcher<E[]> arrayContainingInAnyOrder(org.hamcrest.Matcher<? super E>... itemMatchers) {
-        return org.hamcrest.collection.IsArrayContainingInAnyOrder.arrayContainingInAnyOrder(itemMatchers);
+        return MatchArrays.arrayContainingInAnyOrder(itemMatchers);
     }
 
     /**
@@ -600,7 +600,7 @@ public static <E> org.hamcrest.Matcher<E[]> arrayContainingInAnyOrder(org.hamcre
      * @param itemMatchers a list of matchers, each of which must be satisfied by an item provided by an examined array
      */
     public static <E> org.hamcrest.Matcher<E[]> arrayContainingInAnyOrder(java.util.Collection<org.hamcrest.Matcher<? super E>> itemMatchers) {
-        return org.hamcrest.collection.IsArrayContainingInAnyOrder.arrayContainingInAnyOrder(itemMatchers);
+        return MatchArrays.arrayContainingInAnyOrder(itemMatchers);
     }
 
     /**
@@ -622,7 +622,7 @@ public static <E> org.hamcrest.Matcher<E[]> arrayContainingInAnyOrder(java.util.
      */
     @SafeVarargs
     public static <E> org.hamcrest.Matcher<E[]> arrayContainingInAnyOrder(E... items) {
-        return org.hamcrest.collection.IsArrayContainingInAnyOrder.arrayContainingInAnyOrder(items);
+        return MatchArrays.arrayContainingInAnyOrder(items);
     }
 
     /**
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/MatchArrays.java b/hamcrest-library/src/main/java/org/hamcrest/collection/MatchArrays.java
@@ -1,6 +1,7 @@
 package org.hamcrest.collection;
 
-import org.hamcrest.FeatureMatcher;
+import org.hamcrest.FunctionMatcher;
+import org.hamcrest.FunctionMatcher.Feature;
 import org.hamcrest.Matcher;
 
 import java.util.Collection;
@@ -168,9 +169,12 @@ public static <E> Matcher<E[]> arrayContainingInAnyOrder(E... items) {
      * @param sizeMatcher a matcher for the length of an examined array
      */
     public static <E> Matcher<E[]> arrayWithSize(Matcher<? super Integer> sizeMatcher) {
-        return new FeatureMatcher<E[], Integer> (sizeMatcher, "an array with size","array size") {
-            @Override protected Integer featureValueOf(E[] actual) { return actual.length; }
-        };
+        return new FunctionMatcher<>(
+            "an array with size", "array size",
+            sizeMatcher,
+            new Feature<E[], Integer>() {
+                @Override public Integer from(E[] actual) { return actual.length; }
+            });
     }
 
     /**
