X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=listener%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fxmlrouter%2Flistener%2FCompositeEventListenerTest.java;h=8d2b135fe99e1abc0e456776ed7a5c7a36032f21;hb=HEAD;hp=c268779be8feaa7ba697d9e593423d9930e693c3;hpb=bf43ef9863e3d5827eac1a4ce0fafafaadd92a08;p=xmlrouter

diff --git a/listener/src/test/java/org/wamblee/xmlrouter/listener/CompositeEventListenerTest.java b/listener/src/test/java/org/wamblee/xmlrouter/listener/CompositeEventListenerTest.java
index c268779..8d2b135 100644
--- a/listener/src/test/java/org/wamblee/xmlrouter/listener/CompositeEventListenerTest.java
+++ b/listener/src/test/java/org/wamblee/xmlrouter/listener/CompositeEventListenerTest.java
@@ -21,37 +21,29 @@ import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;
 
-import javax.print.attribute.standard.Destination;
-import javax.xml.transform.dom.DOMSource;
-
 import org.junit.Before;
 import org.junit.Test;
-import org.wamblee.xmlrouter.common.Id;
 import org.wamblee.xmlrouter.config.Transformation;
 
 public class CompositeEventListenerTest {
 
-    private static final String DESTINATION_NAME = "dest";
-    private static final Id<Destination> DESTINATION_ID = new Id<Destination>(
-        12);
-    private static final Id<DOMSource> EVENT_ID = new Id<DOMSource>(1);
-    private static final String DOCTYPE = "doc";
+    private static final String DESTINATION_ID = "destid";
     private CompositeEventListener composite;
 
-    private DOMSource source;
+    private EventInfo source;
 
     @Before
     public void setUp() {
         composite = new CompositeEventListener();
-        source = mock(DOMSource.class);
+        source = mock(EventInfo.class);
     }
 
     @Test
     public void testNoListeners() {
         // verify no exceptions occur.
-        composite.delivered(DOCTYPE, EVENT_ID, mock(DOMSource.class),
-            getTransformations(), DESTINATION_ID, DESTINATION_NAME, true);
-        composite.notDelivered(DOCTYPE, EVENT_ID, mock(DOMSource.class));
+        composite.delivered(mock(EventInfo.class), getTransformations(),
+            DESTINATION_ID, true);
+        composite.notDelivered(mock(EventInfo.class));
     }
 
     @Test
@@ -73,26 +65,23 @@ public class CompositeEventListenerTest {
 
         invokeNotDelivered();
         for (EventListener listener : listeners) {
-            verify(listener).notDelivered(eq(DOCTYPE), eq(EVENT_ID),
-                same(source));
+            verify(listener).notDelivered(same(source));
             verifyNoMoreInteractions(listener);
             reset(listener);
         }
     }
 
     private void invokeDelivered() {
-        composite.delivered(DOCTYPE, EVENT_ID, source, getTransformations(),
-            DESTINATION_ID, DESTINATION_NAME, true);
+        composite.delivered(source, getTransformations(), DESTINATION_ID, true);
     }
 
     private void invokeNotDelivered() {
-        composite.notDelivered(DOCTYPE, EVENT_ID, source);
+        composite.notDelivered(source);
     }
 
     private void checkInvokeDelivered(EventListener listener) {
-        verify(listener).delivered(eq(DOCTYPE), eq(EVENT_ID), same(source),
-            eq(getTransformations()), eq(DESTINATION_ID), eq(DESTINATION_NAME),
-            eq(true));
+        verify(listener).delivered(same(source), eq(getTransformations()),
+            eq(DESTINATION_ID), eq(true));
     }
 
     @Test