Topo2: Add grid (x,y) option to null-provider devices and hosts (and basic element config).

Change-Id: Ia9eed66bda03174a6986d07fec40eb2a8f7728e3
diff --git a/core/api/src/test/java/org/onosproject/net/config/basics/BasicElementConfigTest.java b/core/api/src/test/java/org/onosproject/net/config/basics/BasicElementConfigTest.java
index 8c750ff..f81f462 100644
--- a/core/api/src/test/java/org/onosproject/net/config/basics/BasicElementConfigTest.java
+++ b/core/api/src/test/java/org/onosproject/net/config/basics/BasicElementConfigTest.java
@@ -33,6 +33,8 @@
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
     private static final String E1 = "e1";
+    private static final String GEO = "geo";
+    private static final String GRID = "grid";
 
     // concrete subclass of abstract class we are testing
     private static class ElmCfg extends BasicElementConfig<String> {
@@ -104,4 +106,46 @@
         print(cfg);
         assertEquals("not other type", "someOtherType", cfg.uiType());
     }
+
+    @Test
+    public void defaultGridCoords() {
+        print(cfg);
+        assertEquals("gridx", 0.0, cfg.gridX(), ZERO_THRESHOLD);
+        assertEquals("gridy", 0.0, cfg.gridY(), ZERO_THRESHOLD);
+    }
+
+    @Test
+    public void someGridCoords() {
+        cfg.gridX(35.0).gridY(49.7);
+        print(cfg);
+        assertEquals("gridx", 35.0, cfg.gridX(), ZERO_THRESHOLD);
+        assertEquals("gridy", 49.7, cfg.gridY(), ZERO_THRESHOLD);
+    }
+
+    @Test
+    public void defaultLocationType() {
+        print(cfg);
+        assertEquals("not geo", GEO, cfg.locType());
+    }
+
+    @Test
+    public void geoLocationType() {
+        cfg.locType(GEO);
+        print(cfg);
+        assertEquals("not geo", GEO, cfg.locType());
+    }
+
+    @Test
+    public void gridLocationType() {
+        cfg.locType(GRID);
+        print(cfg);
+        assertEquals("not grid", GRID, cfg.locType());
+    }
+
+    @Test
+    public void otherLocationType() {
+        cfg.locType("foobar");
+        print(cfg);
+        assertEquals("not geo", GEO, cfg.locType());
+    }
 }