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

diff --git a/hoot-services/src/test/java/hoot/services/controllers/osm/element/ElementResourceTest.java b/hoot-services/src/test/java/hoot/services/controllers/osm/element/ElementResourceTest.java
index c7b6d4a..6c37e81 100644
--- a/hoot-services/src/test/java/hoot/services/controllers/osm/element/ElementResourceTest.java
+++ b/hoot-services/src/test/java/hoot/services/controllers/osm/element/ElementResourceTest.java
@@ -22,11 +22,13 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2016, 2017 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2016, 2017, 2019 DigitalGlobe (http://www.digitalglobe.com/)
  */
 package hoot.services.controllers.osm.element;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.net.URLDecoder;
 import java.util.ArrayList;
@@ -108,13 +110,22 @@ public class ElementResourceTest extends OSMResourceTestAbstract {
     }
 
     private static void verifyFirstRelationWasReturned(Document responseData, String id, long changesetId,
-            List<RelationMember> relationMembers) throws Exception {
+            List<RelationMember> relationMembers, boolean isFull) throws Exception {
         XPath xpath = XmlUtils.createXPath();
 
+//        TransformerFactory tf = TransformerFactory.newInstance();
+//        Transformer transformer = tf.newTransformer();
+//        transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+//        StringWriter writer = new StringWriter();
+//        transformer.transform(new DOMSource(responseData), new StreamResult(writer));
+//        String output = writer.getBuffer().toString().replaceAll("\n|\r", "");
+
         OSMTestUtils.verifyOsmHeader(responseData);
 
-        assertEquals(0, XPathAPI.selectNodeList(responseData, "//osm/node").getLength());
-        assertEquals(0, XPathAPI.selectNodeList(responseData, "//osm/way").getLength());
+        if (isFull) {
+            assertEquals(4, XPathAPI.selectNodeList(responseData, "//osm/node").getLength());
+            assertEquals(2, XPathAPI.selectNodeList(responseData, "//osm/way").getLength());
+        }
         assertEquals(1, XPathAPI.selectNodeList(responseData, "//osm/relation").getLength());
 
         OSMTestUtils.verifyRelation(responseData, 1, id, changesetId, relationMembers, id.contains("_"));
@@ -194,7 +205,7 @@ public class ElementResourceTest extends OSMResourceTestAbstract {
                 .get(Document.class);
 
         assertNotNull(responseData);
-        verifyFirstRelationWasReturned(responseData, String.valueOf(relationIdsArr[0]), changesetId, null);
+        verifyFirstRelationWasReturned(responseData, String.valueOf(relationIdsArr[0]), changesetId, null, false);
         OSMTestUtils.verifyTestDataUnmodified(originalBounds, changesetId, nodeIds, wayIds, relationIds);
     }
 
@@ -250,7 +261,7 @@ public class ElementResourceTest extends OSMResourceTestAbstract {
         members.add(new RelationMember(wayIdsArr[0], ElementType.Way, "role2"));
         members.add(new RelationMember(nodeIdsArr[2], ElementType.Node));
 
-        verifyFirstRelationWasReturned(responseData, String.valueOf(relationIdsArr[0]), changesetId, members);
+        verifyFirstRelationWasReturned(responseData, String.valueOf(relationIdsArr[0]), changesetId, members, true);
         OSMTestUtils.verifyTestDataUnmodified(originalBounds, changesetId, nodeIds, wayIds, relationIds);
     }