You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2021/08/06 13:27:40 UTC
[brooklyn-server] 07/09: fix another test with wrong scopeRoot
semantics
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit f27166742f2e4ac28e55fe6b86e4e8917d0a7bdc
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Aug 6 13:52:19 2021 +0100
fix another test with wrong scopeRoot semantics
---
.../camp/brooklyn/ConfigParametersYamlTest.java | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java
index 24d715b..c2c965e 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java
@@ -662,8 +662,11 @@ public class ConfigParametersYamlTest extends AbstractYamlRebindTest {
"- type: wrapper-entity",
" brooklyn.config:",
" key4: $brooklyn:config(\"my.param.key\")",
- " key4.from.root: $brooklyn:scopeRoot().config(\"my.param.key\")");
-
+ " key4.from.root: $brooklyn:scopeRoot().config(\"my.other.key\")",
+ " my.other.key: notUsed",
+ "brooklyn.config:",
+ " my.other.key: otherDefaultValue");
+
Entity app = createStartWaitAndLogApplication(yaml);
final TestEntity entity = (TestEntity) Iterables.getOnlyElement(app.getChildren());
assertEquals(entity.config().get(ConfigKeys.newStringConfigKey("my.param.key")), "myDefaultValInOuter");
@@ -671,7 +674,8 @@ public class ConfigParametersYamlTest extends AbstractYamlRebindTest {
assertEquals(entity.config().get(ConfigKeys.newStringConfigKey("key3")), "myDefaultValInOuter");
assertEquals(entity.config().get(ConfigKeys.newStringConfigKey("key3.from.root")), "myDefaultValInOuter");
assertEquals(entity.config().get(ConfigKeys.newStringConfigKey("key4")), "myDefaultValInOuter");
- assertEquals(entity.config().get(ConfigKeys.newStringConfigKey("key4.from.root")), "myDefaultValInOuter");
+ // scopeRoot in this context now correctly goes to application root; previously (before 2021-08) it looked at the place where the wrapper-entity was defined
+ assertEquals(entity.config().get(ConfigKeys.newStringConfigKey("key4.from.root")), "otherDefaultValue");
}
@Test
@@ -714,8 +718,11 @@ public class ConfigParametersYamlTest extends AbstractYamlRebindTest {
"- type: wrapper-entity",
" brooklyn.config:",
" key4: $brooklyn:config(\"my.param.key\")",
- " key4.from.root: $brooklyn:scopeRoot().config(\"my.param.key\")");
-
+ " key4.from.root: $brooklyn:scopeRoot().config(\"my.other.key\")",
+ " my.other.key: notUsed",
+ "brooklyn.config:",
+ " my.other.key: otherDefaultValue");
+
Entity app = createStartWaitAndLogApplication(yaml);
final TestEntity entity = (TestEntity) Iterables.getOnlyElement(app.getChildren());
LOG.info("Config keys declared on "+entity+": "+entity.config().findKeysDeclared(Predicates.alwaysTrue()));
@@ -728,7 +735,8 @@ public class ConfigParametersYamlTest extends AbstractYamlRebindTest {
assertEquals(entity.config().get(ConfigKeys.newStringConfigKey("key3")), "myDefaultVal");
assertEquals(entity.config().get(ConfigKeys.newStringConfigKey("key3.from.root")), "myDefaultVal");
assertEquals(entity.config().get(ConfigKeys.newStringConfigKey("key4")), "myDefaultVal");
- assertEquals(entity.config().get(ConfigKeys.newStringConfigKey("key4.from.root")), "myDefaultVal");
+ // scopeRoot in this context now correctly goes to application root; previously (before 2021-08) it looked at the place where the wrapper-entity was defined
+ assertEquals(entity.config().get(ConfigKeys.newStringConfigKey("key4.from.root")), "otherDefaultValue");
}
@Test