From d80a42df35c195e1058d2cee36e03986146a224f Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahoo-inc.com>
Date: Tue, 24 Jan 2017 09:41:21 +0100
Subject: Handle elements with same name correctly

---
 .../com/yahoo/config/application/OverrideProcessorTest.java   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'config-application-package/src/test')

diff --git a/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java
index c5fefc0f002..082e019ba98 100644
--- a/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java
+++ b/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java
@@ -40,7 +40,7 @@ public class OverrideProcessorTest {
                 "      <document mode='index' type='music2'/>\n" +
                 "      <document deploy:environment='prod' deploy:region='us-east-3' mode='index' type='music'/>\n" +
                 "      <document deploy:environment='prod' deploy:region='us-east-3' mode='index' type='music2'/>\n" +
-                "      <document deploy:environment='prod' deploy:region='us-west' mode='index' type='music3'/>\n" +
+                "      <document deploy:environment='prod' mode='index' type='music3'/>\n" +
                 "      <document deploy:environment='prod' deploy:region='us-west' mode='index' type='music4'/>\n" +
                 "    </documents>" +
                 "    <nodes>" +
@@ -112,7 +112,6 @@ public class OverrideProcessorTest {
                 "  <content id=\"foo\" version=\"1.0\">" +
                 "    <redundancy>1</redundancy>" +
                 "    <documents>" +
-                "      <document mode=\"index\" type=\"music3\"/>" +
                 "      <document mode=\"index\" type=\"music4\"/>" +
                 "    </documents>" +
                 "    <nodes>" +
@@ -145,8 +144,7 @@ public class OverrideProcessorTest {
                         "  <content id=\"foo\" version=\"1.0\">" +
                         "    <redundancy>1</redundancy>" +
                         "    <documents>" +
-                        "      <document mode=\"index\" type=\"music\"/>" +
-                        "      <document mode=\"index\" type=\"music2\"/>" +
+                        "      <document mode=\"index\" type=\"music3\"/>" +
                         "    </documents>" +
                         "    <nodes>" +
                         "      <node distribution-key=\"0\" hostalias=\"node0\"/>" +
@@ -163,7 +161,7 @@ public class OverrideProcessorTest {
                         "    </nodes>" +
                         "  </jdisc>" +
                         "</services>";
-        assertOverride(Environment.valueOf("prod"), RegionName.from("us-east"), expected);
+        assertOverride(Environment.valueOf("prod"), RegionName.from("unknown"), expected);
     }
 
     @Test
@@ -177,8 +175,7 @@ public class OverrideProcessorTest {
                         "  <content id=\"foo\" version=\"1.0\">" +
                         "    <redundancy>1</redundancy>" +
                         "    <documents>" +
-                        "      <document mode=\"index\" type=\"music\"/>" +
-                        "      <document mode=\"index\" type=\"music2\"/>" +
+                        "      <document mode=\"index\" type=\"music3\"/>" +
                         "    </documents>" +
                         "    <nodes>" +
                         "      <node distribution-key=\"0\" hostalias=\"node0\"/>" +
-- 
cgit v1.2.3