From: Ed Warnicke <eaw@cisco.com>
Date: Sun, 27 Oct 2013 23:24:13 +0000 (-0500)
Subject: Fixed TopologyIT to use @Inject
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~550
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=28a7715bbb2057cb23ec55aec890b7d930f5b1fe;hp=d23124e814e435b60e98a4b6f49433853a97a40f

Fixed TopologyIT to use @Inject

Change-Id: I88aba402ab1b02fe32dc56aca101b42ae4c2a628
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---

diff --git a/opendaylight/topologymanager/integrationtest/src/test/java/org/opendaylight/controller/topologymanager/TopologyManagerIT.java b/opendaylight/topologymanager/integrationtest/src/test/java/org/opendaylight/controller/topologymanager/TopologyManagerIT.java
index 296be72a13..7c70342b5c 100644
--- a/opendaylight/topologymanager/integrationtest/src/test/java/org/opendaylight/controller/topologymanager/TopologyManagerIT.java
+++ b/opendaylight/topologymanager/integrationtest/src/test/java/org/opendaylight/controller/topologymanager/TopologyManagerIT.java
@@ -39,7 +39,7 @@ public class TopologyManagerIT {
     // get the OSGI bundle context
     @Inject
     private BundleContext bc;
-
+    @Inject
     private ITopologyManager manager = null;
 
     // Configure the OSGi container
@@ -132,38 +132,6 @@ public class TopologyManagerIT {
         }
     }
 
-    @Before
-    public void areWeReady() {
-        assertNotNull(bc);
-        boolean debugit = false;
-        Bundle b[] = bc.getBundles();
-        for (int i = 0; i < b.length; i++) {
-            int state = b[i].getState();
-            if (state != Bundle.ACTIVE && state != Bundle.RESOLVED) {
-                log.debug("Bundle:" + b[i].getSymbolicName() + " state:"
-                        + stateToString(state));
-                debugit = true;
-            }
-        }
-        if (debugit) {
-            log.debug("Do some debugging because some bundle is "
-                    + "unresolved");
-        }
-
-        // Assert if true, if false we are good to go!
-        assertFalse(debugit);
-
-        ServiceReference r = bc.getServiceReference(ITopologyManager.class
-                .getName());
-        if (r != null) {
-            this.manager = (ITopologyManager) bc.getService(r);
-        }
-        // If StatisticsManager is null, cannot run tests.
-        assertNotNull(this.manager);
-
-    }
-
-
     /**
      *  This test verifies that the isInternal method of the TopologyManager returns true when a node is internal and
      *  not otherwise