v0.2.47..v0.2.48 changeset MultiaryPoiMergerTest.cpp

diff --git a/hoot-rnd/src/test/cpp/hoot/rnd/conflate/multiary/MultiaryPoiMergerTest.cpp b/hoot-rnd/src/test/cpp/hoot/rnd/conflate/multiary/MultiaryPoiMergerTest.cpp
index 10a136c..f0d0ad8 100644
--- a/hoot-rnd/src/test/cpp/hoot/rnd/conflate/multiary/MultiaryPoiMergerTest.cpp
+++ b/hoot-rnd/src/test/cpp/hoot/rnd/conflate/multiary/MultiaryPoiMergerTest.cpp
@@ -50,7 +50,10 @@ class MultiaryPoiMergerTest : public HootTestFixture
 
 public:
 
-  MultiaryPoiMergerTest()
+  MultiaryPoiMergerTest() :
+  HootTestFixture(
+    "test-files/rnd/conflate/multiary/MultiaryPoiMergerTest/",
+    "test-output/rnd/conflate/multiary/MultiaryPoiMergerTest/")
   {
     setResetType(ResetAll);
   }
@@ -85,18 +88,15 @@ public:
 
     MultiaryUtilities::conflate(map);
 
+    const QString testFileName = "basicTest.json";
     OsmJsonWriter writer;
     writer.setIncludeCircularError(false);
-    QString result = writer.toString(map);
-
-    //LOG_VAR(TestUtils::toQuotedString(OsmJsonWriter().toString(map)));
-    HOOT_STR_EQUALS("{\"version\": 0.6,\"generator\": \"Hootenanny\",\"elements\": [\n"
-                    "{\"type\":\"node\",\"id\":-1,\"lat\":2,\"lon\":-3,\"tags\":{\"amenity\":\"pub\",\"hoot:hash\":\"\",\"name\":\"My Restaurant\",\"alt_name\":\"my Restaurant\",\"source:hash\":\"AAA;BBB\"}},\n"
-                    "{\"type\":\"node\",\"id\":-3,\"lat\":14,\"lon\":-3,\"tags\":{\"amenity\":\"pub\",\"hoot:hash\":\"\",\"name\":\"Not the same\",\"source:hash\":\"CCC;DDD\",\"place\":\"locality\"}},\n"
-                    "{\"type\":\"relation\",\"id\":-1,\"members\":[\n"
-                    "{\"type\":\"node\",\"ref\":-3,\"role\":\"reviewee\"},\n"
-                    "{\"type\":\"node\",\"ref\":-1,\"role\":\"reviewee\"}],\"tags\":{\"hoot:review:type\":\"POI\",\"hoot:review:note\":\"Somewhat similar (12m) - very close together, similar POI type\",\"hoot:review:members\":\"2\",\"hoot:review:needs\":\"yes\",\"hoot:review:score\":\"-1\"}]\n"
-                    "}\n", result);
+    writer.setIncludeCompatibilityTags(false);
+    writer.open(_outputPath + testFileName);
+    MapProjector::projectToWgs84(map);
+    writer.write(map);
+    writer.close();
+    HOOT_FILE_EQUALS(_inputPath + testFileName, _outputPath + testFileName);
   }
 
 };