X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fxmlrouter%2Fimpl%2FXMLRouterTest.java;h=47eb21a9d7226708946e0f0da4b4cb5a62f33a31;hb=20807d81708bd33b3b5a4616fadcf3ae91bf9508;hp=2d73fad15694e652e9fae870b5edc45458e48b23;hpb=3994d4a35e7404908fc17beac75479c1a72fa915;p=xmlrouter

diff --git a/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterTest.java b/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterTest.java
index 2d73fad..47eb21a 100644
--- a/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterTest.java
+++ b/impl/src/test/java/org/wamblee/xmlrouter/impl/XMLRouterTest.java
@@ -15,7 +15,6 @@
  */
 package org.wamblee.xmlrouter.impl;
 
-import static junit.framework.Assert.*;
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
@@ -27,9 +26,11 @@ import javax.xml.transform.dom.DOMSource;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.wamblee.general.SystemClock;
 import org.wamblee.xmlrouter.common.Id;
 import org.wamblee.xmlrouter.config.DocumentType;
 import org.wamblee.xmlrouter.config.Transformation;
+import org.wamblee.xmlrouter.listener.EventInfo;
 import org.wamblee.xmlrouter.listener.EventListener;
 import org.wamblee.xmlrouter.listener.LoggingEventListener;
 import org.wamblee.xmlrouter.subscribe.Destination;
