diff options
author | Harald Musum <musum@yahoo-inc.com> | 2017-01-26 09:12:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-26 09:12:20 +0100 |
commit | 4e95f6f239b742e3423f6c1446249b7dbf95a303 (patch) | |
tree | cb41bec6d937211b18cd57d998d107f6e6fa5f14 /config-application-package/src/test | |
parent | 5014f2a78843fe25490df4b5bbaab8478275113e (diff) |
Revert "Handle overrides where multiple elements with same tag have overrides"
Diffstat (limited to 'config-application-package/src/test')
-rw-r--r-- | config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java | 27 |
1 files changed, 9 insertions, 18 deletions
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 41b69e9a7aa..54d0a3cc797 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 @@ -36,12 +36,7 @@ public class OverrideProcessorTest { " <content id=\"foo\" version=\"1.0\">" + " <redundancy>1</redundancy>" + " <documents>" + - " <document mode='index' type='music'/>\n" + - " <document type='music2' mode='index' />\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' mode='index' type='music3'/>\n" + - " <document deploy:environment='prod' deploy:region='us-west' mode='index' type='music4'/>\n" + + " <document mode=\"index\" type=\"music.sd\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + @@ -83,8 +78,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=\"music.sd\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + @@ -112,7 +106,7 @@ public class OverrideProcessorTest { " <content id=\"foo\" version=\"1.0\">" + " <redundancy>1</redundancy>" + " <documents>" + - " <document mode=\"index\" type=\"music4\"/>" + + " <document mode=\"index\" type=\"music.sd\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + @@ -144,7 +138,7 @@ public class OverrideProcessorTest { " <content id=\"foo\" version=\"1.0\">" + " <redundancy>1</redundancy>" + " <documents>" + - " <document mode=\"index\" type=\"music3\"/>" + + " <document mode=\"index\" type=\"music.sd\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + @@ -161,7 +155,7 @@ public class OverrideProcessorTest { " </nodes>" + " </jdisc>" + "</services>"; - assertOverride(Environment.valueOf("prod"), RegionName.from("unknown"), expected); + assertOverride(Environment.valueOf("prod"), RegionName.from("us-east"), expected); } @Test @@ -175,7 +169,7 @@ public class OverrideProcessorTest { " <content id=\"foo\" version=\"1.0\">" + " <redundancy>1</redundancy>" + " <documents>" + - " <document mode=\"index\" type=\"music3\"/>" + + " <document mode=\"index\" type=\"music.sd\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + @@ -206,8 +200,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=\"music.sd\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + @@ -235,8 +228,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=\"music.sd\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + @@ -264,8 +256,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=\"music.sd\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node1\"/>" + |