v0.2.54..v0.2.55 changeset ElementComparerTest.cpp

diff --git a/hoot-core-test/src/test/cpp/hoot/core/elements/ElementComparerTest.cpp b/hoot-core-test/src/test/cpp/hoot/core/elements/ElementComparerTest.cpp
index 34e5eda..b76366b 100644
--- a/hoot-core-test/src/test/cpp/hoot/core/elements/ElementComparerTest.cpp
+++ b/hoot-core-test/src/test/cpp/hoot/core/elements/ElementComparerTest.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2012, 2013, 2014, 2016, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2012, 2013, 2014, 2016, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 
 // Hoot
@@ -34,30 +34,37 @@ namespace hoot
 
 class ElementComparerTest : public HootTestFixture
 {
-    CPPUNIT_TEST_SUITE(ElementComparerTest);
-    CPPUNIT_TEST(runNodeWithinDistanceThresholdTest1);
-    CPPUNIT_TEST(runNodeOutsideOfDistanceThresholdTest);
-    CPPUNIT_TEST(runNodeDifferentTagsTest);
-    CPPUNIT_TEST(runNodeDifferentCircularErrorTest);
-    CPPUNIT_TEST(runWaySameTest);
-    CPPUNIT_TEST(runWayDifferentIdsTest);
-    CPPUNIT_TEST(runWayDifferentNodesTest);
-    CPPUNIT_TEST(runWayDifferentNodeOrderTest);
-    CPPUNIT_TEST(runWayDifferentTagsTest);
-    CPPUNIT_TEST(runWayDifferentCircularErrorTest);
-    CPPUNIT_TEST(runWayDifferentVersionsTest);
-    CPPUNIT_TEST(runRelationSameTest);
-    CPPUNIT_TEST(runRelationDifferentIdsTest);
-    CPPUNIT_TEST(runRelationDifferentTypesTest);
-    CPPUNIT_TEST(runRelationDifferentMembersTest);
-    CPPUNIT_TEST(runRelationDifferentMemberRolesTest);
-    CPPUNIT_TEST(runRelationDifferentTagsTest);
-    CPPUNIT_TEST(runRelationDifferentCircularErrorTest);
-    CPPUNIT_TEST(runRelationDifferentVersionsTest);
-    CPPUNIT_TEST_SUITE_END();
+  CPPUNIT_TEST_SUITE(ElementComparerTest);
+  CPPUNIT_TEST(runDifferentTypesTest);
+  CPPUNIT_TEST(runNodeWithinDistanceThresholdTest1);
+  CPPUNIT_TEST(runNodeOutsideOfDistanceThresholdTest);
+  CPPUNIT_TEST(runNodeDifferentTagsTest);
+  CPPUNIT_TEST(runWaySameTest);
+  CPPUNIT_TEST(runWayDifferentIdsTest);
+  CPPUNIT_TEST(runWayDifferentNodesTest);
+  CPPUNIT_TEST(runWayDifferentNodeOrderTest);
+  CPPUNIT_TEST(runWayDifferentTagsTest);
+  CPPUNIT_TEST(runWayDifferentVersionsTest);
+  CPPUNIT_TEST(runRelationSameTest);
+  CPPUNIT_TEST(runRelationDifferentIdsTest);
+  CPPUNIT_TEST(runRelationDifferentTypesTest);
+  CPPUNIT_TEST(runRelationDifferentMembersTest);
+  CPPUNIT_TEST(runRelationDifferentMemberRolesTest);
+  CPPUNIT_TEST(runRelationDifferentTagsTest);
+  CPPUNIT_TEST(runRelationDifferentVersionsTest);
+  // TODO: need tests for _ignoreElementId=true and _ignoreVersion=true
+  CPPUNIT_TEST_SUITE_END();
 
 public:
 
+  void runDifferentTypesTest()
+  {
+    NodePtr node1(new Node(Status::Unknown1, 1, 0.0, 0.0, 15.0));
+    WayPtr way1(new Way(Status::Unknown1, 1, 15.0));
+
+    CPPUNIT_ASSERT(!ElementComparer().isSame(node1, way1));
+  }
+
   void runNodeWithinDistanceThresholdTest1()
   {
     NodePtr node1(new Node(Status::Unknown1, 1, 0.0, 0.0, 15.0));
@@ -91,28 +98,6 @@ public:
     CPPUNIT_ASSERT(!ElementComparer().isSame(node1, node2));
   }
 
-  void runNodeDifferentStatusTest()
-  {
-    NodePtr node1(new Node(Status::Unknown1, 1, 0.0, 0.0, 15.0));
-    node1->setTag("key1", "value1");
-
-    NodePtr node2(new Node(Status::Unknown2, 1, 0.0, 0.00000001, 15.0));
-    node2->setTag("key1", "value1");
-
-    CPPUNIT_ASSERT(!ElementComparer().isSame(node1, node2));
-  }
-
-  void runNodeDifferentCircularErrorTest()
-  {
-    NodePtr node1(new Node(Status::Unknown1, 1, 0.0, 0.0, 15.0));
-    node1->setTag("key1", "value1");
-
-    NodePtr node2(new Node(Status::Unknown1, 1, 0.0, 0.00000001, 16.0));
-    node2->setTag("key1", "value1");
-
-    CPPUNIT_ASSERT(!ElementComparer().isSame(node1, node2));
-  }
-
   void runWaySameTest()
   {
     NodePtr node1(new Node(Status::Unknown1, 1, 0.0, 0.0, 15.0));
@@ -139,7 +124,7 @@ public:
     WayPtr way1(new Way(Status::Unknown1, 1, 15.0));
     way1->setTag("key1", "value1");
     way1->addNode(node1->getId());
-    way1->addNode(node2->getId());
+    way1->addNode(node2->getId());;
 
     WayPtr way2(new Way(Status::Unknown1, 2, 15.0));
     way2->setTag("key1", "value1");
@@ -202,42 +187,6 @@ public:
     CPPUNIT_ASSERT(!ElementComparer().isSame(way1, way2));
   }
 
-  void runWayDifferentStatusTest()
-  {
-    NodePtr node1(new Node(Status::Unknown1, 1, 0.0, 0.0, 15.0));
-    NodePtr node2(new Node(Status::Unknown1, 1, 0.0, 0.0, 15.0));
-
-    WayPtr way1(new Way(Status::Unknown1, 1, 15.0));
-    way1->setTag("key1", "value1");
-    way1->addNode(node1->getId());
-    way1->addNode(node2->getId());
-
-    WayPtr way2(new Way(Status::Unknown2, 1, 15.0));
-    way2->setTag("key1", "value1");
-    way2->addNode(node1->getId());
-    way2->addNode(node2->getId());
-
-    CPPUNIT_ASSERT(!ElementComparer().isSame(way1, way2));
-  }
-
-  void runWayDifferentCircularErrorTest()
-  {
-    NodePtr node1(new Node(Status::Unknown1, 1, 0.0, 0.0, 15.0));
-    NodePtr node2(new Node(Status::Unknown1, 1, 0.0, 0.0, 15.0));
-
-    WayPtr way1(new Way(Status::Unknown1, 1, 15.0));
-    way1->setTag("key1", "value1");
-    way1->addNode(node1->getId());
-    way1->addNode(node2->getId());
-
-    WayPtr way2(new Way(Status::Unknown1, 1, 16.0));
-    way2->setTag("key1", "value1");
-    way2->addNode(node1->getId());
-    way2->addNode(node2->getId());
-
-    CPPUNIT_ASSERT(!ElementComparer().isSame(way1, way2));
-  }
-
   void runWayDifferentVersionsTest()
   {
     NodePtr node1(new Node(Status::Unknown1, 1, 0.0, 0.0, 15.0));
@@ -262,7 +211,7 @@ public:
 
     RelationPtr relation1(new Relation(Status::Unknown1, 1, 15.0, "type1"));
     relation1->setTag("key1", "value1");
-    relation1->addElement("role1", way1);
+    relation1->addElement("role1", way1);;
 
     RelationPtr relation2(new Relation(Status::Unknown1, 1, 15.0, "type1"));
     relation2->setTag("key1", "value1");
@@ -347,36 +296,6 @@ public:
     CPPUNIT_ASSERT(!ElementComparer().isSame(relation1, relation2));
   }
 
-  void runRelationDifferentStatusTest()
-  {
-    WayPtr way1(new Way(Status::Unknown1, 1, 15.0));
-
-    RelationPtr relation1(new Relation(Status::Unknown1, 1, 15.0, "type1"));
-    relation1->setTag("key1", "value1");
-    relation1->addElement("role1", way1);
-
-    RelationPtr relation2(new Relation(Status::Unknown2, 1, 15.0, "type1"));
-    relation2->setTag("key1", "value1");
-    relation2->addElement("role1", way1);
-
-    CPPUNIT_ASSERT(!ElementComparer().isSame(relation1, relation2));
-  }
-
-  void runRelationDifferentCircularErrorTest()
-  {
-    WayPtr way1(new Way(Status::Unknown1, 1, 15.0));
-
-    RelationPtr relation1(new Relation(Status::Unknown1, 1, 15.0, "type1"));
-    relation1->setTag("key1", "value1");
-    relation1->addElement("role1", way1);
-
-    RelationPtr relation2(new Relation(Status::Unknown1, 1, 16.0, "type1"));
-    relation2->setTag("key1", "value1");
-    relation2->addElement("role1", way1);
-
-    CPPUNIT_ASSERT(!ElementComparer().isSame(relation1, relation2));
-  }
-
   void runRelationDifferentVersionsTest()
   {
     WayPtr way1(new Way(Status::Unknown1, 1, 15.0));
@@ -393,7 +312,6 @@ public:
 
     CPPUNIT_ASSERT(!ElementComparer().isSame(relation1, relation2));
   }
-
 };
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(ElementComparerTest, "quick");