Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix PR comments

Browse Source
This commit is contained in:
Patrick Niklaus
2017-06-02 18:19:44 +00:00
parent 879de346ea
commit 10460fc2fb
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_tests/updater/validation.cpp
+16 -16
View File
@@ -12,19 +12,19 @@ BOOST_AUTO_TEST_CASE(timezone_coordinate_validation_test)
rapidjson::Document doc;
char valid_coord[] = "[8.28369,48.88277]";
doc.Parse(valid_coord);
BOOST_CHECK_NO_THROW(util::ValidateCoordinate(doc));
BOOST_CHECK_NO_THROW(util::validateCoordinate(doc));
char non_array[] = "{\"x\": 48.88277}";
doc.Parse(non_array);
BOOST_CHECK_THROW(util::ValidateCoordinate(doc), util::exception);
BOOST_CHECK_THROW(util::validateCoordinate(doc), util::exception);
char too_many[] = "[8.28369, 48.88277, 8.2806]";
doc.Parse(too_many);
BOOST_CHECK_THROW(util::ValidateCoordinate(doc), util::exception);
BOOST_CHECK_THROW(util::validateCoordinate(doc), util::exception);
char nan[] = "[8.28369, y]";
doc.Parse(nan);
BOOST_CHECK_THROW(util::ValidateCoordinate(doc), util::exception);
BOOST_CHECK_THROW(util::validateCoordinate(doc), util::exception);
}
BOOST_AUTO_TEST_CASE(timezone_validation_test)
@@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
"49.07206], [8.28369, 48.88277]]] }}";
rapidjson::Document doc;
doc.Parse(json);
BOOST_CHECK_NO_THROW(util::ValidateFeature(doc));
BOOST_CHECK_NO_THROW(util::validateFeature(doc));
char missing_type[] = "{\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { "
"\"type\": \"polygon\", "
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
"48.88277], [8.57757, 49.07206], [8.28369, "
"49.07206], [8.28369, 48.88277]]] }}";
doc.Parse(missing_type);
BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
char missing_props[] =
"{ \"type\" : \"Feature\","
@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
"48.88277], [8.57757, 49.07206], [8.28369, "
"49.07206], [8.28369, 48.88277]]] }}";
doc.Parse(missing_props);
BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
char nonobj_props[] =
"{ \"type\" : \"Feature\","
@@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
"48.88277], [8.57757, 49.07206], [8.28369, "
"49.07206], [8.28369, 48.88277]]] }}";
doc.Parse(nonobj_props);
BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
char missing_tzid[] = "{ \"type\" : \"Feature\","
"\"properties\" : { }, \"geometry\" : { \"type\": \"polygon\", "
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
"48.88277], [8.57757, 49.07206], [8.28369, "
"49.07206], [8.28369, 48.88277]]] }}";
doc.Parse(missing_tzid);
BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
char tzid_err[] = "{ \"type\" : \"Feature\","
"\"properties\" : { \"TZID\" : []}, \"geometry\" : { \"type\": \"polygon\", "
@@ -79,7 +79,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
"48.88277], [8.57757, 49.07206], [8.28369, "
"49.07206], [8.28369, 48.88277]]] }}";
doc.Parse(tzid_err);
BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
char missing_geom[] = "{ \"type\" : \"Feature\","
"\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometries\" : { "
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
"48.88277], [8.57757, 49.07206], [8.28369, "
"49.07206], [8.28369, 48.88277]]] }}";
doc.Parse(missing_geom);
BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
char nonobj_geom[] =
"{ \"type\" : \"Feature\","
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
"48.88277], [8.57757, 49.07206], [8.28369, "
"49.07206], [8.28369, 48.88277]]] ]}";
doc.Parse(nonobj_geom);
BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
char missing_geom_type[] = "{ \"type\" : \"Feature\","
"\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { "
@@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
"48.88277], [8.57757, 49.07206], [8.28369, "
"49.07206], [8.28369, 48.88277]]] }}";
doc.Parse(missing_geom_type);
BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
char nonstring_geom_type[] = "{ \"type\" : \"Feature\","
"\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : "
@@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
"48.88277], [8.57757, 49.07206], [8.28369, "
"49.07206], [8.28369, 48.88277]]] }}";
doc.Parse(nonstring_geom_type);
BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
char missing_coords[] =
"{ \"type\" : \"Feature\","
@@ -124,7 +124,7 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
"48.88277], [8.57757, 49.07206], [8.28369, "
"49.07206], [8.28369, 48.88277]]] }}";
doc.Parse(missing_coords);
BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
char missing_outerring[] =
"{ \"type\" : \"Feature\","
@@ -133,6 +133,6 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
"48.88277], [8.57757, 49.07206], [8.28369, "
"49.07206], [8.28369, 48.88277]] }}";
doc.Parse(missing_outerring);
BOOST_CHECK_THROW(util::ValidateFeature(doc), util::exception);
BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
}
BOOST_AUTO_TEST_SUITE_END()