Unit tests for route store.

Change-Id: Ia711c497bb7d0751d692c2461c884ddc5287a2ef

@@ -20,6 +20,8 @@ import org.onlab.packet.IpAddress;
 import org.onlab.packet.IpPrefix;
 import org.onlab.packet.IpPrefix;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.MacAddress;
 
 
+import java.util.Objects;
+
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.MoreObjects.toStringHelper;
 
 
 /**
 /**
@@ -84,6 +86,28 @@ public class ResolvedRoute {
     }
     }
 
 
     @Override
     @Override
+    public int hashCode() {
+        return Objects.hash(prefix, nextHop, nextHopMac);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+
+        if (!(other instanceof ResolvedRoute)) {
+            return false;
+        }
+
+        ResolvedRoute that = (ResolvedRoute) other;
+
+        return Objects.equals(this.prefix, that.prefix) &&
+                Objects.equals(this.nextHop, that.nextHop) &&
+                Objects.equals(this.nextHopMac, that.nextHopMac);
+    }
+
+    @Override
     public String toString() {
     public String toString() {
         return toStringHelper(this)
         return toStringHelper(this)
                 .add("prefix", prefix)
                 .add("prefix", prefix)

@@ -18,6 +18,8 @@ package org.onosproject.incubator.net.routing;
 
 
 import org.onosproject.event.AbstractEvent;
 import org.onosproject.event.AbstractEvent;
 
 
+import java.util.Objects;
+
 /**
 /**
  * Describes an event about a route.
  * Describes an event about a route.
  */
  */
@@ -65,4 +67,24 @@ public class RouteEvent extends AbstractEvent<RouteEvent.Type, ResolvedRoute> {
         super(type, subject, time);
         super(type, subject, time);
     }
     }
 
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(subject(), type());
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+
+        if (!(other instanceof RouteEvent)) {
+            return false;
+        }
+
+        RouteEvent that = (RouteEvent) other;
+
+        return Objects.equals(this.subject(), that.subject()) &&
+                Objects.equals(this.type(), that.type());
+    }
 }
 }

+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * 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.onosproject.incubator.net.routing.impl;
+
+import org.onosproject.incubator.net.routing.RouteEvent;
+
+/**
+ * Queues updates for a route listener to ensure they are received in the
+ * correct order.
+ */
+interface ListenerQueue {
+
+    /**
+     * Posts an event to the listener.
+     *
+     * @param event event
+     */
+    void post(RouteEvent event);
+
+    /**
+     * Initiates event delivery to the listener.
+     */
+    void start();
+
+    /**
+     * Halts event delivery to the listener.
+     */
+    void stop();
+}

@@ -114,7 +114,7 @@ public class RouteManager implements ListenerService<RouteEvent, RouteListener>,
     public void addListener(RouteListener listener) {
     public void addListener(RouteListener listener) {
         synchronized (this) {
         synchronized (this) {
             log.debug("Synchronizing current routes to new listener");
             log.debug("Synchronizing current routes to new listener");
-            ListenerQueue l = new ListenerQueue(listener);
+            ListenerQueue l = createListenerQueue(listener);
             routeStore.getRouteTables().forEach(table -> {
             routeStore.getRouteTables().forEach(table -> {
                 Collection<Route> routes = routeStore.getRoutes(table);
                 Collection<Route> routes = routeStore.getRoutes(table);
                 if (routes != null) {
                 if (routes != null) {
@@ -234,10 +234,19 @@ public class RouteManager implements ListenerService<RouteEvent, RouteListener>,
     }
     }
 
 
     /**
     /**
-     * Queues updates for a route listener to ensure they are received in the
-     * correct order.
+     * Creates a new listener queue.
+     *
+     * @param listener route listener
+     * @return listener queue
      */
      */
-    private class ListenerQueue {
+    ListenerQueue createListenerQueue(RouteListener listener) {
+        return new DefaultListenerQueue(listener);
+    }
+
+    /**
+     * Default route listener queue.
+     */
+    private class DefaultListenerQueue implements ListenerQueue {
 
 
         private final ExecutorService executorService;
         private final ExecutorService executorService;
         private final BlockingQueue<RouteEvent> queue;
         private final BlockingQueue<RouteEvent> queue;
@@ -248,31 +257,23 @@ public class RouteManager implements ListenerService<RouteEvent, RouteListener>,
          *
          *
          * @param listener route listener to queue updates for
          * @param listener route listener to queue updates for
          */
          */
-        public ListenerQueue(RouteListener listener) {
+        public DefaultListenerQueue(RouteListener listener) {
             this.listener = listener;
             this.listener = listener;
             queue = new LinkedBlockingQueue<>();
             queue = new LinkedBlockingQueue<>();
             executorService = newSingleThreadExecutor(threadFactory);
             executorService = newSingleThreadExecutor(threadFactory);
         }
         }
 
 
-        /**
-         * Posts and event to the listener.
-         *
-         * @param event event
-         */
+        @Override
         public void post(RouteEvent event) {
         public void post(RouteEvent event) {
             queue.add(event);
             queue.add(event);
         }
         }
 
 
-        /**
-         * Initiates event delivery to the listener.
-         */
+        @Override
         public void start() {
         public void start() {
             executorService.execute(this::poll);
             executorService.execute(this::poll);
         }
         }
 
 
-        /**
-         * Halts event delivery to the listener.
-         */
+        @Override
         public void stop() {
         public void stop() {
             executorService.shutdown();
             executorService.shutdown();
         }
         }

@@ -66,7 +66,7 @@ public class LocalRouteStore extends AbstractStore<RouteEvent, RouteStoreDelegat
     private Map<IpAddress, MacAddress> nextHops = new ConcurrentHashMap<>();
     private Map<IpAddress, MacAddress> nextHops = new ConcurrentHashMap<>();
 
 
     @Activate
     @Activate
-    protected void activate() {
+    public void activate() {
         routeTables = new ConcurrentHashMap<>();
         routeTables = new ConcurrentHashMap<>();
 
 
         routeTables.put(IPV4, new RouteTable());
         routeTables.put(IPV4, new RouteTable());