v0.2.47..v0.2.48 changeset ReviewMarkerTest.cpp

diff --git a/hoot-core-test/src/test/cpp/hoot/core/conflate/review/ReviewMarkerTest.cpp b/hoot-core-test/src/test/cpp/hoot/core/conflate/review/ReviewMarkerTest.cpp
index 34d2b9f..823b651 100644
--- a/hoot-core-test/src/test/cpp/hoot/core/conflate/review/ReviewMarkerTest.cpp
+++ b/hoot-core-test/src/test/cpp/hoot/core/conflate/review/ReviewMarkerTest.cpp
@@ -32,6 +32,8 @@
 #include <hoot/core/util/HootException.h>
 #include <hoot/core/util/Log.h>
 #include <hoot/core/schema/MetadataTags.h>
+#include <hoot/core/io/OsmJsonReader.h>
+#include <hoot/core/util/MapProjector.h>
 
 namespace hoot
 {
@@ -47,7 +49,9 @@ class ReviewMarkerTest : public HootTestFixture
 
 public:
 
-  ReviewMarkerTest()
+  ReviewMarkerTest() :
+  HootTestFixture(
+    "test-files/conflate/review/ReviewMarkerTest/", "test-output/conflate/review/ReviewMarkerTest/")
   {
     setResetType(ResetAll);
   }
@@ -100,18 +104,15 @@ public:
 
     uut.mark(map, n1, n2, "a note", "test");
 
+    const QString testFileName = "runSimpleTest.json";
     OsmJsonWriter writer;
+    writer.setIncludeCompatibilityTags(false);
     writer.setIncludeCircularError(false);
-    QString result = writer.toString(map);
-
-    HOOT_STR_EQUALS("{\"version\": 0.6,\"generator\": \"Hootenanny\",\"elements\": [\n"
-      "{\"type\":\"node\",\"id\":2,\"lat\":0,\"lon\":0,\"tags\":{\"uuid\":\"n2\"}},\n"
-      "{\"type\":\"node\",\"id\":1,\"lat\":0,\"lon\":0,\"tags\":{\"uuid\":\"n1\"}},\n"
-      "{\"type\":\"relation\",\"id\":-1,\"members\":[\n"
-      "{\"type\":\"node\",\"ref\":1,\"role\":\"reviewee\"},\n"
-      "{\"type\":\"node\",\"ref\":2,\"role\":\"reviewee\"}],\"tags\":{\"" + MetadataTags::HootReviewType() + "\":\"test\",\"" + MetadataTags::HootReviewNote() + "\":\"a note\",\"" + MetadataTags::HootReviewMembers() + "\":\"2\",\"" + MetadataTags::HootReviewNeeds() + "\":\"yes\",\"" + MetadataTags::HootReviewScore() + "\":\"-1\"}]\n"
-      "}\n",
-      result);
+    writer.open(_outputPath + testFileName);
+    MapProjector::projectToWgs84(map);
+    writer.write(map);
+    writer.close();
+    HOOT_FILE_EQUALS(_inputPath + testFileName, _outputPath + testFileName);
   }
 
   /**
@@ -136,21 +137,15 @@ public:
     uut.mark(map, n1, n2, "a note", "test", 0.15);
     uut.mark(map, n1, n2, "a note 2", "test", 0.5);
 
+    const QString testFileName = "runMultipleScoresTest.json";
     OsmJsonWriter writer;
+    writer.setIncludeCompatibilityTags(false);
     writer.setIncludeCircularError(false);
-    QString result = writer.toString(map);
-
-    HOOT_STR_EQUALS("{\"version\": 0.6,\"generator\": \"Hootenanny\",\"elements\": [\n"
-      "{\"type\":\"node\",\"id\":2,\"lat\":0,\"lon\":0,\"tags\":{\"uuid\":\"n2\"}},\n"
-      "{\"type\":\"node\",\"id\":1,\"lat\":0,\"lon\":0,\"tags\":{\"uuid\":\"n1\"}},\n"
-      "{\"type\":\"relation\",\"id\":-2,\"members\":[\n"
-      "{\"type\":\"node\",\"ref\":1,\"role\":\"reviewee\"},\n"
-      "{\"type\":\"node\",\"ref\":2,\"role\":\"reviewee\"}],\"tags\":{\"" + MetadataTags::HootReviewType() + "\":\"test\",\"" + MetadataTags::HootReviewNote() + "\":\"a note 2\",\"" + MetadataTags::HootReviewMembers() + "\":\"2\",\"" + MetadataTags::HootReviewNeeds() + "\":\"yes\",\"" + MetadataTags::HootReviewScore() + "\":\"0.5\"},\n"
-      "{\"type\":\"relation\",\"id\":-1,\"members\":[\n"
-      "{\"type\":\"node\",\"ref\":1,\"role\":\"reviewee\"},\n"
-      "{\"type\":\"node\",\"ref\":2,\"role\":\"reviewee\"}],\"tags\":{\"" + MetadataTags::HootReviewType() + "\":\"test\",\"" + MetadataTags::HootReviewNote() + "\":\"a note\",\"" + MetadataTags::HootReviewMembers() + "\":\"2\",\"" + MetadataTags::HootReviewNeeds() + "\":\"yes\",\"" + MetadataTags::HootReviewScore() + "\":\"0.15\"}]\n"
-      "}\n",
-      result);
+    writer.open(_outputPath + testFileName);
+    MapProjector::projectToWgs84(map);
+    writer.write(map);
+    writer.close();
+    HOOT_FILE_EQUALS(_inputPath + testFileName, _outputPath + testFileName);
   }
 
   void runAddReviewTagsToFeaturesTest()