X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Ftest%2FEventTracker.java;h=c2b18f6d0c4ded723a6f0a7ee0622edf1fc748d1;hb=e72743b6a9fac5a99b842f92b1687fba65ef3210;hp=94d2f19fa60efadd2889200208a7ab86a5f75d7b;hpb=ddd261f331280640c5b53c7128230b629ebcd268;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 94d2f19f..c2b18f6d 100644
--- a/support/general/src/test/java/org/wamblee/test/EventTracker.java
+++ b/support/general/src/test/java/org/wamblee/test/EventTracker.java
@@ -1,48 +1,45 @@
 /*
- * Copyright 2006 the original author or authors.
- *
+ * Copyright 2005-2010 the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
+ */ 
 package org.wamblee.test;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import java.util.logging.Logger;
 
 /**
  * Tracks the occurence of certain events in a test environment. Threads in a
  * test environment tell the event tracker of the occurrence of certain events
  * using {@link #eventOccurred(Event)}. Test code inspects the events sent by a
  * thread using {@link #isEventSent(Thread, Event)}.
- *
+ * 
  * A record is kept of every event which is sent. Therefore, the occurrence of a
  * new event does not erase a previously sent event.
- *
+ * 
  * @param <Event>
  *            Type of event sent from test code. Usually String will be
  *            sufficient. The event type must provide a sensible implementation
  *            of {@link java.lang.Object#equals(java.lang.Object)}.
- *
+ * 
  * @author Erik Brakkee
  */
 public class EventTracker<Event> {
-    private static final Log LOG = LogFactory.getLog(EventTracker.class);
+    private static final Logger LOG = Logger.getLogger(EventTracker.class.getName());
 
     /**
      * Map of Thread object to a list of events.
@@ -51,19 +48,19 @@ public class EventTracker<Event> {
 
     /**
      * Constructs the event tracker.
-     *
+     * 
      */
     public EventTracker() {
         clear();
     }
 
-    public void clear() {
+    public synchronized void clear() {
         events = new HashMap<Thread, List<Event>>();
     }
 
     /**
      * Called by a thread to inform that an event has occurred.
-     *
+     * 
      * @param aEvent
      *            Event that was sent.
      */
@@ -83,7 +80,7 @@ public class EventTracker<Event> {
 
     /**
      * Checks if a specific event has happened in a specific thread.
-     *
+     * 
      * @param aThread
      *            Thread to check.
      * @param aEvent
@@ -102,7 +99,7 @@ public class EventTracker<Event> {
 
     /**
      * Gets the events for a thread in the order they were sent
-     *
+     * 
      * @param aThread
      *            Thread to get events for.
      * @return Events that were sent. A zero-sized array is returned if no
@@ -119,9 +116,8 @@ public class EventTracker<Event> {
     }
 
     /**
-     * Gets the number of times an event was sent summed up
-     * over all threads.
-     *
+     * Gets the number of times an event was sent summed up over all threads.
+     * 
      * @param aEvent
      *            Event to check.
      * @return Number of times it was reached.
@@ -144,6 +140,7 @@ public class EventTracker<Event> {
 
     /**
      * Gets the total event count over all threads.
+     * 
      * @return
      */
     public synchronized int getEventCount() {