commit 11b99fc941f5b7417693295bb418814bc6245121
author Thomas Vachuska <tom@onlab.us> Thu Apr 27 12:51:04 2017 -0700
committer Ray Milkey <ray@onlab.us> Thu May 04 15:55:16 2017 +0000
tree 4a8a9dbf588b695d4599605dc4a8c639871b140e
parent e1a7e54ffc555389777e0d2ceecc5d5586f27090

Refining driver subsystem to facilitate coordinated start-up.

- for ONOS-6402

Change-Id: I7f64fc62ad1d451fcf55624b2422b60631a3c8e8

core/net/src/test/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManagerTest.java b/core/net/src/test/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManagerTest.java
index f4a12a9..5e03b7e 100644
--- a/core/net/src/test/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/flowobjective/impl/FlowObjectiveManagerTest.java
@@ -15,9 +15,6 @@
  */
 package org.onosproject.net.flowobjective.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,11 +33,9 @@
 import org.onosproject.net.device.DeviceEvent;
 import org.onosproject.net.device.DeviceListener;
 import org.onosproject.net.device.DeviceServiceAdapter;
-import org.onosproject.net.driver.AbstractDriverLoader;
 import org.onosproject.net.driver.Behaviour;
 import org.onosproject.net.driver.DefaultDriverData;
 import org.onosproject.net.driver.DefaultDriverHandler;
-import org.onosproject.net.driver.DefaultDriverProviderService;
 import org.onosproject.net.driver.Driver;
 import org.onosproject.net.driver.DriverAdapter;
 import org.onosproject.net.driver.DriverData;
@@ -61,6 +56,9 @@
 import org.onosproject.net.flowobjective.ObjectiveEvent;
 import org.onosproject.net.intent.TestTools;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
@@ -125,12 +123,6 @@
 
     }
 
-    private class TestDriversLoader extends AbstractDriverLoader implements DefaultDriverProviderService {
-        public TestDriversLoader() {
-            super("/onos-drivers.xml");
-        }
-    }
-
     private class TestDriver extends DriverAdapter {
 
         @Override
@@ -192,7 +184,6 @@
         manager = new FlowObjectiveManager();
         manager.flowObjectiveStore = new TestFlowObjectiveStore();
         manager.deviceService = new TestDeviceService();
-        manager.defaultDriverService = new TestDriversLoader();
         manager.driverService = new TestDriverService();
         manager.cfgService = new TestComponentConfigService();