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/04/28 16:32:30 UTC
[1/5] brooklyn-server git commit: CompositeEffector: improve test
coverage
Repository: brooklyn-server
Updated Branches:
refs/heads/master f4999be95 -> 259d88e6f
CompositeEffector: improve test coverage
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e33140ec
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e33140ec
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e33140ec
Branch: refs/heads/master
Commit: e33140ecbe7482332d6b70998782a4c444a8a5b3
Parents: 3ac709b
Author: Aled Sage <al...@gmail.com>
Authored: Thu Apr 27 13:45:41 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Apr 27 13:46:43 2017 +0100
----------------------------------------------------------------------
.../CompositeEffectorYamlRebindTest.java | 26 +++++++++++++-------
.../brooklyn/core/test/entity/TestEntity.java | 2 ++
.../core/test/entity/TestEntityImpl.java | 5 ++++
3 files changed, 24 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e33140ec/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlRebindTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlRebindTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlRebindTest.java
index 1f33c78..16e2052 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlRebindTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlRebindTest.java
@@ -21,8 +21,6 @@ package org.apache.brooklyn.camp.brooklyn;
import static org.apache.brooklyn.test.Asserts.assertFalse;
import static org.testng.Assert.assertEquals;
-import java.util.List;
-
import org.apache.brooklyn.api.effector.Effector;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.core.effector.CompositeEffector;
@@ -32,12 +30,14 @@ import org.apache.brooklyn.core.entity.EntityPredicates;
import org.apache.brooklyn.core.entity.StartableApplication;
import org.apache.brooklyn.core.test.entity.TestEntity;
import org.apache.brooklyn.test.http.TestHttpServer;
+import org.apache.brooklyn.util.collections.MutableList;
import org.apache.brooklyn.util.guava.Maybe;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
@@ -59,7 +59,7 @@ public class CompositeEffectorYamlRebindTest extends AbstractYamlRebindTest {
" brooklyn.initializers:",
" - type: " + HttpCommandEffector.class.getName(),
" brooklyn.config:",
- " name: myEffector",
+ " name: httpEffector",
" description: myDescription",
" uri: ${serverUrl}/get?id=myId",
" httpVerb: GET",
@@ -70,6 +70,7 @@ public class CompositeEffectorYamlRebindTest extends AbstractYamlRebindTest {
" name: start",
" override: true",
" effectors:",
+ " - httpEffector",
" - myEffector"
);
@@ -103,16 +104,23 @@ public class CompositeEffectorYamlRebindTest extends AbstractYamlRebindTest {
String appYaml = Joiner.on("\n").join(
"services: ",
"- type: " + appId);
- createStartWaitAndLogApplication(appYaml);
-
+ Entity app = createStartWaitAndLogApplication(appYaml);
+ TestEntity entity = (TestEntity) Iterables.find(app.getChildren(), EntityPredicates.displayNameEqualTo("targetEntity"));
+
+ // start was overridden, so java method not called; but composite will have called "testEntity.myEffector"
+ assertEquals(entity.getCallHistory(), ImmutableList.of("myEffector"));
+ entity.clearCallHistory();
+
// Rebind
StartableApplication newApp = rebind();
- TestEntity testEntity = (TestEntity) Iterables.find(newApp.getChildren(), EntityPredicates.displayNameEqualTo("targetEntity"));
- Effector effector = assertHasInitializers(testEntity, "start");
+ TestEntity newEntity = (TestEntity) Iterables.find(newApp.getChildren(), EntityPredicates.displayNameEqualTo("targetEntity"));
+ Effector<?> effector = assertHasInitializers(newEntity, "start");
// Confirm HttpCommandEffector still functions
- Object results = testEntity.invoke(effector, ImmutableMap.<String, Object>of()).get();
- assertEquals(((List<Object>)results).get(0), "myId");
+ Object results = newEntity.invoke(effector, ImmutableMap.<String, Object>of()).get();
+ assertEquals(results, MutableList.of("myId", null));
+
+ assertEquals(newEntity.getCallHistory(), ImmutableList.of("myEffector"));
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e33140ec/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java
index 7a29c1a..85cc9e2 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java
@@ -124,6 +124,8 @@ public interface TestEntity extends Entity, Startable, EntityLocal, EntityIntern
public List<String> getCallHistory();
+ public void clearCallHistory();
+
public String getMyField();
public String getMyField2();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e33140ec/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntityImpl.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntityImpl.java b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntityImpl.java
index 7a2c813..b31caf2 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntityImpl.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntityImpl.java
@@ -206,6 +206,11 @@ public class TestEntityImpl extends AbstractEntity implements TestEntity {
return callHistory;
}
+ @Override
+ public void clearCallHistory() {
+ callHistory.clear();;
+ }
+
public static class TestEntityWithoutEnrichers extends TestEntityImpl {
@Override
protected void initEnrichers() {}
[4/5] brooklyn-server git commit: This closes #656
Posted by he...@apache.org.
This closes #656
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/05c69ebf
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/05c69ebf
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/05c69ebf
Branch: refs/heads/master
Commit: 05c69ebf227141f89c67e753583f877d7a0cbf1d
Parents: f4999be e33140e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Apr 28 17:32:04 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Apr 28 17:32:04 2017 +0100
----------------------------------------------------------------------
.../CompositeEffectorYamlRebindTest.java | 26 +++++++++++++-------
.../core/effector/CompositeEffector.java | 16 ++++++++----
.../CompositeEffectorIntegrationTest.java | 3 ++-
.../core/effector/CompositeEffectorTest.java | 19 ++++++++------
.../brooklyn/core/test/entity/TestEntity.java | 2 ++
.../core/test/entity/TestEntityImpl.java | 5 ++++
6 files changed, 48 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
[2/5] brooklyn-server git commit: CompositeEffector: code tidy
Posted by he...@apache.org.
CompositeEffector: code tidy
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3ac709b5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3ac709b5
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3ac709b5
Branch: refs/heads/master
Commit: 3ac709b512a09e99ea45b88d8e53abd96b6e6292
Parents: 01141a7
Author: Aled Sage <al...@gmail.com>
Authored: Thu Apr 27 13:42:53 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Apr 27 13:46:43 2017 +0100
----------------------------------------------------------------------
.../core/effector/CompositeEffector.java | 16 +++++++++++-----
.../CompositeEffectorIntegrationTest.java | 3 ++-
.../core/effector/CompositeEffectorTest.java | 19 +++++++++++--------
3 files changed, 24 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3ac709b5/core/src/main/java/org/apache/brooklyn/core/effector/CompositeEffector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/effector/CompositeEffector.java b/core/src/main/java/org/apache/brooklyn/core/effector/CompositeEffector.java
index 5345b4a..62a5984 100644
--- a/core/src/main/java/org/apache/brooklyn/core/effector/CompositeEffector.java
+++ b/core/src/main/java/org/apache/brooklyn/core/effector/CompositeEffector.java
@@ -48,11 +48,17 @@ public class CompositeEffector extends AddEffector {
private static final Logger LOG = LoggerFactory.getLogger(CompositeEffector.class);
private static final String ORIGINAL_PREFIX = "original-";
- public static final ConfigKey<List<String>> EFFECTORS = ConfigKeys.newConfigKey(new TypeToken<List<String>>() {
- }, "effectors",
- "Effector names to be chained together in the composite effector", ImmutableList.<String>of());
- public static final ConfigKey<Boolean> OVERRIDE = ConfigKeys.newBooleanConfigKey("override",
- "Wheter additional defined effectors should override pre-existing effector with same name or not (default: false)", Boolean.FALSE);
+ @SuppressWarnings("serial")
+ public static final ConfigKey<List<String>> EFFECTORS = ConfigKeys.newConfigKey(
+ new TypeToken<List<String>>() {},
+ "effectors",
+ "Effector names to be chained together in the composite effector",
+ ImmutableList.<String>of());
+
+ public static final ConfigKey<Boolean> OVERRIDE = ConfigKeys.newBooleanConfigKey(
+ "override",
+ "Wheter additional defined effectors should override pre-existing effector with same name or not (default: false)",
+ Boolean.FALSE);
public CompositeEffector(ConfigBag params) {
super(newEffectorBuilder(params).build());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3ac709b5/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorIntegrationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorIntegrationTest.java
index dd168ed..2134d9b 100644
--- a/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorIntegrationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorIntegrationTest.java
@@ -42,6 +42,7 @@ import com.google.common.collect.ImmutableList;
public class CompositeEffectorIntegrationTest {
+ @SuppressWarnings("rawtypes")
final static Effector<List> EFFECTOR_START = Effectors.effector(List.class, "start").buildAbstract();
private TestApplication app;
@@ -78,7 +79,7 @@ public class CompositeEffectorIntegrationTest {
.configure(CompositeEffector.EFFECTORS, ImmutableList.of("eff1", "eff2")))
.apply(entity);
- List<Object> results = entity.invoke(EFFECTOR_START, MutableMap.<String,String>of()).get();
+ List<?> results = entity.invoke(EFFECTOR_START, MutableMap.<String,String>of()).get();
assertEquals(results.size(), 3);
assertNull(results.get(0));
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3ac709b5/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorTest.java b/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorTest.java
index 3bf0018..3309441 100644
--- a/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/effector/CompositeEffectorTest.java
@@ -53,10 +53,13 @@ import com.google.mockwebserver.MockResponse;
public class CompositeEffectorTest extends BrooklynAppUnitTestSupport {
+ @SuppressWarnings("unused")
private static final Logger log = LoggerFactory.getLogger(CompositeEffectorTest.class);
+
private static final String DEFAULT_ENDPOINT = "/";
- final static Effector<List> EFFECTOR_COMPOSITE = Effectors.effector(List.class, "CompositeEffector").buildAbstract();
+ @SuppressWarnings("rawtypes")
+ static final Effector<List> EFFECTOR_COMPOSITE = Effectors.effector(List.class, "CompositeEffector").buildAbstract();
protected BetterMockWebServer server;
protected URL baseUrl;
@@ -64,7 +67,7 @@ public class CompositeEffectorTest extends BrooklynAppUnitTestSupport {
protected Location loc;
protected CompositeEffector compositeEffector;
- @BeforeMethod
+ @BeforeMethod(alwaysRun=true)
public void start() throws IOException {
server = BetterMockWebServer.newInstanceLocalhost();
server.play();
@@ -121,7 +124,7 @@ public class CompositeEffectorTest extends BrooklynAppUnitTestSupport {
);
assertNotNull(compositeEffector);
TestEntity testEntity = app.createAndManageChild(buildEntitySpec(httpCommandEffector, compositeEffector));
- List<Object> results = testEntity.invoke(EFFECTOR_COMPOSITE, ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1));
+ List<?> results = testEntity.invoke(EFFECTOR_COMPOSITE, ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1));
Asserts.assertEquals(results.size(), 1);
assertTrue(results.get(0) instanceof String);
@@ -145,7 +148,7 @@ public class CompositeEffectorTest extends BrooklynAppUnitTestSupport {
);
assertNotNull(compositeEffector);
TestEntity testEntity = app.createAndManageChild(buildEntitySpec(httpCommandEffector, compositeEffector));
- List<Object> results = testEntity.invoke(Effectors.effector(List.class, "start").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1));
+ List<?> results = testEntity.invoke(Effectors.effector(List.class, "start").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1));
Asserts.assertEquals(results.size(), 2);
assertNull(results.get(0));
assertTrue(results.get(1) instanceof String);
@@ -170,7 +173,7 @@ public class CompositeEffectorTest extends BrooklynAppUnitTestSupport {
);
assertNotNull(compositeEffector);
TestEntity testEntity = app.createAndManageChild(buildEntitySpec(httpCommandEffector, compositeEffector));
- List<Object> results = testEntity.invoke(Effectors.effector(List.class, "start").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1));
+ List<?> results = testEntity.invoke(Effectors.effector(List.class, "start").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1));
Asserts.assertEquals(results.size(), 1);
assertTrue(results.get(0) instanceof String);
Asserts.assertEquals(results.get(0), "myLogin");
@@ -193,7 +196,7 @@ public class CompositeEffectorTest extends BrooklynAppUnitTestSupport {
);
assertNotNull(compositeEffector);
TestEntity testEntity = app.createAndManageChild(buildEntitySpec(httpCommandEffector, compositeEffector));
- List<Object> results = testEntity.invoke(Effectors.effector(List.class, "stop").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.minutes(1));
+ List<?> results = testEntity.invoke(Effectors.effector(List.class, "stop").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.minutes(1));
Asserts.assertEquals(results.size(), 2);
assertTrue(results.get(0) instanceof String);
Asserts.assertEquals(results.get(0), "myLogin");
@@ -218,7 +221,7 @@ public class CompositeEffectorTest extends BrooklynAppUnitTestSupport {
);
assertNotNull(compositeEffector);
TestEntity testEntity = app.createAndManageChild(buildEntitySpec(httpCommandEffector, compositeEffector));
- List<Object> results = testEntity.invoke(Effectors.effector(List.class, "stop").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.minutes(1));
+ List<?> results = testEntity.invoke(Effectors.effector(List.class, "stop").buildAbstract(), ImmutableMap.<String, Object>of()).getUnchecked(Duration.minutes(1));
Asserts.assertEquals(results.size(), 1);
assertTrue(results.get(0) instanceof String);
Asserts.assertEquals(results.get(0), "myLogin");
@@ -247,7 +250,7 @@ public class CompositeEffectorTest extends BrooklynAppUnitTestSupport {
);
assertNotNull(compositeEffector);
TestEntity testEntity = app.createAndManageChild(buildEntitySpec(eff1, compositeEffector));
- List<Object> results = testEntity.invoke(EFFECTOR_COMPOSITE, ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1));
+ List<?> results = testEntity.invoke(EFFECTOR_COMPOSITE, ImmutableMap.<String, Object>of()).getUnchecked(Duration.seconds(1));
Asserts.assertEquals(results.size(), 2);
}
[3/5] brooklyn-server git commit: Add additional test case for
BROOKLYN-343.
Posted by he...@apache.org.
Add additional test case for BROOKLYN-343.
https://issues.apache.org/jira/browse/BROOKLYN-343
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/38a5a259
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/38a5a259
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/38a5a259
Branch: refs/heads/master
Commit: 38a5a259ce62aaba17da879974c2b367acc0885d
Parents: d05b9fd
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Fri Apr 28 10:01:50 2017 +0100
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Fri Apr 28 10:02:40 2017 +0100
----------------------------------------------------------------------
.../brooklyn/catalog/CatalogYamlEntityTest.java | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/38a5a259/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
index bc9f9ad..0f378ff 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
@@ -544,6 +544,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
}
@Test(groups = "Broken")
+ // See https://issues.apache.org/jira/browse/BROOKLYN-343
public void testSameCatalogReferences() {
addCatalogItems(
"brooklyn.catalog:",
@@ -566,6 +567,26 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
}
@Test
+ public void testSameCatalogReferencesWithoutServices() {
+ addCatalogItems(
+ "brooklyn.catalog:",
+ " items:",
+ " - id: referenced-entity",
+ " item:",
+ " type: " + BasicEntity.class.getName(),
+ " - id: referrer-entity",
+ " item:",
+ " type: " + BasicApplication.class.getName(),
+ " brooklyn.children:",
+ " - type: referenced-entity",
+ " brooklyn.config:",
+ " spec: ",
+ " $brooklyn:entitySpec:",
+ " type: referenced-entity");
+ }
+
+
+ @Test
public void testItemWithBrooklynParameters() throws Exception {
String id = "inline_version.app";
String version = TEST_VERSION;
[5/5] brooklyn-server git commit: This closes #660
Posted by he...@apache.org.
This closes #660
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/259d88e6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/259d88e6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/259d88e6
Branch: refs/heads/master
Commit: 259d88e6f4669bb21d768893ff59ea89579f62eb
Parents: 05c69eb 38a5a25
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Apr 28 17:32:18 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Apr 28 17:32:18 2017 +0100
----------------------------------------------------------------------
.../brooklyn/catalog/CatalogYamlEntityTest.java | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------