Made tests for container events a bit tighter

forge · Aug 17, 2013 · e45f2c2 · e45f2c2
1 parent afa6b3a
commit e45f2c2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/...iner-tests/src/test/java/test/org/jboss/forge/furnace/lifecycle/PostStartupEventTest.java b/...iner-tests/src/test/java/test/org/jboss/forge/furnace/lifecycle/PostStartupEventTest.java
@@ -66,10 +66,10 @@ public void testPostStartupIsCalled() throws Exception
       AddonRegistry registry = furnace.getAddonRegistry();
       Addon dep2 = registry.getAddon(AddonId.from("dep2", "2"));
       RecordingEventManager manager = dep2.getServiceRegistry().getExportedInstance(RecordingEventManager.class).get();
-      Assert.assertEquals(2, manager.getEvents().size());
+      Assert.assertEquals(2, manager.getPostStartupCount());
       MutableAddonRepository repository = (MutableAddonRepository) furnace.getRepositories().get(0);
       repository.disable(dep2.getId());
       Addons.waitUntilStopped(dep2);
-      Assert.assertEquals(3, manager.getEvents().size());
+      Assert.assertEquals(1, manager.getPreShutdownCount());
    }
 }
diff --git a/...ner-tests/src/test/java/test/org/jboss/forge/furnace/lifecycle/RecordingEventManager.java b/...ner-tests/src/test/java/test/org/jboss/forge/furnace/lifecycle/RecordingEventManager.java
@@ -12,6 +12,8 @@
 
 import org.jboss.forge.furnace.event.EventException;
 import org.jboss.forge.furnace.event.EventManager;
+import org.jboss.forge.furnace.event.PostStartup;
+import org.jboss.forge.furnace.event.PreShutdown;
 import org.jboss.forge.furnace.services.Exported;
 
 /**
@@ -23,10 +25,17 @@ public class RecordingEventManager implements EventManager
 {
    private static List<Object> events = new ArrayList<Object>();
    private static List<Annotation[]> qualifiers = new ArrayList<Annotation[]>();
+   private static int postStartupCount;
+   private static int preShutdownCount;
 
    @Override
    public void fireEvent(Object event, Annotation... qualifiers) throws EventException
    {
+      if (event instanceof PostStartup)
+         postStartupCount++;
+      if (event instanceof PreShutdown)
+         preShutdownCount++;
+
       RecordingEventManager.events.add(event);
       RecordingEventManager.qualifiers.add(qualifiers);
    }
@@ -41,6 +50,16 @@ public List<Annotation[]> getQualifiers()
       return RecordingEventManager.qualifiers;
    }
 
+   public int getPostStartupCount()
+   {
+      return postStartupCount;
+   }
+
+   public int getPreShutdownCount()
+   {
+      return preShutdownCount;
+   }
+
    @Override
    public String toString()
    {