aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@yahooinc.com>2023-07-07 10:33:53 +0200
committergjoranv <gv@yahooinc.com>2023-07-10 14:36:52 +0200
commit5d97916cfb39451141530bb3f09850ca9aafe5c7 (patch)
tree6a9b147bc1756feca30f0449004a5b6a3508cbaa
parent8bd2e7aad3f534d4059f7d22b831fafed58b8851 (diff)
Use text block, and remove exception not thrown
-rw-r--r--config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java18
1 files changed, 10 insertions, 8 deletions
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 47e1b35291d..eddb87a6470 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
@@ -168,7 +168,7 @@ public class ApplicationDeployTest {
}
@Test
- void testThatAppWithIllegalDeploymentXmlIsNotValid() throws IOException {
+ void testThatAppWithIllegalDeploymentXmlIsNotValid() {
assertThrows(IllegalArgumentException.class, () -> {
File tmpDir = tmpFolder;
IOUtils.copyDirectory(new File(TESTDIR, "app_invalid_deployment_xml"), tmpDir);
@@ -192,13 +192,15 @@ public class ApplicationDeployTest {
@Test
void testThatAppWithInvalidParallelDeploymentFails() throws IOException {
- String expectedMessage = "4: <staging/>\n" +
- "5: <prod global-service-id=\"query\">\n" +
- "6: <parallel>\n" +
- "7: <instance id=\"hello\" />\n" +
- "8: </parallel>\n" +
- "9: </prod>\n" +
- "10:</deployment>\n";
+ String expectedMessage = """
+ 4: <staging/>
+ 5: <prod global-service-id="query">
+ 6: <parallel>
+ 7: <instance id="hello" />
+ 8: </parallel>
+ 9: </prod>
+ 10:</deployment>
+ """;
File tmpDir = tmpFolder;
IOUtils.copyDirectory(new File(TESTDIR, "invalid_parallel_deployment_xml"), tmpDir);
try {