Repository: brooklyn-server Updated Branches: refs/heads/master dddce7edc -> 82511c3b1
Fix failing tests - handle newly introduced config key Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/882dbba3 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/882dbba3 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/882dbba3 Branch: refs/heads/master Commit: 882dbba30655498d96758aa2d33538f9462092bc Parents: dddce7e Author: Svetoslav Neykov <[email protected]> Authored: Thu Jun 16 09:57:14 2016 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Thu Jun 16 10:22:17 2016 +0300 ---------------------------------------------------------------------- .../catalog/SpecParameterParsingTest.java | 16 +++++++++++----- .../core/entity/DynamicEntityTypeConfigTest.java | 1 + .../brooklyn/core/entity/EntityConfigTest.java | 2 +- .../objs/BasicSpecParameterFromClassTest.java | 19 ++++++++++++++++--- 4 files changed, 29 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/882dbba3/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterParsingTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterParsingTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterParsingTest.java index ffb78d1..6ecfcd8 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterParsingTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterParsingTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import java.util.List; +import java.util.Set; import org.apache.brooklyn.api.catalog.CatalogItem; import org.apache.brooklyn.api.entity.EntitySpec; @@ -30,6 +31,9 @@ import org.apache.brooklyn.api.internal.AbstractBrooklynObjectSpec; import org.apache.brooklyn.api.objs.SpecParameter; import org.apache.brooklyn.api.typereg.RegisteredType; import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; +import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.entity.AbstractEntity; +import org.apache.brooklyn.core.objs.BasicSpecParameter; import org.apache.brooklyn.entity.stock.BasicApplication; import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.osgi.OsgiTestResources; @@ -38,6 +42,7 @@ import org.testng.annotations.Test; import com.google.common.base.Function; import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.reflect.TypeToken; @@ -127,11 +132,12 @@ public class SpecParameterParsingTest extends AbstractYamlTest { AbstractBrooklynObjectSpec<?,?> spec = createSpec(item); List<SpecParameter<?>> inputs = spec.getParameters(); if (inputs.isEmpty()) Assert.fail("no inputs (if you're in the IDE, mvn clean install may need to be run to rebuild osgi test JARs)"); - assertEquals(inputs.size(), 1); - SpecParameter<?> input = inputs.get(0); - assertEquals(input.getLabel(), "more_config"); - assertFalse(input.isPinned()); - assertEquals(input.getConfigKey().getName(), "more_config"); + + Set<SpecParameter<?>> actual = ImmutableSet.copyOf(inputs); + Set<SpecParameter<?>> expected = ImmutableSet.<SpecParameter<?>>of( + new BasicSpecParameter<>("more_config", false, ConfigKeys.newStringConfigKey("more_config")), + new BasicSpecParameter<>(AbstractEntity.DEFAULT_DISPLAY_NAME.getName(), false, AbstractEntity.DEFAULT_DISPLAY_NAME)); + assertEquals(actual, expected); } private String add(String... def) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/882dbba3/core/src/test/java/org/apache/brooklyn/core/entity/DynamicEntityTypeConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/DynamicEntityTypeConfigTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/DynamicEntityTypeConfigTest.java index ca71d15..8cb9181 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/DynamicEntityTypeConfigTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/DynamicEntityTypeConfigTest.java @@ -63,6 +63,7 @@ public class DynamicEntityTypeConfigTest extends BrooklynAppUnitTestSupport { ConfigEntityForTesting.INSTALL_UNIQUE_LABEL, ConfigEntityForTestingImpl.PRE_INSTALL_COMMAND, ConfigEntityForTestingImpl.POST_INSTALL_COMMAND, + AbstractEntity. DEFAULT_DISPLAY_NAME, SPEC_CONFIG); @BeforeMethod(alwaysRun=true) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/882dbba3/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigTest.java index 76d38e4..6fad5ea 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigTest.java @@ -274,7 +274,7 @@ public class EntityConfigTest extends BrooklynAppUnitTestSupport { public void testGetConfigKeysReturnsFromSuperAndInterfacesAndSubClass() throws Exception { MySubEntity entity = app.addChild(EntitySpec.create(MySubEntity.class)); assertEquals(entity.getEntityType().getConfigKeys(), ImmutableSet.of( - MySubEntity.SUPER_KEY_1, MySubEntity.SUPER_KEY_2, MySubEntity.SUB_KEY_2, MySubEntity.INTERFACE_KEY_1)); + MySubEntity.SUPER_KEY_1, MySubEntity.SUPER_KEY_2, MySubEntity.SUB_KEY_2, MySubEntity.INTERFACE_KEY_1, AbstractEntity.DEFAULT_DISPLAY_NAME)); } @Test http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/882dbba3/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java b/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java index 30745f0..be91c27 100644 --- a/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromClassTest.java @@ -19,8 +19,11 @@ package org.apache.brooklyn.core.objs; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.brooklyn.api.catalog.CatalogConfig; import org.apache.brooklyn.api.entity.Entity; @@ -34,8 +37,10 @@ import org.apache.brooklyn.core.entity.BrooklynConfigKeys; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import org.testng.collections.Sets; import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeToken; public class BasicSpecParameterFromClassTest { @@ -94,10 +99,18 @@ public class BasicSpecParameterFromClassTest { @Test public void testConfigInImplVisible() { + Map<String, ConfigKey<?>> expectedKeys = ImmutableMap.<String, ConfigKey<?>>of( + ConfigInImplParameterTestEntityImpl.SUGGESTED_VERSION.getName(), + ConfigInImplParameterTestEntityImpl.SUGGESTED_VERSION, + AbstractEntity.DEFAULT_DISPLAY_NAME.getName(), + AbstractEntity.DEFAULT_DISPLAY_NAME); List<SpecParameter<?>> inputs = BasicSpecParameter.fromClass(mgmt, ConfigInImplParameterTestEntity.class); - assertEquals(inputs.size(), 1); - ConfigKey<String> key = ConfigInImplParameterTestEntityImpl.SUGGESTED_VERSION; - assertInput(inputs.get(0), key.getName(), false, key); + assertEquals(inputs.size(), expectedKeys.size()); + for (SpecParameter<?> in : inputs) { + ConfigKey<?> key = expectedKeys.get(in.getConfigKey().getName()); + assertNotNull(key); + assertInput(in, key.getName(), false, key); + } } private void assertInput(SpecParameter<?> input, String label, boolean pinned, ConfigKey<?> type) {
