aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/test/java/com/yahoo/config/model
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2023-07-26 16:02:45 +0200
committerMartin Polden <mpolden@mpolden.no>2023-07-26 16:24:11 +0200
commite3ba83a0fdd1e31036929c172836e9996f79f16d (patch)
treec03df2abc06f0f0567c4d5503eef6039cd2773e7 /config-model/src/test/java/com/yahoo/config/model
parent886a16481d5023822629fd4f8f128157af9edce8 (diff)
Remove global-service-id
Diffstat (limited to 'config-model/src/test/java/com/yahoo/config/model')
-rw-r--r--config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java10
1 files changed, 7 insertions, 3 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 c00b2846021..e975421002e 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
@@ -1,7 +1,6 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.config.model;
-import com.google.common.io.Files;
import com.yahoo.config.application.api.ApplicationMetaData;
import com.yahoo.config.application.api.ApplicationPackage;
import com.yahoo.config.application.api.UnparsedConfigDefinition;
@@ -35,7 +34,12 @@ import java.util.Map;
import java.util.Set;
import java.util.jar.JarEntry;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class ApplicationDeployTest {
@@ -194,7 +198,7 @@ public class ApplicationDeployTest {
void testThatAppWithInvalidParallelDeploymentFails() throws IOException {
String expectedMessage = """
4: <staging/>
- 5: <prod global-service-id="query">
+ 5: <prod>
6: <parallel>
7: <instance id="hello" />
8: </parallel>