Skip to content

Commit

Permalink
test: improve error messages & add some more apitests
Browse files Browse the repository at this point in the history
  • Loading branch information
@takb
takb committed Jan 27, 2025
1 parent fab4e0b commit 0cca183
Show file tree
Hide file tree
Showing 2 changed files with 203 additions and 1 deletion.
202 changes: 201 additions & 1 deletion ors-api/src/test/java/org/heigit/ors/apitests/routing/ResultTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4065,6 +4065,8 @@ void testCustomProfileBlockTunnelsRejectedWhenDisabled() {
.post(getEndPointPath() + "/{profile}")
.then().log().ifValidationFails()
.assertThat()
.body("error.code", is(2018))
.body("error.message", is("Custom model not available for profile 'cycling-regular'."))
.statusCode(500);
}

Expand All @@ -4090,8 +4092,10 @@ void testCustomProfileBlockTunnelsRejectedWhenDisallowed() {
.body(body.toString())
.when()
.post(getEndPointPath() + "/{profile}")
.then().log().ifValidationFails()
.then().log().all()
.assertThat()
.body("error.code", is(2018))
.body("error.message", is("Custom model disabled for profile 'foot-hiking'."))
.statusCode(500);
}

Expand Down Expand Up @@ -4235,6 +4239,140 @@ void testCustomProfileDistanceInfluence() {
.statusCode(200);
}


@Test
void testCustomProfileLimitSpeed() {
JSONObject body = new JSONObject();
body.put("coordinates", getParameter("coordinatesCustom2"));
body.put("preference", getParameter("preference"));
body.put("instructions", true);
body.put("elevation", true);

JSONObject customModel = new JSONObject();
customModel.put("priority", new JSONArray());
customModel.put("distance_influence", 0);
JSONObject speed = new JSONObject();
speed.put("if", true);
speed.put("limit_to", 60);
customModel.put("speed", new JSONArray().put(speed));
body.put("custom_model", customModel);

given()
.config(JSON_CONFIG_DOUBLE_NUMBERS)
.headers(CommonHeaders.jsonContent)
.pathParam("profile", getParameter("carProfile"))
.body(body.toString())
.when().log().ifValidationFails()
.post(getEndPointPath() + "/{profile}")
.then().log().ifValidationFails()
.assertThat()
.body("any { it.key == 'routes' }", is(true))
.body("routes[0].summary.distance", is(closeTo(9746, 50f)))
.body("routes[0].summary.duration", is(closeTo(702f, 5f)))
.statusCode(200);
}

@Test
void testCustomProfileAvoidByMaxSpeed() {
JSONObject body = new JSONObject();
body.put("coordinates", getParameter("coordinatesCustom2"));
body.put("preference", getParameter("preference"));
body.put("instructions", true);
body.put("elevation", true);

JSONObject customModel = new JSONObject();
customModel.put("distance_influence", 0);
JSONObject priority = new JSONObject();
priority.put("if", "max_speed > 60");
priority.put("multiply_by", 0.1);
customModel.put("priority", new JSONArray().put(priority));
body.put("custom_model", customModel);

given()
.config(JSON_CONFIG_DOUBLE_NUMBERS)
.headers(CommonHeaders.jsonContent)
.pathParam("profile", getParameter("carProfile"))
.body(body.toString())
.when().log().ifValidationFails()
.post(getEndPointPath() + "/{profile}")
.then().log().ifValidationFails()
.assertThat()
.body("any { it.key == 'routes' }", is(true))
.body("routes[0].summary.distance", is(closeTo(11909.7, 50f)))
.body("routes[0].summary.duration", is(closeTo(1677.6, 5f)))
.statusCode(200);
}

@Test
void testCustomProfileComplexCondition() {
JSONObject body = new JSONObject();
body.put("coordinates", getParameter("coordinatesCustom1"));
body.put("preference", getParameter("preference"));
body.put("instructions", true);
body.put("elevation", true);

JSONObject customModel = new JSONObject();
customModel.put("distance_influence", 0);
JSONObject priority = new JSONObject();
priority.put("if", "max_speed > 30 && (road_environment == TUNNEL || roundabout)");
priority.put("multiply_by", 0.1);
customModel.put("priority", new JSONArray().put(priority));
body.put("custom_model", customModel);

given()
.config(JSON_CONFIG_DOUBLE_NUMBERS)
.headers(CommonHeaders.jsonContent)
.pathParam("profile", getParameter("carProfile"))
.body(body.toString())
.when().log().ifValidationFails()
.post(getEndPointPath() + "/{profile}")
.then().log().ifValidationFails()
.assertThat()
.body("any { it.key == 'routes' }", is(true))
.body("routes[0].summary.distance", is(closeTo(3338.7, 50f)))
.body("routes[0].summary.duration", is(closeTo(602.3, 5f)))
.statusCode(200);
}

