X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnorthbound%2Ftopology%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Ftopology%2Fnorthbound%2FTopologyTest.java;h=def7d46ed1c87f3ef0890dff55e45fae1b65474f;hb=4f623c74a703a31e787387b536981dcb344ca4f9;hp=13b6e5fcfdeea3d50385106f536f9d5e1dbb3162;hpb=244e6a69236780568bc9b793816530a0b76e4cae;p=controller.git 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 13b6e5fcfd..def7d46ed1 100644 --- 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,6 @@ 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; @@ -18,8 +13,20 @@ import org.opendaylight.controller.sal.core.Property; import org.opendaylight.controller.sal.core.State; import org.opendaylight.controller.sal.utils.NodeConnectorCreator; 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); @Test public void edgePropertiesTopologyTest() { @@ -43,14 +50,12 @@ public class TopologyTest { try { e12 = new Edge(nc12, nc21); } catch (ConstructionException e) { - e.printStackTrace(); - assertTrue(false); + fail("Failed to construct edge " + e.getMessage()); } try { e23 = new Edge(nc23, nc32); } catch (ConstructionException e) { - e.printStackTrace(); - assertTrue(false); + fail("Failed to construct edge " + e.getMessage()); } Set props = new HashSet(); @@ -109,6 +114,6 @@ public class TopologyTest { assertEquals(2, getEdgePropList.size()); } - + }