Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix star import and enable checkstyle rule to prevent it.
[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 1e5ea0f2c576ac1b0e6b34e605f10b3f8841a9ad..def7d46ed1c87f3ef0890dff55e45fae1b65474f 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,6
@@
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.junit.Test;
import org.opendaylight.controller.sal.core.Bandwidth;
@@
-21,6
+16,14
@@
import org.opendaylight.controller.sal.utils.NodeCreator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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);
public class TopologyTest {
protected static final Logger logger = LoggerFactory
.getLogger(TopologyTest.class);
@@
-47,14
+50,12
@@
public class TopologyTest {
try {
e12 = new Edge(nc12, nc21);
} catch (ConstructionException e) {
try {
e12 = new Edge(nc12, nc21);
} catch (ConstructionException e) {
- logger.error("",e);
- 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) {
- logger.error("",e);
- assertTrue(false);
+ fail("Failed to construct edge " + e.getMessage());
}
Set<Property> props = new HashSet<Property>();
}
Set<Property> props = new HashSet<Property>();