Skip to content

v0.2.51..v0.2.52 changeset OsmApiWriterTestServer.cpp

Garret Voltz edited this page Jan 15, 2020 · 1 revision
diff --git a/hoot-core-test/src/test/cpp/hoot/core/io/OsmApiWriterTestServer.cpp b/hoot-core-test/src/test/cpp/hoot/core/io/OsmApiWriterTestServer.cpp
index 068a982..d2327dd 100644
--- a/hoot-core-test/src/test/cpp/hoot/core/io/OsmApiWriterTestServer.cpp
+++ b/hoot-core-test/src/test/cpp/hoot/core/io/OsmApiWriterTestServer.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 
 #include "OsmApiWriterTestServer.h"
@@ -85,7 +85,7 @@ bool RetryConflictsTestServer::respond(HttpConnection::HttpConnectionPtr& connec
     response.reset(new HttpResponse(405));
     response->add_header("Allow", "GET");
   }
-  else if (headers.find("/close/"))
+  else if (headers.find(QString(OsmApiWriter::API_PATH_CLOSE_CHANGESET).arg(1).toStdString()))
   {
     response.reset(new HttpResponse(200));
     continue_processing = false;
@@ -129,7 +129,7 @@ bool RetryVersionTestServer::respond(HttpConnection::HttpConnectionPtr &connecti
   else if (headers.find(OsmApiWriter::API_PATH_CREATE_CHANGESET) != std::string::npos)
     response.reset(new HttpResponse(200, "1"));
   //  Upload changeset 1
-  else if (headers.find("/api/0.6/changeset/1/upload/") != std::string::npos)
+  else if (headers.find(QString(OsmApiWriter::API_PATH_UPLOAD_CHANGESET).arg(1).toStdString()) != std::string::npos)
   {
     //  The first time through, the 'version' of element 1 should fail.
     if (!_has_error)
@@ -141,10 +141,10 @@ bool RetryVersionTestServer::respond(HttpConnection::HttpConnectionPtr &connecti
       response.reset(new HttpResponse(200, OsmApiSampleRequestResponse::SAMPLE_CHANGESET_1_RESPONSE));
   }
   //  Get way 1's updated version
-  else if (headers.find("/api/0.6/way/1") != std::string::npos)
+  else if (headers.find(QString(OsmApiWriter::API_PATH_GET_ELEMENT).arg("way").arg(1).toStdString()) != std::string::npos)
     response.reset(new HttpResponse(200, OsmApiSampleRequestResponse::SAMPLE_ELEMENT_1_GET_RESPONSE));
   //  Close changeset
-  else if (headers.find("/close/"))
+  else if (headers.find(QString(OsmApiWriter::API_PATH_CLOSE_CHANGESET).arg(1).toStdString()))
   {
     response.reset(new HttpResponse(200));
     continue_processing = false;
Clone this wiki locally