X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Ftest%2FEventTracker.java;h=9e9c472ddfe65d0e87cc0db45365328d71c3a961;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=fce6b23f080ca7694f24a022dac9d70b7790feb3;hpb=32a62ca2c752e33a7873ac868a7a1f289caedcd4;p=utils

diff --git a/support/general/src/test/java/org/wamblee/test/EventTracker.java b/support/general/src/test/java/org/wamblee/test/EventTracker.java
index fce6b23f..9e9c472d 100644
--- a/support/general/src/test/java/org/wamblee/test/EventTracker.java
+++ b/support/general/src/test/java/org/wamblee/test/EventTracker.java
@@ -47,16 +47,20 @@ public class EventTracker<Event> {
     /**
      * Map of Thread object to a list of events.
      */
-    private Map<Thread, List<Event>> _events;
+    private Map<Thread, List<Event>> events;
 
     /**
      * Constructs the event tracker.
      * 
      */
     public EventTracker() {
-        _events = new HashMap<Thread, List<Event>>();
+        clear();
     }
 
+	public void clear() {
+		events = new HashMap<Thread, List<Event>>();
+	}
+
     /**
      * Called by a thread to inform that an event has occurred.
      * 
@@ -66,12 +70,12 @@ public class EventTracker<Event> {
     public synchronized void eventOccurred(Event aEvent) {
         LOG.info("Event '" + aEvent + "' sent.");
         Thread current = Thread.currentThread();
-        List<Event> events = _events.get(current);
-        if (events == null) {
-            events = new ArrayList<Event>();
-            _events.put(current, events);
+        List<Event> eventList = events.get(current);
+        if (eventList == null) {
+            eventList = new ArrayList<Event>();
+            events.put(current, eventList);
         }
-        events.add(aEvent);
+        eventList.add(aEvent);
     }
 
     /**
@@ -84,11 +88,11 @@ public class EventTracker<Event> {
      * @return Whether or not the event was sent.
      */
     public synchronized boolean isEventSent(Thread aThread, Event aEvent) {
-        List<Event> events = _events.get(aThread);
-        if (events == null) {
+        List<Event> eventList = events.get(aThread);
+        if (eventList == null) {
             return false;
         }
-        return events.contains(aEvent);
+        return eventList.contains(aEvent);
     }
 
     /**
@@ -100,11 +104,11 @@ public class EventTracker<Event> {
      *         events were sent.
      */
     public synchronized List<Event> getEvents(Thread aThread) {
-        List<Event> events = _events.get(aThread);
-        if (events == null) {
-            events = Collections.emptyList();
+        List<Event> eventList = events.get(aThread);
+        if (eventList == null) {
+            eventList = Collections.emptyList();
         }
-        return Collections.unmodifiableList(events);
+        return Collections.unmodifiableList(eventList);
     }
 
     /**
@@ -117,9 +121,9 @@ public class EventTracker<Event> {
      */
     public synchronized int getEventCount(Event aEvent) {
         int count = 0;
-        for (Thread thread : _events.keySet()) {
-            List<Event> events = _events.get(thread);
-            for (Event event : events) {
+        for (Thread thread : events.keySet()) {
+            List<Event> eventList = events.get(thread);
+            for (Event event : eventList) {
                 if (event.equals(aEvent)) {
                     count++;
                 }
@@ -127,4 +131,16 @@ public class EventTracker<Event> {
         }
         return count;
     }
+    
+    /**
+     * Gets the total event count over all threads. 
+     * @return
+     */
+    public synchronized int getEventCount() { 
+    	int count = 0; 
+    	for (Thread thread: events.keySet()) { 
+    		count += events.get(thread).size();
+    	}
+    	return count; 
+    }
 }