Merge "Prevent ConfigPusher from killing its thread"

[controller.git] / opendaylight / northbound / topology / src / test / java / org / opendaylight / controller / topology / northbound / TopologyTest.java

diff --git a/opendaylight/northbound/topology/src/test/java/org/opendaylight/controller/topology/northbound/TopologyTest.java b/opendaylight/northbound/topology/src/test/java/org/opendaylight/controller/topology/northbound/TopologyTest.java
index 117b911f36f3c00ad67291edc81dc313d7c209dd..298f32877aede02d5e3c796b1edf1fe7cce86a64 100644 (file)
--- a/opendaylight/northbound/topology/src/test/java/org/opendaylight/controller/topology/northbound/TopologyTest.java
+++ b/opendaylight/northbound/topology/src/test/java/org/opendaylight/controller/topology/northbound/TopologyTest.java
@@ -1,11 +1,13 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.controller.topology.northbound;
 
-import static org.junit.Assert.*;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
 import org.junit.Test;
 import org.opendaylight.controller.sal.core.Bandwidth;
@@ -21,6 +23,14 @@ import org.opendaylight.controller.sal.utils.NodeCreator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 public class TopologyTest {
         protected static final Logger logger = LoggerFactory
             .getLogger(TopologyTest.class);