Simplify testing of responses with ignored fields

1 files changed, 4 insertions, 2 deletions

diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java
index 0e9e3464c02..9a0856f5afa 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java
@@ -583,11 +583,13 @@ public class RestApiTest {
     private void assertFile(Request request, String responseFile) throws IOException {
         String expectedResponse = IOUtils.readFile(new File(responsesPath + responseFile));
         expectedResponse = include(expectedResponse);
-        expectedResponse = expectedResponse.replaceAll("\\s", "");
+        expectedResponse = expectedResponse.replaceAll("(\"[^\"]*\")|\\s*", "$1"); // Remove whitespace
         String responseString = container.handleRequest(request).getBodyAsString();
         if (expectedResponse.contains("(ignore)")) {
+            // Convert expected response to a literal pattern and replace any ignored field with a pattern that matches
+            // anything
             String expectedResponsePattern = Pattern.quote(expectedResponse)
-                                                    .replaceAll("\\(ignore\\)", "\\\\E.*\\\\Q");
+                                                    .replaceAll("\"?\\(ignore\\)\"?", "\\\\E.*\\\\Q");
             if (!Pattern.matches(expectedResponsePattern, responseString)) {
                 throw new ComparisonFailure(responseFile + " (with ignored fields)", expectedResponsePattern,
                                             responseString);