Make the empty deployment spec really empty

2 files changed, 3 insertions, 11 deletions

diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
index ac605add892..d0740b3e9b9 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
@@ -422,14 +422,6 @@ public class DeploymentSpecTest {
     }
 
     @Test
-    public void testEmpty() {
-        assertFalse(DeploymentSpec.empty.requireInstance("default").globalServiceId().isPresent());
-        assertTrue(DeploymentSpec.empty.requireInstance("default").steps().isEmpty());
-        assertEquals(1, DeploymentSpec.empty.steps().size());
-        assertEquals("<deployment version='1.0'/>", DeploymentSpec.empty.xmlForm());
-    }
-
-    @Test
     public void productionSpecWithParallelDeployments() {
         StringReader r = new StringReader(
                 "<deployment>" +
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
index 50999759b77..b36c8299e66 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
@@ -317,9 +317,9 @@ public class DeploymentSpecWithoutInstanceTest {
 
     @Test
     public void testEmpty() {
-        assertFalse(DeploymentSpec.empty.requireInstance("default").globalServiceId().isPresent());
-        assertEquals(1, DeploymentSpec.empty.steps().size());
-        assertTrue(DeploymentSpec.empty.requireInstance("default").steps().isEmpty());
+        assertEquals(0, DeploymentSpec.empty.steps().size());
+        assertTrue(DeploymentSpec.empty.athenzDomain().isEmpty());
+        assertTrue(DeploymentSpec.empty.athenzService().isEmpty());
         assertEquals("<deployment version='1.0'/>", DeploymentSpec.empty.xmlForm());
     }