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 2014/07/18 18:34:16 UTC
[07/13] git commit: add an initializer for adding tags, with a test
add an initializer for adding tags, with a test
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1a294f76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1a294f76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1a294f76
Branch: refs/heads/master
Commit: 1a294f76a1e955582c5dc4d7c99526b60afef421
Parents: 78da216
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Jul 18 12:25:48 2014 -0400
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Jul 18 12:26:20 2014 -0400
----------------------------------------------------------------------
.../entity/basic/EntityInitializers.java | 30 ++++++++++++++++++++
.../brooklyn/entity/basic/EntitiesTest.java | 6 ++--
.../test/java/brooklyn/util/net/UrlsTest.java | 5 ++++
3 files changed, 39 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1a294f76/core/src/main/java/brooklyn/entity/basic/EntityInitializers.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityInitializers.java b/core/src/main/java/brooklyn/entity/basic/EntityInitializers.java
new file mode 100644
index 0000000..62db62e
--- /dev/null
+++ b/core/src/main/java/brooklyn/entity/basic/EntityInitializers.java
@@ -0,0 +1,30 @@
+package brooklyn.entity.basic;
+
+import java.util.List;
+
+import brooklyn.entity.proxying.EntityInitializer;
+
+import com.google.common.collect.ImmutableList;
+
+public class EntityInitializers {
+
+ public static class AddTags implements EntityInitializer {
+ public final List<Object> tags;
+
+ public AddTags(Object... tags) {
+ this.tags = ImmutableList.copyOf(tags);
+ }
+
+ @Override
+ public void apply(EntityLocal entity) {
+ for (Object tag: tags)
+ entity.addTag(tag);
+ }
+ }
+
+
+ public static EntityInitializer addingTags(Object... tags) {
+ return new AddTags(tags);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1a294f76/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java
index 3f72388..8acdf72 100644
--- a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java
+++ b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java
@@ -106,7 +106,9 @@ public class EntitiesTest extends BrooklynAppUnitTestSupport {
@Test
public void testCreateGetContainsAndRemoveTags() throws Exception {
- entity.addTag("foo");
+ entity = app.createAndManageChild(EntitySpec.create(TestEntity.class)
+ .addInitializer(EntityInitializers.addingTags("foo")));
+
entity.addTag(app);
Assert.assertTrue(entity.containsTag("foo"));
@@ -122,5 +124,5 @@ public class EntitiesTest extends BrooklynAppUnitTestSupport {
Assert.assertEquals(entity.getTags(), MutableSet.of(app));
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1a294f76/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java b/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java
index 017ad3d..d0a615c 100644
--- a/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java
@@ -43,6 +43,11 @@ public class UrlsTest {
}
@Test
+ public void testPathEncode() throws Exception {
+ assertEquals(Urls.encode("name_with/%!"), "name_with%2F%25%21");
+ }
+
+ @Test
public void testIsUrlWithProtocol() {
Assert.assertTrue(Urls.isUrlWithProtocol("http://localhost/"));
Assert.assertTrue(Urls.isUrlWithProtocol("protocol:"));