@@ -76,7 +77,7 @@ public class XMLRouterTest {
     public void setUp() {
         EventListener logListener = new LoggingEventListener(Level.INFO);
         listener = spy(logListener);
-        router = new XMLRouter(listener);
+        router = new XMLRouter(new SystemClock(), listener);
         source1 = mock(DOMSource.class);
         source2 = mock(DOMSource.class);
         source3 = mock(DOMSource.class);
@@ -88,7 +89,8 @@ public class XMLRouterTest {
         destinationSpy = spy(destination);
 
         destinationId = router.registerDestination(destinationSpy);
-        assertFalse(router.publish("any", source1));
+        router.publish("any", source1);
+        verify(listener).notDelivered(any(EventInfo.class));
     }
 
     @Test
@@ -96,16 +98,24 @@ public class XMLRouterTest {
         destinationSpy = registerDestination(true, "any");
         registerDocumentType("any");
 
-        assertTrue(router.publish("any", source1));
+        router.publish("any", source1);
+        verify(listener).delivered(any(EventInfo.class),
+            anyListOf(Transformation.class), anyLong(), anyString(), eq(true));
         verify(destinationSpy).receive(same(source1));
 
         // Unregister the destination.
         router.unregisterDestination(destinationId);
-        reset(destinationSpy);
-        assertFalse(router.publish("any", source2));
+        resetMocks();
+        router.publish("any", source2);
+        verify(listener).notDelivered(any(EventInfo.class));
         verifyNoMoreInteractions(destinationSpy);
     }
 
+    private void resetMocks() {
+        reset(destinationSpy);
+        reset(listener);
+    }
+
     private void registerDocumentType(String aType) {
         DocumentType type = mock(DocumentType.class);
         when(type.isInstance(any(DOMSource.class))).thenReturn(true);
@@ -133,7 +143,8 @@ public class XMLRouterTest {
         destinationSpy = registerDestination(true);
         registerDocumentType("any");
 
-        assertFalse(router.publish("any", source1));
+        router.publish("any", source1);
+        verify(listener).notDelivered(any(EventInfo.class));
         verify(destinationSpy, never()).receive(any(DOMSource.class));
     }
 
@@ -145,7 +156,8 @@ public class XMLRouterTest {
         doThrow(new RuntimeException()).when(destinationSpy).receive(
             any(DOMSource.class));
 
-        assertFalse(router.publish("any", source1));
+        router.publish("any", source1);
+        verify(listener).notDelivered(any(EventInfo.class));
         verify(destinationSpy).receive(same(source1));
     }
 
@@ -157,8 +169,12 @@ public class XMLRouterTest {
         Id<Destination> destinationId2 = router
             .registerDestination(destinationSpy2);
 
-        assertTrue(router.publish("any", source1));
+        router.publish("any", source1);
+        verify(listener).delivered(any(EventInfo.class),
+            anyListOf(Transformation.class), anyLong(), anyString(), eq(true));
+
         verify(destinationSpy2).receive(same(source1));
+
     }
 
     @Test
@@ -169,7 +185,8 @@ public class XMLRouterTest {
         doThrow(new RuntimeException()).when(destinationSpy)
             .chooseFromTargetTypes((Collection<String>) anyObject());
 
-        assertFalse(router.publish("any", source1));
+        router.publish("any", source1);
+        verify(listener).notDelivered(any(EventInfo.class));
         verify(destinationSpy, never()).receive(same(source1));
     }
 
@@ -181,7 +198,10 @@ public class XMLRouterTest {
         Destination destinationSpy2 = spy(destination2);
         Id<Destination> destinationId2 = router
             .registerDestination(destinationSpy2);
-        assertTrue(router.publish("any", source1));
+        router.publish("any", source1);
+        verify(listener).delivered(any(EventInfo.class),
+            anyListOf(Transformation.class), anyLong(), anyString(), eq(true));
+
         verify(destinationSpy, never()).receive(same(source1));
         verify(destinationSpy2).receive(same(source1));
     }
@@ -196,7 +216,8 @@ public class XMLRouterTest {
                 .chooseFromTargetTypes((Collection<String>) anyObject()))
             .thenReturn(null);
 
-        assertFalse(router.publish("any", source1));
+        router.publish("any", source1);
+        verify(listener).notDelivered(any(EventInfo.class));
         verify(destinationSpy, never()).receive(same(source1));
     }
 
@@ -208,7 +229,10 @@ public class XMLRouterTest {
         Destination destinationSpy2 = spy(destination2);
         Id<Destination> destinationId2 = router
             .registerDestination(destinationSpy2);
-        assertTrue(router.publish("any", source1));
+        router.publish("any", source1);
+        verify(listener).delivered(any(EventInfo.class),
+            anyListOf(Transformation.class), anyLong(), anyString(), eq(true));
+
         verify(destinationSpy, never()).receive(same(source1));
         verify(destinationSpy2).receive(same(source1));
     }
@@ -217,6 +241,7 @@ public class XMLRouterTest {
     public void testOneTransformationOneDestination() {
         registerDocumentType("any");
         Transformation transformation = mock(Transformation.class);
+        when(transformation.getName()).thenReturn("trans");
         when(transformation.getFromType()).thenReturn("any");
         when(transformation.getToType()).thenReturn("bla");
         when(transformation.transform(same(source1))).thenReturn(source2);
@@ -230,19 +255,23 @@ public class XMLRouterTest {
         router.registerDestination(destination);
 
         when(destination.receive(any(DOMSource.class))).thenReturn(true);
-        assertTrue(router.publish("bla", source1));
+        router.publish("bla", source1);
+        verify(listener).delivered(any(EventInfo.class),
+            anyListOf(Transformation.class), anyLong(), anyString(), eq(true));
 
         verify(transformation).transform(source1);
         verify(destination).receive(same(source2));
 
         // now the same when the destination rejects the event.
         when(destination.receive(any(DOMSource.class))).thenReturn(false);
-        assertFalse(router.publish("bla", source1));
+        router.publish("bla", source1);
+        verify(listener).notDelivered(any(EventInfo.class));
     }
 
     private Transformation createTransformation(String aFrom, String aTo,
         DOMSource aSource, DOMSource aTarget) {
         Transformation transformation = mock(Transformation.class);
+        when(transformation.getName()).thenReturn("trans");
         when(transformation.getFromType()).thenReturn(aFrom);
         when(transformation.getToType()).thenReturn(aTo);
         when(transformation.transform(same(aSource))).thenReturn(aTarget);
@@ -263,7 +292,8 @@ public class XMLRouterTest {
             .thenReturn(Arrays.asList("bla"));
         router.registerDestination(destination);
 
-        assertFalse(router.publish("bla", source1));
+        router.publish("bla", source1);
+        verify(listener).notDelivered(any(EventInfo.class));
 
         verify(transformation).transform(source1);
         verify(destination, never()).receive(any(DOMSource.class));
@@ -278,12 +308,15 @@ public class XMLRouterTest {
             .thenReturn(Arrays.asList("bla", "bla2"));
 
         reset(transformation);
+        when(transformation.getName()).thenReturn("trans");
         when(transformation.getFromType()).thenReturn("any");
         when(transformation.getToType()).thenReturn("bla");
         when(transformation.transform(same(source1))).thenReturn(null);
 
         when(destination.receive(any(DOMSource.class))).thenReturn(true);
-        assertTrue(router.publish("bla", source1));
+        router.publish("bla", source1);
+        verify(listener).delivered(any(EventInfo.class),
+            anyListOf(Transformation.class), anyLong(), anyString(), eq(true));
 
         verify(transformation).transform(source1);
         verify(transformation2).transform(source1);
@@ -298,7 +331,9 @@ public class XMLRouterTest {
         Destination dest2 = registerDestination(true, "any");
         registerDocumentType("any");
 
-        assertTrue(router.publish("source", source1));
+        router.publish("source", source1);
+        verify(listener, times(2)).delivered(any(EventInfo.class),
+            anyListOf(Transformation.class), anyLong(), anyString(), eq(true));
 
         verify(dest1).receive(same(source1));
         verify(dest2).receive(same(source1));
@@ -313,7 +348,9 @@ public class XMLRouterTest {
             source1, source2);
         router.addTransformation(transformation);
 
-        assertTrue(router.publish("source", source1));
+        router.publish("source", source1);
+        verify(listener, times(2)).delivered(any(EventInfo.class),
+            anyListOf(Transformation.class), anyLong(), anyString(), eq(true));
 
         verify(dest).receive(same(source1));
         verify(dest).receive(same(source2));
@@ -321,7 +358,7 @@ public class XMLRouterTest {
 
     @Test
     public void testMultipleTransformations() {
-        Destination dest = registerDestination(true, "any", "other");
+        Destination dest = registerDestination(true, "other");
         registerDocumentType("any", source1);
         registerDocumentType("other", source3);
 
@@ -332,8 +369,29 @@ public class XMLRouterTest {
             source2, source3);
         router.addTransformation(t2);
 
-        assertTrue(router.publish("source", source1));
+        router.publish("source", source1);
+        verify(listener).delivered(any(EventInfo.class),
+            anyListOf(Transformation.class), anyLong(), anyString(), eq(true));
 
         verify(dest).receive(same(source3));
     }
+
+    @Test
+    public void testDestinationGivesError() {
+        Destination destination = mock(Destination.class);
+        when(destination.getName()).thenReturn("name");
+        when(destination.chooseFromTargetTypes(anyCollectionOf(String.class)))
+            .thenReturn(Arrays.asList("any"));
+        doThrow(new RuntimeException("x")).when(destination).receive(
+            any(DOMSource.class));
+        router.registerDestination(destination);
+
+        registerDocumentType("any");
+
+        router.publish("source", source1);
+
+        verify(listener).delivered(any(EventInfo.class),
+            anyListOf(Transformation.class), anyLong(), anyString(), eq(false));
+
+    }
 }