Converting to feature matchers

sf105 · sf105 · commit 609a6b80c1b8 · 2014-12-23T11:32:40.000+01:00
diff --git a/hamcrest-library/src/main/java/org/hamcrest/io/FileMatchers.java b/hamcrest-library/src/main/java/org/hamcrest/io/FileMatchers.java
@@ -1,6 +1,7 @@
 package org.hamcrest.io;
 
 import org.hamcrest.Description;
+import org.hamcrest.FeatureMatcher;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
 
@@ -95,80 +96,33 @@ public static Matcher<File> aFileWithSize(long size) {
         return aFileWithSize(equalTo(size));
     }
 
-    public static Matcher<File> aFileWithSize(final Matcher<Long> size) {
-        return new TypeSafeDiagnosingMatcher<File>() {
-            public boolean matchesSafely(File actual, Description mismatchDescription) {
-                final long length = actual.length();
-                final boolean result = size.matches(length);
-                if (!result) {
-                    mismatchDescription.appendText("was a File whose size ");
-                    size.describeMismatch(length, mismatchDescription);
-                }
-                return result;
-            }
-
-            public void describeTo(Description description) {
-                description.appendText("a File whose size is ").appendDescriptionOf(size);
-            }
+    public static Matcher<File> aFileWithSize(final Matcher<Long> expected) {
+        return new FeatureMatcher<File, Long>(expected, "A file with size", "size") {
+            @Override protected Long featureValueOf(File actual) { return actual.length(); }
         };
     }
 
-    public static Matcher<File> aFileNamed(final Matcher<String> name) {
-        return new TypeSafeDiagnosingMatcher<File>() {
-            public boolean matchesSafely(File actual, Description mismatchDescription) {
-                final String actualName = actual.getName();
-                final boolean result = name.matches(actualName);
-                if (!result) {
-                    mismatchDescription.appendText("was a File whose name ");
-                    name.describeMismatch(actualName, mismatchDescription);
-                }
-                return result;
-            }
-
-            public void describeTo(Description description) {
-                description.appendText("a File whose name is ").appendDescriptionOf(name);
-            }
+    public static Matcher<File> aFileNamed(final Matcher<String> expected) {
+        return new FeatureMatcher<File, String>(expected, "A file with name", "name") {
+            @Override protected String featureValueOf(File actual) { return actual.getName(); }
         };
     }
 
-    public static Matcher<File> aFileWithCanonicalPath(final Matcher<String> path) {
-        return new TypeSafeDiagnosingMatcher<File>() {
-            public boolean matchesSafely(File actual, Description mismatchDescription) {
+    public static Matcher<File> aFileWithCanonicalPath(final Matcher<String> expected) {
+        return new FeatureMatcher<File, String>(expected, "A file with canonical path", "path") {
+            @Override protected String featureValueOf(File actual) {
                 try {
-                    String canonicalPath = actual.getCanonicalPath();
-                    final boolean result = path.matches(canonicalPath);
-                    if (!result) {
-                        mismatchDescription.appendText("was a File whose canonical path ");
-                        path.describeMismatch(canonicalPath, mismatchDescription);
-                    }
-                    return result;
+                    return actual.getCanonicalPath();
                 } catch (IOException e) {
-                    mismatchDescription.appendText("was a File whose canonical path was underivable (exception: ").appendValue(e).appendText(")");
-                    return false;
+                    return "Exception: " + e.getMessage();
                 }
             }
-
-            public void describeTo(Description description) {
-                description.appendText("a File whose canonical path is ").appendDescriptionOf(path);
-            }
         };
     }
 
-    public static Matcher<File> aFileWithAbsolutePath(final Matcher<String> path) {
-        return new TypeSafeDiagnosingMatcher<File>() {
-            public boolean matchesSafely(File actual, Description mismatchDescription) {
-                final String absolute = actual.getAbsolutePath();
-                final boolean result = path.matches(absolute);
-                if (!result) {
-                    mismatchDescription.appendText("was a File whose absolute path ");
-                    path.describeMismatch(absolute, mismatchDescription);
-                }
-                return result;
-            }
-
-            public void describeTo(Description description) {
-                description.appendText("a File whose absolute path is ").appendDescriptionOf(path);
-            }
+    public static Matcher<File> aFileWithAbsolutePath(final Matcher<String> expected) {
+        return new FeatureMatcher<File, String>(expected, "A file with absolute path", "path") {
+            @Override protected String featureValueOf(File actual) { return actual.getAbsolutePath(); }
         };
     }
 }
