From c24251eafc97e413400c8cf1bf31bc7b802d42a1 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Thu, 7 Jan 2021 10:59:24 +0100
Subject: Print that XML is invalid according to schema

---
 .../com/yahoo/config/model/application/provider/SchemaValidator.java    | 2 +-
 .../src/test/java/com/yahoo/config/model/ApplicationDeployTest.java     | 2 +-
 .../yahoo/config/model/application/provider/SchemaValidatorTest.java    | 2 +-
 .../test/java/com/yahoo/vespa/model/container/ContainerIncludeTest.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidator.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidator.java
index 1f6822a770b..b0b1209aa90 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidator.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/SchemaValidator.java
@@ -101,7 +101,7 @@ public class SchemaValidator {
         }
 
         private String message(SAXParseException e) {
-            return "XML error in " + fileName + ": " +
+            return "Invalid XML according to XML schema, error in " + fileName + ": " +
                     Exceptions.toMessageString(e)
                     + " [" + e.getLineNumber() + ":" + e.getColumnNumber() + "]" +
                     ", input:\n" + getErrorContext(e.getLineNumber());
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
index 2c209dd79bf..9780e9b503a 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
@@ -203,7 +203,7 @@ public class ApplicationDeployTest {
             ApplicationPackageTester.create(tmpDir.getAbsolutePath());
             fail("Expected exception");
         } catch (IllegalArgumentException e) {
-            assertEquals("XML error in deployment.xml: element \"instance\" not allowed here; expected the element end-tag or element \"delay\", \"region\", \"steps\" or \"test\" [7:30], input:\n", e.getMessage());
+            assertEquals("Invalid XML according to XML schema, error in deployment.xml: element \"instance\" not allowed here; expected the element end-tag or element \"delay\", \"region\", \"steps\" or \"test\" [7:30], input:\n", e.getMessage());
         }
     }
 
diff --git a/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java b/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java
index a89378cb7ba..c2938746443 100644
--- a/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/application/provider/SchemaValidatorTest.java
@@ -77,7 +77,7 @@ public class SchemaValidatorTest {
     }
 
     private String expectedErrorMessage(String input) {
-        return "XML error in " + input + ": The element type \"config\" must be terminated by the matching end-tag \"</config>\". [7:5], input:\n" +
+        return "Invalid XML according to XML schema, error in " + input + ": The element type \"config\" must be terminated by the matching end-tag \"</config>\". [7:5], input:\n" +
                 "4:    <basicStruct>\n" +
                 "5:      <stringVal>default</stringVal>\n" +
                 "6:    </basicStruct>\n" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerIncludeTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerIncludeTest.java
index 7d4be4b5e33..4c90d415bf0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerIncludeTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerIncludeTest.java
@@ -123,7 +123,7 @@ public class ContainerIncludeTest {
             creator.create(true);
             fail("Expected exception due to xml schema violation ('zearcer')");
          } catch (IllegalArgumentException e) {
-            assertThat(e.getMessage(), containsString("XML error"));
+            assertThat(e.getMessage(), containsString("Invalid XML according to XML schema"));
             assertThat(e.getMessage(), containsString("zearcer"));
         }
     }
-- 
cgit v1.2.3