commit 61b73e9d3db639e49d2c84d1fba0b96dfd9c2ae0
author Hyunsun Moon <hyunsun.moon@gmail.com> Tue May 10 18:05:57 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed May 18 21:33:54 2016 +0000
tree 56957d08eaefb8bc8cd7a39e3942659b3a973031
parent d2c8b157b41cd49941fd56d60d1b54850a6deb90

Added more network config validation checks

Change-Id: I9e810206fc3e744c86f854865dfdd9614a84fdf7

core/api/src/test/java/org/onosproject/net/config/ConfigTest.java

diff --git a/core/api/src/test/java/org/onosproject/net/config/ConfigTest.java b/core/api/src/test/java/org/onosproject/net/config/ConfigTest.java
index 57cc997..84dbca7 100644
--- a/core/api/src/test/java/org/onosproject/net/config/ConfigTest.java
+++ b/core/api/src/test/java/org/onosproject/net/config/ConfigTest.java
@@ -39,6 +39,8 @@
     private static final String DOUBLE = "double";
     private static final String MAC = "mac";
     private static final String IP = "ip";
+    private static final String TP_PORT = "tpPort";
+    private static final String BAD_TP_PORT = "badTpPort";
 
     private final ObjectMapper mapper = new ObjectMapper();
     private final ConfigApplyDelegate delegate = new TestDelegate();
@@ -50,19 +52,27 @@
     public void setUp() {
         json = new ObjectMapper().createObjectNode()
                 .put(TEXT, "foo").put(LONG, 5).put(DOUBLE, 0.5)
-                .put(MAC, "ab:cd:ef:ca:fe:ed").put(IP, "12.34.56.78");
+                .put(MAC, "ab:cd:ef:ca:fe:ed").put(IP, "12.34.56.78")
+                .put(TP_PORT, 65535).put(BAD_TP_PORT, 65536);
         cfg = new TestConfig();
         cfg.init(SUBJECT, KEY, json, mapper, delegate);
     }
 
     @Test
     public void hasOnlyFields() {
-        assertTrue("has unexpected fields", cfg.hasOnlyFields(TEXT, LONG, DOUBLE, MAC, IP));
+        assertTrue("has unexpected fields", cfg.hasOnlyFields(TEXT, LONG, DOUBLE, MAC, IP,
+                                                              TP_PORT, BAD_TP_PORT));
         assertFalse("did not detect unexpected fields", cfg.hasOnlyFields(TEXT, LONG, DOUBLE, MAC));
         assertTrue("is not proper text", cfg.isString(TEXT, MANDATORY));
     }
 
     @Test
+    public void hasFields() {
+        assertTrue("does not have mandatory field", cfg.hasFields(TEXT, LONG, DOUBLE, MAC));
+        assertFalse("did not detect missing field", cfg.hasFields("none"));
+    }
+
+    @Test
     public void isString() {
         assertTrue("is not proper text", cfg.isString(TEXT, MANDATORY));
         assertTrue("is not proper text", cfg.isString(TEXT, MANDATORY, "^f.*"));
@@ -127,6 +137,18 @@
         assertTrue("is not proper ip", cfg.isIpAddress(TEXT, MANDATORY));
     }
 
+    @Test
+    public void isTpPort() {
+        assertTrue("is not proper transport port", cfg.isTpPort(TP_PORT, MANDATORY));
+        assertTrue("is not proper transport port", cfg.isTpPort(TP_PORT, OPTIONAL));
+        assertTrue("is not proper transport port", cfg.isTpPort("none", OPTIONAL));
+        assertFalse("did not detect missing field", cfg.isTpPort("none", MANDATORY));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void badTpPort() {
+        assertTrue("is not proper transport port", cfg.isTpPort(BAD_TP_PORT, MANDATORY));
+    }
 
     // TODO: Add tests for other helper methods