diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2017-01-19 11:05:59 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahoo-inc.com> | 2017-01-19 11:05:59 +0100 |
| commit | b4353a877fbf972a4130334935398be2c00c133c (patch) | |
| tree | b52712b071d1f26277e9b966050c25b692fe9c52 /config-application-package/src/test/java | |
| parent | 127dfb980e0537df49cbe3d6fec22886e2a44924 (diff) | |
Handle overrides where multiple elements with same tag have overrides
VESPA-6219
Diffstat (limited to 'config-application-package/src/test/java')
| -rw-r--r-- | config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java | 28 |
1 files changed, 20 insertions, 8 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 54d0a3cc797..c5fefc0f002 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,7 +36,12 @@ public class OverrideProcessorTest { " <content id=\"foo\" version=\"1.0\">" + " <redundancy>1</redundancy>" + " <documents>" + - " <document mode=\"index\" type=\"music.sd\"/>" + + " <document mode='index' type='music'/>\n" + + " <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' deploy:region='us-west' mode='index' type='music4'/>\n" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + @@ -78,7 +83,8 @@ public class OverrideProcessorTest { " <content id=\"foo\" version=\"1.0\">" + " <redundancy>1</redundancy>" + " <documents>" + - " <document mode=\"index\" type=\"music.sd\"/>" + + " <document mode=\"index\" type=\"music\"/>" + + " <document mode=\"index\" type=\"music2\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + @@ -106,7 +112,8 @@ public class OverrideProcessorTest { " <content id=\"foo\" version=\"1.0\">" + " <redundancy>1</redundancy>" + " <documents>" + - " <document mode=\"index\" type=\"music.sd\"/>" + + " <document mode=\"index\" type=\"music3\"/>" + + " <document mode=\"index\" type=\"music4\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + @@ -138,7 +145,8 @@ public class OverrideProcessorTest { " <content id=\"foo\" version=\"1.0\">" + " <redundancy>1</redundancy>" + " <documents>" + - " <document mode=\"index\" type=\"music.sd\"/>" + + " <document mode=\"index\" type=\"music\"/>" + + " <document mode=\"index\" type=\"music2\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + @@ -169,7 +177,8 @@ public class OverrideProcessorTest { " <content id=\"foo\" version=\"1.0\">" + " <redundancy>1</redundancy>" + " <documents>" + - " <document mode=\"index\" type=\"music.sd\"/>" + + " <document mode=\"index\" type=\"music\"/>" + + " <document mode=\"index\" type=\"music2\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + @@ -200,7 +209,8 @@ public class OverrideProcessorTest { " <content id=\"foo\" version=\"1.0\">" + " <redundancy>1</redundancy>" + " <documents>" + - " <document mode=\"index\" type=\"music.sd\"/>" + + " <document mode=\"index\" type=\"music\"/>" + + " <document mode=\"index\" type=\"music2\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + @@ -228,7 +238,8 @@ public class OverrideProcessorTest { " <content id=\"foo\" version=\"1.0\">" + " <redundancy>1</redundancy>" + " <documents>" + - " <document mode=\"index\" type=\"music.sd\"/>" + + " <document mode=\"index\" type=\"music\"/>" + + " <document mode=\"index\" type=\"music2\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node0\"/>" + @@ -256,7 +267,8 @@ public class OverrideProcessorTest { " <content id=\"foo\" version=\"1.0\">" + " <redundancy>1</redundancy>" + " <documents>" + - " <document mode=\"index\" type=\"music.sd\"/>" + + " <document mode=\"index\" type=\"music\"/>" + + " <document mode=\"index\" type=\"music2\"/>" + " </documents>" + " <nodes>" + " <node distribution-key=\"0\" hostalias=\"node1\"/>" + |