You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/09/19 18:10:13 UTC
[1/2] git commit: Added comments as per @aledsage's PR comments
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master c9fe10e4c -> d3d2abd0f
Added comments as per @aledsage's PR comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/df54e29f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/df54e29f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/df54e29f
Branch: refs/heads/master
Commit: df54e29faef1d5c574f102ea42aae631a843822e
Parents: 3c68339
Author: Martin Harris <gi...@nakomis.com>
Authored: Fri Sep 19 15:02:05 2014 +0100
Committer: Martin Harris <gi...@nakomis.com>
Committed: Fri Sep 19 15:02:05 2014 +0100
----------------------------------------------------------------------
core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java | 1 +
.../entity/proxy/nginx/NginxUrlMappingIntegrationTest.java | 1 +
.../common/src/test/java/brooklyn/util/guava/IfFunctionsTest.java | 2 ++
3 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/df54e29f/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java b/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java
index 0a0adc3..c36c239 100644
--- a/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java
+++ b/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java
@@ -266,6 +266,7 @@ public class LocalEntitiesTest extends BrooklynAppUnitTestSupport {
app.setConfig(HelloEntity.MY_NAME, "Bob");
HelloEntity dad = app.createAndManageChild(EntitySpec.create(HelloEntity.class));
+ // the unnecessary (HelloEntity) cast is required as a work-around to an IntelliJ issue that prevents Brooklyn from launching from the IDE
HelloEntity son = (HelloEntity)entityManager.createEntity(EntitySpec.create(HelloEntity.class)
.parent(dad)
.configure(HelloEntity.MY_NAME, transform(attributeWhenReady(dad, HelloEntity.FAVOURITE_NAME, (Closure)null), new Function<String,String>() {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/df54e29f/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java
index aa7abc2..2ed881e 100644
--- a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java
@@ -417,6 +417,7 @@ public class NginxUrlMappingIntegrationTest extends BrooklynAppLiveTestSupport {
c1.resize(2);
List c1jbosses = new ArrayList(c1.getMembers());
c1jbosses.remove(c1jboss);
+ // the unnecessary (Entity) cast is required as a work-around to an IntelliJ issue that prevents Brooklyn from launching from the IDE
Entity c1jboss2 = (Entity)Iterables.getOnlyElement(c1jbosses);
// TODO Have to wait for new app-server; should fix app-servers to block
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/df54e29f/utils/common/src/test/java/brooklyn/util/guava/IfFunctionsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/guava/IfFunctionsTest.java b/utils/common/src/test/java/brooklyn/util/guava/IfFunctionsTest.java
index 0d3f1a4..3e88d6c 100644
--- a/utils/common/src/test/java/brooklyn/util/guava/IfFunctionsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/guava/IfFunctionsTest.java
@@ -41,6 +41,8 @@ public class IfFunctionsTest {
@Test
public void testPredicateAndSupplier() {
+ // we cannot use checkTF here as an IntelliJ issues causes the project to fail to launch as IntelliJ does not
+ // recognize the return value of IfFunctions.ifPredicate as Function<Boolean, String>
Function function = IfFunctions.ifPredicate(Predicates.equalTo(false)).get(Suppliers.ofInstance("F"))
.ifEquals(true).value("T").defaultGet(Suppliers.ofInstance("?")).build();
Assert.assertEquals(function.apply(true), "T");
[2/2] git commit: This closes #180
Posted by al...@apache.org.
This closes #180
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d3d2abd0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d3d2abd0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d3d2abd0
Branch: refs/heads/master
Commit: d3d2abd0fd1c348a27de15e762c128dcb74a8d38
Parents: c9fe10e df54e29
Author: Aled Sage <al...@gmail.com>
Authored: Fri Sep 19 17:09:56 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Sep 19 17:09:56 2014 +0100
----------------------------------------------------------------------
core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java | 1 +
.../entity/proxy/nginx/NginxUrlMappingIntegrationTest.java | 1 +
.../common/src/test/java/brooklyn/util/guava/IfFunctionsTest.java | 2 ++
3 files changed, 4 insertions(+)
----------------------------------------------------------------------