v0.2.50..v0.2.51 changeset BuildingMatchCreatorTest.cpp

diff --git a/hoot-core-test/src/test/cpp/hoot/core/conflate/polygon/BuildingMatchCreatorTest.cpp b/hoot-core-test/src/test/cpp/hoot/core/conflate/polygon/BuildingMatchCreatorTest.cpp
index bed738f..b737406 100644
--- a/hoot-core-test/src/test/cpp/hoot/core/conflate/polygon/BuildingMatchCreatorTest.cpp
+++ b/hoot-core-test/src/test/cpp/hoot/core/conflate/polygon/BuildingMatchCreatorTest.cpp
@@ -68,9 +68,7 @@ class BuildingMatchCreatorTest : public HootTestFixture
 
 public:
 
-  BuildingMatchCreatorTest()
-    : HootTestFixture("test-files/",
-                      UNUSED_PATH)
+  BuildingMatchCreatorTest() : HootTestFixture("test-files/", UNUSED_PATH)
   {
     setResetType(ResetAll);
   }
@@ -136,6 +134,8 @@ public:
   {
     OsmMapPtr map = getTestMap();
 
+    conf().set("building.address.match.enabled", "false");
+
     BuildingMatchCreator uut;
     vector<ConstMatchPtr> matches;
 
@@ -155,6 +155,8 @@ public:
     OsmXmlReader reader;
     OsmMapPtr map(new OsmMap());
 
+    conf().set("building.address.match.enabled", "false");
+
     reader.setDefaultStatus(Status::Unknown1);
     reader.read(_inputPath + "ToyBuildingsTestA.osm", map);
     MapProjector::projectToPlanar(map);
@@ -190,6 +192,7 @@ public:
     conf().set("building.date.format", "yyyy-MM-ddTHH:mm");
     conf().set("building.date.tag.key", "source:date");
     conf().set("building.review.if.secondary.newer", "true");
+    conf().set("building.address.match.enabled", "false");
 
     BuildingMatchCreator uut;
     vector<ConstMatchPtr> matches;
@@ -247,6 +250,7 @@ public:
     TestUtils::getElementWithTag(map, "name", "Target Pharmacy")->getTags()
       .appendValue("source:date", "2018-02-14T10:55");
 
+    conf().set("building.address.match.enabled", "false");
     conf().set("building.date.format", "yyyy-MM-ddTHH:mm");
     conf().set("building.date.tag.key", "source:date");
     conf().set("building.review.if.secondary.newer", "true");
@@ -275,6 +279,7 @@ public:
     TestUtils::getElementWithTag(map, "name", "Target Pharmacy")->getTags()
       .appendValue("date", "2018-02-14T10:55");
 
+    conf().set("building.address.match.enabled", "false");
     conf().set("building.date.format", "yyyy-MM-ddTHH:mm");
     conf().set("building.date.tag.key", "source:date");
     conf().set("building.review.if.secondary.newer", "true");
@@ -302,6 +307,7 @@ public:
     TestUtils::getElementWithTag(map, "name", "Target Pharmacy")->getTags()
       .appendValue("source:date", "2018-02-14T10:55");
 
+    conf().set("building.address.match.enabled", "false");
     conf().set("building.date.format", "yyyy-MM-ddTHH:mm");
     conf().set("building.date.tag.key", "source:date");
     conf().set("building.review.if.secondary.newer", "true");
@@ -326,6 +332,7 @@ public:
   {
     OsmMapPtr map = getTestMap();
 
+    conf().set("building.address.match.enabled", "false");
     conf().set("building.review.matches.other.than.one.to.one", "true");
 
     BuildingMatchCreator uut;
@@ -349,6 +356,7 @@ public:
 
     OsmMapPtr map = getTestMap(false);
 
+    conf().set("building.address.match.enabled", "false");
     conf().set("building.review.matches.other.than.one.to.one", "true");
 
     BuildingMatchCreator uut;