X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fswitchmanager%2Fapi%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fswitchmanager%2FSwitchTest.java;h=64b57eba3cd2f158520bb1fa594eebe168297a6c;hb=51e9be2b3aac6ea33bf21e5a3a978325d24e9e0e;hp=18b3195372ff2f6f42a97c277b6d507be4d4dc33;hpb=7c3362df780f30a47d0f6a7b7695360bbb5513bc;p=controller.git

diff --git a/opendaylight/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SwitchTest.java b/opendaylight/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SwitchTest.java
index 18b3195372..64b57eba3c 100644
--- a/opendaylight/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SwitchTest.java
+++ b/opendaylight/switchmanager/api/src/test/java/org/opendaylight/controller/switchmanager/SwitchTest.java
@@ -11,13 +11,19 @@ package org.opendaylight.controller.switchmanager;
 import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.opendaylight.controller.sal.core.Description;
+import org.opendaylight.controller.sal.core.ForwardingMode;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.NodeConnector;
+import org.opendaylight.controller.sal.core.Property;
+import org.opendaylight.controller.sal.core.Tier;
 import org.opendaylight.controller.sal.utils.NodeConnectorCreator;
 import org.opendaylight.controller.sal.utils.NodeCreator;
 
@@ -80,13 +86,15 @@ public class SwitchTest {
                 .getSpanPorts();
 
         Assert.assertEquals(node, resultNode);
-        for (int i = 0; i < dlAddress.length; i++)
+        for (int i = 0; i < dlAddress.length; i++) {
             Assert.assertEquals(dlAddress[i], resultdlAddress[i]);
+        }
 
         Assert.assertTrue(ncSet.equals(resultncSet));
 
-        for (int i = 0; i < portList.size(); i++)
+        for (int i = 0; i < portList.size(); i++) {
             Assert.assertEquals(portList.get(i), resultSpanPort.get(i));
+        }
     }
 
     @Test
@@ -122,24 +130,21 @@ public class SwitchTest {
 
     @Test
     public void testSwitchConfig(){
-        SwitchConfig sc = new SwitchConfig(null, null, null, null);
-        SwitchConfig sc2 = new SwitchConfig(null, null, null, null);
-        Assert.assertTrue(sc.equals(sc2));
-
-        Assert.assertNull(sc.getMode());
-        Assert.assertNull(sc.getNodeId());
-        Assert.assertNull(sc.getTier());
-        Assert.assertNull(sc.getNodeDescription());
-
-        SwitchConfig sc3 = new SwitchConfig("123", "name", "tier", "mode");
-        SwitchConfig sc4 = new SwitchConfig("123", "name", "tier", "mode");
-        Assert.assertFalse(sc.equals(sc3));
-        Assert.assertTrue(sc3.equals(sc4));
-
-        Assert.assertTrue(sc3.getNodeId().equals("123"));
-        Assert.assertTrue(sc3.getNodeDescription().equals("name"));
-        Assert.assertTrue(sc3.getTier().equals("tier"));
-        Assert.assertTrue(sc3.getMode().equals("mode"));
+        Map<String, Property> prop = new HashMap<String, Property>();
+        Property desc = new Description("swicth1");
+        prop.put(desc.getName(), desc);
+        Property tier = new Tier(1);
+        prop.put(tier.getName(), tier);
+        SwitchConfig sc1 = new SwitchConfig("123", prop);
+        SwitchConfig sc2 = new SwitchConfig("123", prop);
+        Property mode = new ForwardingMode(1);
+        prop.put(mode.getName(), mode);
+        SwitchConfig sc3 = new SwitchConfig("123", prop);
+        Assert.assertTrue(sc1.equals(sc2));
+        Assert.assertEquals(tier, sc1.getProperty(Tier.TierPropName));
+        Assert.assertFalse(sc1.equals(sc3));
+        Assert.assertTrue(sc1.hashCode() == sc2.hashCode());
+        Assert.assertTrue(sc1.getNodeProperties().equals(sc2.getNodeProperties()));
     }
 
 }