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 2017/02/15 18:31:15 UTC
[22/28] brooklyn-server git commit: add failing test from @geomacy
add failing test from @geomacy
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/6560e581
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/6560e581
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/6560e581
Branch: refs/heads/master
Commit: 6560e581ffc311c88201dc60608fb6301e87dcfd
Parents: d2e23c4
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Feb 13 17:08:36 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Feb 14 00:13:10 2017 +0000
----------------------------------------------------------------------
.../camp/brooklyn/ConfigParametersYamlTest.java | 58 ++++++++++++++++++++
1 file changed, 58 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6560e581/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java
----------------------------------------------------------------------
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 b001f27..f57c494 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
@@ -795,4 +795,62 @@ public class ConfigParametersYamlTest extends AbstractYamlRebindTest {
assertEquals(entity.config().get(key), expectedEntityVal);
}
+
+ @Test(groups="Broken")
+ public void testConfigDefaultIsNotInheritedWith_LocalDefaultResolvesWithAncestorValue_SetToTrue() throws Exception {
+
+ addCatalogItems(
+ "brooklyn.catalog:",
+ " itemType: entity",
+ " version: 0.1",
+ " items:",
+ " - id: entity-with-keys",
+ " item:",
+ " type: "+TestEntity.class.getName(),
+ " brooklyn.parameters:",
+ " - name: my.param.key",
+ " type: string",
+ " inheritance.runtime: never",
+ " description: description one",
+ " default: myDefaultVal",
+ " brooklyn.config:",
+ " my.other.key: $brooklyn:config(\"my.param.key\")");
+
+ addCatalogItems(
+ "brooklyn.catalog:",
+ " itemType: entity",
+ " version: 0.1",
+ " items:",
+ " - id: wrapper-entity",
+ " item:",
+ " brooklyn.parameters:",
+ " - name: my.param.key",
+ " description: description two",
+ " type: entity-with-keys");
+
+ String yaml = Joiner.on("\n").join(
+ "services:",
+ "- type: wrapper-entity");
+
+ Entity app = createStartWaitAndLogApplication(yaml);
+ final TestEntity entity = (TestEntity) Iterables.getOnlyElement(app.getChildren());
+ LOG.info("Config keys declared on "+entity+": "+entity.config().findKeysDeclared(Predicates.alwaysTrue()));
+ ConfigKey<?> key = Iterables.getOnlyElement( entity.config().findKeysDeclared(ConfigPredicates.nameEqualTo("my.param.key")) );
+ assertEquals(key.getDescription(), "description two");
+ assertEquals(entity.config().get(key), null);
+
+ /*
+java.lang.AssertionError: expected [null] but found [myDefaultVal]
+Expected :null
+Actual :myDefaultVal
+
+because we do not filter out hidden ancestor config keys whenever we populate the list of declared config keys, neither in:
+
+BasicSpecParameter.fromSpec(..), where we extend a spec from a spec; nor
+InternalEntityFactory.loadUnitializedEntity(...), where we create a spec for a java class; nor
+BrooklynDynamicType.buildConfigKeys(..), where we record the entity signature for a java type
+
+ */
+ }
+
}