Removing code duplications

Author: airborn

ejb/timer/src/test/java/org/javaee7/ejb/timer/AutomaticTimerBeanTest.java

@@ -17,6 +17,7 @@
 import static com.jayway.awaitility.Awaitility.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
+import static org.javaee7.ejb.timer.WithinWindowMatcher.withinWindow;
 
 /**
  * author: Jakub Marchwicki
@@ -38,7 +39,7 @@ public static WebArchive deploy() {
 
         return ShrinkWrap.create(WebArchive.class)
             .addAsLibraries(jars)
-            .addClasses(Ping.class, PingsListener.class, AutomaticTimerBean.class);
+            .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, AutomaticTimerBean.class);
     }
 
     @Test
@@ -52,20 +53,4 @@ public void should_receive_two_pings() {
         System.out.println("Actual timeout = " + delay);
         assertThat(delay, is(withinWindow(TIMEOUT, TOLERANCE)));
     }
-
-    private Matcher<Long> withinWindow(final long timeout, final long tolerance) {
-        return new BaseMatcher<Long>() {
-            @Override
-            public boolean matches(Object item) {
-                final Long actual = (Long) item;
-                return Math.abs(actual - timeout) < tolerance;
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-        };
-    }
-
 }

ejb/timer/src/test/java/org/javaee7/ejb/timer/MultipleScheduleTimerBeanTest.java

@@ -19,6 +19,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
+import static org.javaee7.ejb.timer.WithinWindowMatcher.withinWindow;
 
 /**
  * author: Jacek Jackowiak
@@ -40,7 +41,7 @@ public static WebArchive deploy() {
 
         return ShrinkWrap.create(WebArchive.class)
             .addAsLibraries(jars)
-            .addClasses(Ping.class, PingsListener.class, MultipleScheduleTimerBean.class);
+            .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, MultipleScheduleTimerBean.class);
     }
 
     @Test
@@ -58,20 +59,4 @@ public void should_receive_three_pings() {
         long smallerDelay = Math.min(delay, delay2);
         assertThat(smallerDelay, is(withinWindow(TIMEOUT, TOLERANCE)));
     }
-
-    private Matcher<Long> withinWindow(final long timeout, final long tolerance) {
-        return new BaseMatcher<Long>() {
-            @Override
-            public boolean matches(Object item) {
-                final Long actual = (Long) item;
-                return Math.abs(actual - timeout) < tolerance;
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-        };
-    }
-
 }

ejb/timer/src/test/java/org/javaee7/ejb/timer/ProgrammaticTimerBeanTest.java

@@ -19,6 +19,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
+import static org.javaee7.ejb.timer.WithinWindowMatcher.withinWindow;
 
 /**
  * author: Jacek Jackowiak
@@ -40,7 +41,7 @@ public static WebArchive deploy() {
 
         return ShrinkWrap.create(WebArchive.class)
                 .addAsLibraries(jars)
-                .addClasses(Ping.class, PingsListener.class, ProgrammaticTimerBean.class);
+                .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, ProgrammaticTimerBean.class);
     }
 
     @Test
@@ -54,20 +55,4 @@ public void should_receive_two_pings() {
         System.out.println("Actual timeout = " + delay);
         assertThat(delay, is(withinWindow(TIMEOUT, TOLERANCE)));
     }
-
-    private Matcher<Long> withinWindow(final long timeout, final long tolerance) {
-        return new BaseMatcher<Long>() {
-            @Override
-            public boolean matches(Object item) {
-                final Long actual = (Long) item;
-                return Math.abs(actual - timeout) < tolerance;
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-        };
-    }
-
 }

ejb/timer/src/test/java/org/javaee7/ejb/timer/SchedulesTimerBeanTest.java

@@ -1,7 +1,5 @@
 package org.javaee7.ejb.timer;
 
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -19,6 +17,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
+import static org.javaee7.ejb.timer.WithinWindowMatcher.withinWindow;
 
 /**
  * author: Jacek Jackowiak
@@ -40,7 +39,7 @@ public static WebArchive deploy() {
 
         return ShrinkWrap.create(WebArchive.class)
             .addAsLibraries(jars)
-            .addClasses(Ping.class, PingsListener.class, SchedulesTimerBean.class);
+            .addClasses(WithinWindowMatcher.class, Ping.class, PingsListener.class, SchedulesTimerBean.class);
     }
 
     @Test
@@ -58,20 +57,4 @@ public void should_receive_three_pings() {
         long smallerDelay = Math.min(delay, delay2);
         assertThat(smallerDelay, is(withinWindow(TIMEOUT, TOLERANCE)));
     }
-
-    private Matcher<Long> withinWindow(final long timeout, final long tolerance) {
-        return new BaseMatcher<Long>() {
-            @Override
-            public boolean matches(Object item) {
-                final Long actual = (Long) item;
-                return Math.abs(actual - timeout) < tolerance;
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                //To change body of implemented methods use File | Settings | File Templates.
-            }
-        };
-    }
-
 }

ejb/timer/src/test/java/org/javaee7/ejb/timer/WithinWindowMatcher.java

@@ -0,0 +1,30 @@
+package org.javaee7.ejb.timer;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+
+class WithinWindowMatcher extends BaseMatcher<Long> {
+    private final long timeout;
+    private final long tolerance;
+
+    public WithinWindowMatcher(long timeout, long tolerance) {
+        this.timeout = timeout;
+        this.tolerance = tolerance;
+    }
+
+    @Override
+    public boolean matches(Object item) {
+        final Long actual = (Long) item;
+        return Math.abs(actual - timeout) < tolerance;
+    }
+
+    @Override
+    public void describeTo(Description description) {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public static Matcher<Long> withinWindow(final long timeout, final long tolerance) {
+        return new WithinWindowMatcher(timeout, tolerance);
+    }
+}