fix up rss and webhooks mocks

fcrepo · Jun 11, 2013 · c786508 · c786508
1 parent 5f1cb1b
commit c786508
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 27 deletions.
diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/AbstractResource.java b/fcrepo-http-commons/src/main/java/org/fcrepo/AbstractResource.java
@@ -260,4 +260,14 @@ public void setObjectService(final ObjectService objectService) {
     public void setDatastreamService(final DatastreamService datastreamService) {
         this.datastreamService = datastreamService;
     }
+
+
+    /**
+     * Set the Event Bus, used primary for testing without spring
+     * @param eventBus
+     */
+    public void setEventBus(final EventBus eventBus) {
+        this.eventBus = eventBus;
+    }
+
 }
diff --git a/fcrepo-rss/src/test/java/org/fcrepo/syndication/RSSPublisherTest.java b/fcrepo-rss/src/test/java/org/fcrepo/syndication/RSSPublisherTest.java
@@ -26,19 +26,19 @@ public void setUp() {
     @Test
     public void testGetFeed() throws Exception {
         EventBus mockBus = mock(EventBus.class);
-        setField("eventBus", testObj, mockBus);
+        testObj.setEventBus(mockBus);
         UriInfo mockUris = mock(UriInfo.class);
         URI mockUri = new URI("http://localhost.info");
         when(mockUris.getBaseUri()).thenReturn(mockUri);
-        setField("uriInfo", AbstractResource.class,testObj, mockUris);
+        testObj.setUriInfo(mockUris);
         testObj.initialize();
         testObj.getFeed();
     }
 
     @Test
     public void testInitialize() throws Exception {
         EventBus mockBus = mock(EventBus.class);
-        setField("eventBus", testObj, mockBus);
+        testObj.setEventBus(mockBus);
         testObj.initialize();
         verify(mockBus).register(testObj);
     }
@@ -48,16 +48,5 @@ public void testNewEvent() {
         Event mockEvent = mock(Event.class);
         testObj.newEvent(mockEvent);
     }
-
-    private static void setField(String name, Class<?> type, RSSPublisher obj, Object val)
-    throws Exception {
-        Field field = type.getDeclaredField(name);
-        field.setAccessible(true);
-        field.set(obj, val);
-    }
 
-    private static void setField(String name, RSSPublisher obj, Object val)
-    throws Exception {
-        setField(name, RSSPublisher.class, obj, val);
-    }
 }
diff --git a/fcrepo-webhooks/src/test/java/org/fcrepo/webhooks/FedoraWebhooksTest.java b/fcrepo-webhooks/src/test/java/org/fcrepo/webhooks/FedoraWebhooksTest.java
@@ -51,13 +51,13 @@ public void setUp() throws Exception {
         when(mockSessions.getSession()).thenReturn(mockSession);
         when(mockSessions.getSession(any(SecurityContext.class), any(HttpServletRequest.class)))
         .thenReturn(mockSession);
-        setField("sessions", AbstractResource.class, testObj, mockSessions);
+        testObj.setSessionFactory(mockSessions);
     }
 
     @Test
     public void testInitialize() throws Exception {
         EventBus mockBus = mock(EventBus.class);
-        setField("eventBus", testObj, mockBus);
+        testObj.setEventBus(mockBus);
         testObj.initialize();
         verify(mockBus).register(testObj);
     }
@@ -116,15 +116,4 @@ public void testSessions() {
         verify(mockSession).logout();
     }
 
-    private static void setField(String name, Class<?> type, FedoraWebhooks obj, Object val)
-    throws Exception {
-        Field field = type.getDeclaredField(name);
-        field.setAccessible(true);
-        field.set(obj, val);
-    }
-
-    private static void setField(String name, FedoraWebhooks obj, Object val)
-    throws Exception {
-        setField(name, FedoraWebhooks.class, obj, val);
-    }
 }