commit 8a44b78e66cd448be192627413403fc514bb8399
author Pavlin Radoslavov <pavlin@onlab.us> Thu Aug 07 12:53:27 2014 -0700
committer Gerrit Code Review <gerrit2@localhost> Mon Aug 11 09:22:32 2014 -0700
tree 6088068e8cc16f0b6dce387131ed84bf71bc0d66
parent c62364122da9f6a36169e13b02855cc83728160a

Refactor the storage of the Topology Listeners: move the state
from the TopologyModule to the TopologyManager.

Also:
  - Keep the last ADD MastershipEvent inside field
    TopologyManager.lastAddMastershipEvents
  - Minor editorial changes inside TopologyManager.java

No functional changes.

Change-Id: I99956fdbb1dcd847e3e6ed2ad27f68ff3464b491

src/test/java/net/onrc/onos/core/topology/TopologyManagerTest.java

diff --git a/src/test/java/net/onrc/onos/core/topology/TopologyManagerTest.java b/src/test/java/net/onrc/onos/core/topology/TopologyManagerTest.java
index 9856366..231ba6f 100644
--- a/src/test/java/net/onrc/onos/core/topology/TopologyManagerTest.java
+++ b/src/test/java/net/onrc/onos/core/topology/TopologyManagerTest.java
@@ -60,7 +60,6 @@
     private IDatagridService datagridService;
     private TopologyDatastore dataStoreService;
     private IControllerRegistryService registryService;
-    private CopyOnWriteArrayList<ITopologyListener> topologyListeners;
     private Collection<TopologyEvent> allTopologyEvents;
     private static final OnosInstanceId ONOS_INSTANCE_ID_1 =
         new OnosInstanceId("ONOS-Instance-ID-1");
@@ -170,9 +169,7 @@
      */
     private void setupTopologyManager() {
         // Create a TopologyManager object for testing
-        topologyListeners = new CopyOnWriteArrayList<>();
-        theTopologyManager = new TopologyManager(registryService,
-                                                 topologyListeners);
+        theTopologyManager = new TopologyManager(registryService);
 
         // Replace the eventHandler to prevent the thread from starting
         TestUtils.setField(theTopologyManager, "eventHandler",
@@ -188,10 +185,9 @@
      */
     private void setupTopologyManagerWithEventHandler() {
         // Create a TopologyManager object for testing
-        topologyListeners = new CopyOnWriteArrayList<>();
-        topologyListeners.add(theTopologyListener);
-        theTopologyManager = new TopologyManager(registryService,
-                                                 topologyListeners);
+        theTopologyManager = new TopologyManager(registryService);
+        theTopologyManager.registerTopologyListener(theTopologyListener);
+
         // Allocate the Event Handler, so we can have direct access to it
         theEventHandler = theTopologyManager.new EventHandler();
         TestUtils.setField(theTopologyManager, "eventHandler",