Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG 2302 : odl-clustering-test-app should not be part of the odl-restconf-all feature set
[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 13b6e5fcfdeea3d50385106f536f9d5e1dbb3162..bcfa2a9ee9bed058908a4f87ede45868c1e032c4 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,12
+1,12
@@
+/*
+ * 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;
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;
import org.opendaylight.controller.sal.core.ConstructionException;
import org.junit.Test;
import org.opendaylight.controller.sal.core.Bandwidth;
import org.opendaylight.controller.sal.core.ConstructionException;
@@
-18,8
+18,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.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 org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
public class TopologyTest {
public class TopologyTest {
+ protected static final Logger logger = LoggerFactory
+ .getLogger(TopologyTest.class);
@Test
public void edgePropertiesTopologyTest() {
@Test
public void edgePropertiesTopologyTest() {
@@
-43,14
+55,12
@@
public class TopologyTest {
try {
e12 = new Edge(nc12, nc21);
} catch (ConstructionException e) {
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) {
}
try {
e23 = new Edge(nc23, nc32);
} catch (ConstructionException e) {
- e.printStackTrace();
- assertTrue(false);
+ fail("Failed to construct edge " + e.getMessage());
}
Set<Property> props = new HashSet<Property>();
}
Set<Property> props = new HashSet<Property>();
@@
-109,6
+119,6
@@
public class TopologyTest {
assertEquals(2, getEdgePropList.size());
}
assertEquals(2, getEdgePropList.size());
}
-
+
}
}