X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnorthbound%2Fswitchmanager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fswitchmanager%2Fnorthbound%2FSwitchManagerNorthboundTest.java;h=a8b18d5637b5fb8394de825706e168b9cf06c230;hp=5386d4142fd55f0d3c7c79a5254aaa4faa70710b;hb=refs%2Fchanges%2F49%2F449%2F1;hpb=541d0a36997f292bb037a2199463431eee538358 diff --git a/opendaylight/northbound/switchmanager/src/test/java/org/opendaylight/controller/switchmanager/northbound/SwitchManagerNorthboundTest.java b/opendaylight/northbound/switchmanager/src/test/java/org/opendaylight/controller/switchmanager/northbound/SwitchManagerNorthboundTest.java index 5386d4142f..a8b18d5637 100644 --- a/opendaylight/northbound/switchmanager/src/test/java/org/opendaylight/controller/switchmanager/northbound/SwitchManagerNorthboundTest.java +++ b/opendaylight/northbound/switchmanager/src/test/java/org/opendaylight/controller/switchmanager/northbound/SwitchManagerNorthboundTest.java @@ -18,58 +18,58 @@ import org.opendaylight.controller.sal.utils.NodeCreator; public class SwitchManagerNorthboundTest extends TestCase { - @Test - public void testNodes() { - List nodeProperties = new ArrayList(); - Nodes nodes = new Nodes(nodeProperties); - Assert.assertTrue(nodes.getNodeProperties().equals(nodeProperties)); - nodes.setNodeProperties(null); - Assert.assertTrue(nodes.getNodeProperties() == null); - } + @Test + public void testNodes() { + List nodeProperties = new ArrayList(); + Nodes nodes = new Nodes(nodeProperties); + Assert.assertTrue(nodes.getNodeProperties().equals(nodeProperties)); + nodes.setNodeProperties(null); + Assert.assertTrue(nodes.getNodeProperties() == null); + } + + @Test + public void testNodeProperties() { + Node node = NodeCreator.createOFNode(1L); + NodeProperties np= new NodeProperties(node, null); + Assert.assertTrue(np.getNode().equals(node)); + Assert.assertTrue(np.getProperties() == null); + + Node node2 = NodeCreator.createOFNode(2L); + np.setNode(node2); + Assert.assertTrue(np.getNode().equals(node2)); - @Test - public void testNodeProperties() { - Node node = NodeCreator.createOFNode(1L); - NodeProperties np= new NodeProperties(node, null); - Assert.assertTrue(np.getNode().equals(node)); - Assert.assertTrue(np.getProperties() == null); + Set props = new HashSet(); + np.setProperties(props); + Assert.assertTrue(np.getProperties().equals(props)); + } - Node node2 = NodeCreator.createOFNode(2L); - np.setNode(node2); - Assert.assertTrue(np.getNode().equals(node2)); - - Set props = new HashSet(); - np.setProperties(props); - Assert.assertTrue(np.getProperties().equals(props)); - } - - @Test - public void testNodeConnectors() { - List nodeConnectorProperties = new ArrayList(); - NodeConnectors ncs = new NodeConnectors(nodeConnectorProperties); - Assert.assertTrue(ncs.getNodeConnectorProperties().equals(nodeConnectorProperties)); - ncs.setNodeConnectorProperties(null); - Assert.assertTrue(ncs.getNodeConnectorProperties() == null); - } - - @Test - public void testNodeConnectorProperties() { - Node node = NodeCreator.createOFNode(1L); + @Test + public void testNodeConnectors() { + List nodeConnectorProperties = new ArrayList(); + NodeConnectors ncs = new NodeConnectors(nodeConnectorProperties); + Assert.assertTrue(ncs.getNodeConnectorProperties().equals(nodeConnectorProperties)); + ncs.setNodeConnectorProperties(null); + Assert.assertTrue(ncs.getNodeConnectorProperties() == null); + } + + @Test + public void testNodeConnectorProperties() { + Node node = NodeCreator.createOFNode(1L); NodeConnector port = NodeConnectorCreator.createOFNodeConnector( (short) 24, node); - + NodeConnectorProperties ncp= new NodeConnectorProperties(port, null); - Assert.assertTrue(ncp.getProperties() == null); - Assert.assertTrue(ncp.getNodeConnector().equals(port)); - + Assert.assertTrue(ncp.getProperties() == null); + Assert.assertTrue(ncp.getNodeConnector().equals(port)); + NodeConnector port2 = NodeConnectorCreator.createOFNodeConnector( (short) 33, node); - ncp.setNodeConnector(port2); - Assert.assertTrue(ncp.getNodeConnector().equals(port2)); - - Set props = new HashSet(); - ncp.setProperties(props); - Assert.assertTrue(ncp.getProperties().equals(props)); - } + ncp.setNodeConnector(port2); + Assert.assertTrue(ncp.getNodeConnector().equals(port2)); + Set props = new HashSet(); + ncp.setProperties(props); + Assert.assertTrue(ncp.getProperties().equals(props)); + } + }