1 files changed, 20 insertions, 8 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java
index df118b0e349..c8a245e68b0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java
@@ -1,7 +1,11 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.container.xml;
 
+import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
+import com.yahoo.config.model.deploy.DeployState;
+import com.yahoo.config.model.test.MockApplicationPackage;
+import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.container.core.identity.IdentityConfig;
 import com.yahoo.vespa.model.container.Identity;
 import org.junit.Test;
@@ -17,16 +21,24 @@ import static org.junit.Assert.assertEquals;
  */
 public class IdentityBuilderTest extends ContainerModelBuilderTestBase {
     @Test
-    public void identity_config_produced() throws IOException, SAXException {
+    public void identity_config_produced_from_deployment_spec() throws IOException, SAXException {
         Element clusterElem = DomBuilderTest.parse(
-                "<jdisc id='default' version='1.0'>",
-                "  <identity>",
-                "    <domain>domain</domain>",
-                "    <service>service</service>",
-                "  </identity>",
-                "</jdisc>");
+                "<jdisc id='default' version='1.0'/>");
+        String deploymentXml = "<deployment version='1.0' athenz-domain='domain' athenz-service='service'>\n" +
+                               "    <test/>\n" +
+                               "    <prod>\n" +
+                               "        <region active='true'>default</region>\n" +
+                               "    </prod>\n" +
+                               "</deployment>\n";
+
+        ApplicationPackage applicationPackage = new MockApplicationPackage.Builder()
+                .withDeploymentSpec(deploymentXml)
+                .build();
+
+        // Override root
+        root = new MockRoot("root", applicationPackage);
+        createModel(root, DeployState.createTestState(applicationPackage), clusterElem);
 
-        createModel(root, clusterElem);
         IdentityConfig identityConfig = root.getConfig(IdentityConfig.class, "default/component/" + Identity.CLASS);
         assertEquals("domain", identityConfig.domain());
         assertEquals("service", identityConfig.service());