diff options
Diffstat (limited to 'application')
| -rw-r--r-- | application/.gitignore | 1 | ||||
| -rw-r--r-- | application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/application/.gitignore b/application/.gitignore index f5d341f2123..bc385f92fa6 100644 --- a/application/.gitignore +++ b/application/.gitignore @@ -2,3 +2,4 @@ pom.xml.build /logs .preprocessed +/src/test/app-packages/*/models.generated/ diff --git a/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java b/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java index cd5fd42a81a..c9ff51b0d84 100644 --- a/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java +++ b/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java @@ -75,7 +75,13 @@ public class ContainerModelEvaluationTest { private void assertResponse(String url, String expectedResponse, JDisc jdisc) { try { Response response = jdisc.handleRequest(new Request(url)); - JsonTestHelper.assertJsonEquals(expectedResponse, response.getBodyAsString()); + + // Truncate JSON encoded numbers having more than 6 digits after the decimal point + String pattern = "([0-9]+\\.[0-9]{6})[0-9]*"; + String normalizedExpectedResponse = expectedResponse.replaceAll(pattern, "$1"); + String normalizedActualResponse = response.getBodyAsString().replaceAll(pattern, "$1"); + + JsonTestHelper.assertJsonEquals(normalizedExpectedResponse, normalizedActualResponse); assertEquals(200, response.getStatus()); } catch (CharacterCodingException e) { |