Renamed isEventFrom() -> eventFrom()

joeretro · joeretro · commit e0e80d57eafa · 2006-12-16T18:27:55.000Z
diff --git a/src/library/org/hamcrest/object/IsEventFrom.java b/src/library/org/hamcrest/object/IsEventFrom.java
@@ -43,7 +43,7 @@ public void describeTo(Description description) {
      * derived from <var>eventClass</var> announced by <var>source</var>.
      */
     @Factory
-    public static Matcher<EventObject> isEventFrom(Class<? extends EventObject> eventClass, Object source) {
+    public static Matcher<EventObject> eventFrom(Class<? extends EventObject> eventClass, Object source) {
         return new IsEventFrom(eventClass, source);
     }
 
@@ -53,7 +53,7 @@ public static Matcher<EventObject> isEventFrom(Class<? extends EventObject> even
      * </var>.
      */
     @Factory
-    public static Matcher<EventObject> isEventFrom(Object source) {
-        return isEventFrom(EventObject.class, source);
+    public static Matcher<EventObject> eventFrom(Object source) {
+        return eventFrom(EventObject.class, source);
     }
 }
diff --git a/src/unit-test/org/hamcrest/object/IsEventFromTest.java b/src/unit-test/org/hamcrest/object/IsEventFromTest.java
@@ -4,7 +4,7 @@
 
 import static org.hamcrest.core.IsNot.not;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.object.IsEventFrom.isEventFrom;
+import static org.hamcrest.object.IsEventFrom.eventFrom;
 import org.hamcrest.AbstractMatcherTest;
 import org.hamcrest.Matcher;
 
@@ -14,15 +14,15 @@
 public class IsEventFromTest extends AbstractMatcherTest {
 
     protected Matcher<?> createMatcher() {
-        return isEventFrom(null);
+        return eventFrom(null);
     }
 
     public void testEvaluatesToTrueIfArgumentIsAnEventObjectFiredByASpecifiedSource() {
         Object o = new Object();
         EventObject ev = new EventObject(o);
         EventObject ev2 = new EventObject(new Object());
 
-        Matcher<EventObject> isEventMatcher = isEventFrom(o);
+        Matcher<EventObject> isEventMatcher = eventFrom(o);
 
         assertThat(ev, isEventMatcher);
         assertThat(ev2, not(isEventMatcher));
@@ -43,7 +43,7 @@ public void testCanTestForSpecificEventClasses() {
         EventObject wrongType = new EventObject(o);
         EventObject wrongSourceAndType = new EventObject(new Object());
 
-        Matcher<EventObject> isEventMatcher = isEventFrom(DerivedEvent.class, o);
+        Matcher<EventObject> isEventMatcher = IsEventFrom.eventFrom(DerivedEvent.class, o);
 
         assertThat(goodEv, isEventMatcher);
         assertThat(wrongSource, not(isEventMatcher));

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public void describeTo(Description description) {`
`43`	`43`	`* derived from <var>eventClass</var> announced by <var>source</var>.`
`44`	`44`	`*/`
`45`	`45`	`@Factory`
`46`		`- public static Matcher<EventObject> isEventFrom(Class<? extends EventObject> eventClass, Object source) {`
	`46`	`+ public static Matcher<EventObject> eventFrom(Class<? extends EventObject> eventClass, Object source) {`
`47`	`47`	`return new IsEventFrom(eventClass, source);`
`48`	`48`	`}`
`49`	`49`
`@@ -53,7 +53,7 @@ public static Matcher<EventObject> isEventFrom(Class<? extends EventObject> even`
`53`	`53`	`* </var>.`
`54`	`54`	`*/`
`55`	`55`	`@Factory`
`56`		`- public static Matcher<EventObject> isEventFrom(Object source) {`
`57`		`- return isEventFrom(EventObject.class, source);`
	`56`	`+ public static Matcher<EventObject> eventFrom(Object source) {`
	`57`	`+ return eventFrom(EventObject.class, source);`
`58`	`58`	`}`
`59`	`59`	`}`