@Test
void testCustomProfileAvoidBooleanEncodedValue() {
JSONObject body = new JSONObject();
JSONArray coordinates = new JSONArray();
JSONArray coord1 = new JSONArray();
coord1.put(8.6818009);
coord1.put( 49.397251);
coordinates.put(coord1);
JSONArray coord2 = new JSONArray();
coord2.put(8.6769783);
coord2.put(49.3962072);
coordinates.put(coord2);
body.put("coordinates", coordinates);
body.put("preference", getParameter("preference"));
body.put("instructions", true);
body.put("elevation", true);

JSONObject customModel = new JSONObject();
customModel.put("distance_influence", 0);
JSONObject priority = new JSONObject();
priority.put("if", "roundabout");
priority.put("multiply_by", 0);
customModel.put("priority", new JSONArray().put(priority));
body.put("custom_model", customModel);

given()
.config(JSON_CONFIG_DOUBLE_NUMBERS)
.headers(CommonHeaders.jsonContent)
.pathParam("profile", getParameter("carProfile"))
.body(body.toString())
.when().log().ifValidationFails()
.post(getEndPointPath() + "/{profile}")
.then().log().ifValidationFails()
.assertThat()
.body("any { it.key == 'routes' }", is(true))
.body("routes[0].summary.distance", is(closeTo(1287.9, 50f))) // big detour to avoid the roundabout
.statusCode(200);
}

@Test
void testCustomProfileWithRecommended() {
JSONObject body = new JSONObject();
Expand Down Expand Up @@ -4309,6 +4447,68 @@ void testCustomProfileWithoutModelDoesntBreak() { //???
.statusCode(200);
}

@Test
void testCustomProfileUnavailableEncodedValueFails() {
JSONObject body = new JSONObject();
body.put("coordinates", getParameter("coordinatesCustom2"));
body.put("preference", getParameter("preference"));
body.put("instructions", true);
body.put("elevation", true);

JSONObject customModel = new JSONObject();
customModel.put("distance_influence", 0);
JSONObject priority = new JSONObject();
priority.put("if", "max_width < 30");
priority.put("multiply_by", 0.1);
customModel.put("priority", new JSONArray().put(priority));
body.put("custom_model", customModel);

given()
.config(JSON_CONFIG_DOUBLE_NUMBERS)
.headers(CommonHeaders.jsonContent)
.pathParam("profile", getParameter("carProfile"))
.body(body.toString())
.when().log().ifValidationFails()
.post(getEndPointPath() + "/{profile}")
.then().log().ifValidationFails()
.assertThat()
.body("any { it.key == 'routes' }", is(false))
.body("error.code", is(2018))
.body("error.message", is("Cannot compile expression: in 'priority' entry, invalid expression \"max_width < 30\": encoded value 'max_width' not available"))
.statusCode(500);
}

@Test
void testCustomProfileInvalidConditionFails() {
JSONObject body = new JSONObject();
body.put("coordinates", getParameter("coordinatesCustom2"));
body.put("preference", getParameter("preference"));
body.put("instructions", true);
body.put("elevation", true);

JSONObject customModel = new JSONObject();
customModel.put("distance_influence", 0);
JSONObject priority = new JSONObject();
priority.put("if", "äöü this is not a valid condition expression.");
priority.put("multiply_by", 0.1);
customModel.put("priority", new JSONArray().put(priority));
body.put("custom_model", customModel);

given()
.config(JSON_CONFIG_DOUBLE_NUMBERS)
.headers(CommonHeaders.jsonContent)
.pathParam("profile", getParameter("carProfile"))
.body(body.toString())
.when().log().ifValidationFails()
.post(getEndPointPath() + "/{profile}")
.then().log().ifValidationFails()
.assertThat()
.body("any { it.key == 'routes' }", is(false))
.body("error.code", is(2018))
.body("error.message", is("Cannot compile expression: in 'priority' entry, invalid expression \"äöü this is not a valid condition expression.\""))
.statusCode(500);
}

private JSONArray constructBearings(String coordString) {
JSONArray coordinates = new JSONArray();
String[] coordPairs = coordString.split("\\|");
Expand Down
2 changes: 2 additions & 0 deletions ors-engine/src/main/java/org/heigit/ors/routing/RoutingRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,8 @@ private RouteResult[] computeLinearRoute() throws Exception {
}
}
throw new PointNotFoundException(message.toString());
} else if (gr.getErrors().get(0) instanceof IllegalArgumentException) {
throw new InternalServerException(RoutingErrorCodes.UNSUPPORTED_REQUEST_OPTION, gr.getErrors().get(0).getMessage());
} else {
throw new InternalServerException(RoutingErrorCodes.UNKNOWN, gr.getErrors().get(0).getMessage());
}
Expand Down

0 comments on commit 0cca183

Please sign in to comment.