v0.2.47..v0.2.48 changeset MapResourceTest.java - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-services/src/test/java/hoot/services/controllers/osm/map/MapResourceTest.java b/hoot-services/src/test/java/hoot/services/controllers/osm/map/MapResourceTest.java
index 95386e3..9295a60 100644
--- a/hoot-services/src/test/java/hoot/services/controllers/osm/map/MapResourceTest.java
+++ b/hoot-services/src/test/java/hoot/services/controllers/osm/map/MapResourceTest.java
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2016, 2017, 2018 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2016, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
  */
 package hoot.services.controllers.osm.map;
 
@@ -149,7 +149,7 @@ public class MapResourceTest extends OSMResourceTestAbstract {
         XPath xpath = XmlUtils.createXPath();
 
         boolean multiLayerUniqueElementIds = multiLayerUniqueElementIdsStr.toLowerCase().equals("true");
-        assertEquals(15, XPathAPI.selectNodeList(responseData, "//osm/node").getLength());
+        assertEquals(6, XPathAPI.selectNodeList(responseData, "//osm/node").getLength());
         if (!multiLayerUniqueElementIds || !useMultiLayerUniqueElementIdsParameter) {
             OSMTestUtils.verifyNode(responseData, 1, String.valueOf(nodeIdsArr[0]), changesetId,
                     originalBounds.getMinLat(), originalBounds.getMinLon(), false);
@@ -179,7 +179,7 @@ public class MapResourceTest extends OSMResourceTestAbstract {
                     queryBounds.getMinLat() - 5, queryBounds.getMinLon() - 5, true);
         }
 
-        assertEquals(11, XPathAPI.selectNodeList(responseData, "//osm/node/tag").getLength());
+        assertEquals(4, XPathAPI.selectNodeList(responseData, "//osm/node/tag").getLength());
         assertEquals(2, XPathAPI.selectNodeList(responseData, "//osm/node[1]/tag").getLength());
         assertEquals("key 1", xpath.evaluate("//osm/node[1]/tag[1]/@k", responseData));
         assertEquals("val 1",
@@ -542,7 +542,7 @@ public class MapResourceTest extends OSMResourceTestAbstract {
 
         XPath xpath = XmlUtils.createXPath();
 
-        assertEquals(15, XPathAPI.selectNodeList(responseData, "//osm/node").getLength());
+        assertEquals(6, XPathAPI.selectNodeList(responseData, "//osm/node").getLength());
         OSMTestUtils.verifyNode(responseData, 1, String.valueOf(nodeIdsArr[0]), changesetId,
                 originalBounds.getMinLat(), originalBounds.getMinLon(), false);
         OSMTestUtils.verifyNode(responseData, 2, String.valueOf(nodeIdsArr[1]), changesetId,
@@ -556,7 +556,7 @@ public class MapResourceTest extends OSMResourceTestAbstract {
         OSMTestUtils.verifyNode(responseData, 6, String.valueOf(oobNodeIdsArr[0]), changesetId,
                 queryBounds.getMinLat() - 5, queryBounds.getMinLon() - 5, false);
 
-        assertEquals(11, XPathAPI.selectNodeList(responseData, "//osm/node/tag").getLength());
+        assertEquals(4, XPathAPI.selectNodeList(responseData, "//osm/node/tag").getLength());
         assertEquals(2, XPathAPI.selectNodeList(responseData, "//osm/node[1]/tag").getLength());
         assertEquals("key 1", xpath.evaluate("//osm/node[1]/tag[1]/@k", responseData));
         assertEquals("val 1", URLDecoder.decode(xpath.evaluate("//osm/node[1]/tag[1]/@v", responseData), "UTF-8"));
@@ -766,7 +766,7 @@ public class MapResourceTest extends OSMResourceTestAbstract {
         OSMTestUtils.verifyOsmHeader(responseData);
         OSMTestUtils.verifyBounds(responseData, queryBounds);
 
-        assertEquals(8, XPathAPI.selectNodeList(responseData, "//osm/node").getLength());
+        assertEquals(4, XPathAPI.selectNodeList(responseData, "//osm/node").getLength());
         OSMTestUtils.verifyNode(responseData, 1, String.valueOf(nodeIdsArr[0]), changesetId,
                 originalBounds.getMinLat(), originalBounds.getMinLon(), false);
         OSMTestUtils.verifyNode(responseData, 2, String.valueOf(nodeIdsArr[1]), changesetId,
@@ -777,7 +777,7 @@ public class MapResourceTest extends OSMResourceTestAbstract {
                 originalBounds.getMinLat(), originalBounds.getMinLon(), false);
 
         XPath xpath = XmlUtils.createXPath();
-        assertEquals(5, XPathAPI.selectNodeList(responseData, "//osm/node/tag").getLength());
+        assertEquals(3, XPathAPI.selectNodeList(responseData, "//osm/node/tag").getLength());
         assertEquals(2, XPathAPI.selectNodeList(responseData, "//osm/node[1]/tag").getLength());
         assertEquals("key 1", xpath.evaluate("//osm/node[1]/tag[1]/@k", responseData));
         assertEquals("val 1", URLDecoder.decode(xpath.evaluate("//osm/node[1]/tag[1]/@v", responseData), "UTF-8"));