v0.2.50..v0.2.51 changeset OsmApiChangesetElementTest.cpp

diff --git a/hoot-core-test/src/test/cpp/hoot/core/io/OsmApiChangesetElementTest.cpp b/hoot-core-test/src/test/cpp/hoot/core/io/OsmApiChangesetElementTest.cpp
index 47d57e8..7f3747f 100644
--- a/hoot-core-test/src/test/cpp/hoot/core/io/OsmApiChangesetElementTest.cpp
+++ b/hoot-core-test/src/test/cpp/hoot/core/io/OsmApiChangesetElementTest.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2018 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
  */
 
 //  Hoot
@@ -36,15 +36,15 @@ namespace hoot
 class OsmApiChangesetElementTest : public HootTestFixture
 {
   CPPUNIT_TEST_SUITE(OsmApiChangesetElementTest);
-  CPPUNIT_TEST(runXmlNodeTest);
-  CPPUNIT_TEST(runNonAsciiXmlNodeTest);
-  CPPUNIT_TEST(runXmlWayTest);
-  CPPUNIT_TEST(runXmlRelationTest);
+  CPPUNIT_TEST(runChangesetNodeTest);
+  CPPUNIT_TEST(runNonAsciiChangesetNodeTest);
+  CPPUNIT_TEST(runChangesetWayTest);
+  CPPUNIT_TEST(runChangesetRelationTest);
   CPPUNIT_TEST_SUITE_END();
 
 public:
 
-  void runXmlNodeTest()
+  void runChangesetNodeTest()
   {
     QXmlStreamAttributes attributes;
     attributes.append("id", "-1");
@@ -54,7 +54,7 @@ public:
     XmlObject n;
     n.first = "node";
     n.second = attributes;
-    XmlNode node(n, NULL);
+    ChangesetNode node(n, NULL);
 
     HOOT_STR_EQUALS("\t\t<node id=\"-1\" version=\"0\" "
                     "lat=\"38.8549321261880536\" lon=\"-104.8979050333482093\" changeset=\"1\"/>\n",
@@ -75,7 +75,7 @@ public:
                     node.toString(1));
   }
 
-  void runNonAsciiXmlNodeTest()
+  void runNonAsciiChangesetNodeTest()
   {
     QXmlStreamAttributes attributes;
     attributes.append("id", "-1");
@@ -85,7 +85,7 @@ public:
     XmlObject n;
     n.first = "node";
     n.second = attributes;
-    XmlNode node(n, NULL);
+    ChangesetNode node(n, NULL);
     //  Name tags taken from OSM node in Djibouti
     QXmlStreamAttributes tagAttributesAr;
     tagAttributesAr.append("k", "name:ar");
@@ -118,7 +118,7 @@ public:
                     node.toString(1));
   }
 
-  void runXmlWayTest()
+  void runChangesetWayTest()
   {
     QXmlStreamAttributes attributes;
     attributes.append("id", "-1");
@@ -127,7 +127,7 @@ public:
     XmlObject w;
     w.first = "way";
     w.second = attributes;
-    XmlWay way(w, NULL);
+    ChangesetWay way(w, NULL);
 
     HOOT_STR_EQUALS("\t\t<way id=\"-1\" version=\"0\" timestamp=\"\" changeset=\"1\">\n\t\t</way>\n",
                     way.toString(1));
@@ -157,7 +157,7 @@ public:
                     way.toString(1));
   }
 
-  void runXmlRelationTest()
+  void runChangesetRelationTest()
   {
     QXmlStreamAttributes attributes;
     attributes.append("id", "-1");
@@ -166,7 +166,7 @@ public:
     XmlObject w;
     w.first = "relation";
     w.second = attributes;
-    XmlRelation relation(w, NULL);
+    ChangesetRelation relation(w, NULL);
 
     HOOT_STR_EQUALS("\t\t<relation id=\"-1\" version=\"0\" timestamp=\"\" changeset=\"1\">\n\t\t</relation>\n",
                     relation.toString(1));