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/07/09 22:39:33 UTC
[1/2] git commit: Fix CAMP tests: yaml was not a freemarker template
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master aa4d1506a -> c008f296e
Fix CAMP tests: yaml was not a freemarker template
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/23534a34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/23534a34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/23534a34
Branch: refs/heads/master
Commit: 23534a34ee72ec8ccc069ca6a6ddaee8dd6c1adf
Parents: 0d1780e
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jul 9 21:12:16 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 9 21:37:59 2014 +0100
----------------------------------------------------------------------
.../camp/brooklyn/DslAndRebindYamlTest.java | 8 ++++----
.../io/brooklyn/camp/brooklyn/EntitiesYamlTest.java | 16 ++++++++--------
.../test/resources/test-entity-basic-template.yaml | 2 --
3 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/23534a34/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java
index 16f98bc..73769a9 100644
--- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java
+++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/DslAndRebindYamlTest.java
@@ -86,7 +86,7 @@ public class DslAndRebindYamlTest extends AbstractYamlTest {
}
- protected Entity setupAndCheckTestEntityInBasicTemplateWith(String ...extras) throws Exception {
+ protected Entity setupAndCheckTestEntityInBasicYamlWith(String ...extras) throws Exception {
Entity app = createAndStartApplication("test-entity-basic-template.yaml", extras);
waitForApplicationTasks(app);
@@ -129,7 +129,7 @@ public class DslAndRebindYamlTest extends AbstractYamlTest {
}
private Entity entityWithAttributeWhenReady() throws Exception {
- return setupAndCheckTestEntityInBasicTemplateWith(
+ return setupAndCheckTestEntityInBasicYamlWith(
" id: x",
" brooklyn.config:",
" test.confName: $brooklyn:component(\"x\").attributeWhenReady(\"foo\")");
@@ -152,7 +152,7 @@ public class DslAndRebindYamlTest extends AbstractYamlTest {
}
private Entity entityWithConfigFromRoot() throws Exception {
- return setupAndCheckTestEntityInBasicTemplateWith(
+ return setupAndCheckTestEntityInBasicYamlWith(
" id: x",
" brooklyn.config:",
" test.confName: $brooklyn:component(\"x\").config(\"foo\")",
@@ -177,7 +177,7 @@ public class DslAndRebindYamlTest extends AbstractYamlTest {
}
private Entity entityWithFormatString() throws Exception {
- return setupAndCheckTestEntityInBasicTemplateWith(
+ return setupAndCheckTestEntityInBasicYamlWith(
" id: x",
" brooklyn.config:",
" test.confName: $brooklyn:formatString(\"hello %s\", \"world\")");
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/23534a34/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/EntitiesYamlTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/EntitiesYamlTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/EntitiesYamlTest.java
index 97caf42..b5b1c05 100644
--- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/EntitiesYamlTest.java
+++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/EntitiesYamlTest.java
@@ -67,7 +67,7 @@ import com.google.common.collect.Iterables;
public class EntitiesYamlTest extends AbstractYamlTest {
private static final Logger log = LoggerFactory.getLogger(EntitiesYamlTest.class);
- protected Entity setupAndCheckTestEntityInBasicTemplateWith(String ...extras) throws Exception {
+ protected Entity setupAndCheckTestEntityInBasicYamlWith(String ...extras) throws Exception {
Entity app = createAndStartApplication("test-entity-basic-template.yaml", extras);
waitForApplicationTasks(app);
@@ -85,13 +85,13 @@ public class EntitiesYamlTest extends AbstractYamlTest {
@Test
public void testSingleEntity() throws Exception {
- setupAndCheckTestEntityInBasicTemplateWith();
+ setupAndCheckTestEntityInBasicYamlWith();
}
@SuppressWarnings("unchecked")
@Test
public void testBrooklynConfig() throws Exception {
- Entity testEntity = setupAndCheckTestEntityInBasicTemplateWith(
+ Entity testEntity = setupAndCheckTestEntityInBasicYamlWith(
" brooklyn.config:",
" test.confName: Test Entity Name",
" test.confMapPlain:",
@@ -120,7 +120,7 @@ public class EntitiesYamlTest extends AbstractYamlTest {
@Test
public void testFlagInBrooklynConfig() throws Exception {
- Entity testEntity = setupAndCheckTestEntityInBasicTemplateWith(
+ Entity testEntity = setupAndCheckTestEntityInBasicYamlWith(
" brooklyn.config:",
" confName: Foo Bar");
Assert.assertEquals(testEntity.getConfig(TestEntity.CONF_NAME), "Foo Bar");
@@ -128,7 +128,7 @@ public class EntitiesYamlTest extends AbstractYamlTest {
@Test
public void testUndeclaredItemInBrooklynConfig() throws Exception {
- Entity testEntity = setupAndCheckTestEntityInBasicTemplateWith(
+ Entity testEntity = setupAndCheckTestEntityInBasicYamlWith(
" brooklyn.config:",
" test.dynamic.confName: Foo Bar");
Assert.assertEquals(testEntity.getConfig(ConfigKeys.newStringConfigKey("test.dynamic.confName")), "Foo Bar");
@@ -136,21 +136,21 @@ public class EntitiesYamlTest extends AbstractYamlTest {
@Test
public void testFlagAtRoot() throws Exception {
- Entity testEntity = setupAndCheckTestEntityInBasicTemplateWith(
+ Entity testEntity = setupAndCheckTestEntityInBasicYamlWith(
" confName: Foo Bar");
Assert.assertEquals(testEntity.getConfig(TestEntity.CONF_NAME), "Foo Bar");
}
@Test
public void testConfigKeyAtRoot() throws Exception {
- Entity testEntity = setupAndCheckTestEntityInBasicTemplateWith(
+ Entity testEntity = setupAndCheckTestEntityInBasicYamlWith(
" test.confName: Foo Bar");
Assert.assertEquals(testEntity.getConfig(TestEntity.CONF_NAME), "Foo Bar");
}
@Test
public void testUndeclaredItemAtRootIgnored() throws Exception {
- Entity testEntity = setupAndCheckTestEntityInBasicTemplateWith(
+ Entity testEntity = setupAndCheckTestEntityInBasicYamlWith(
" test.dynamic.confName: Foo Bar");
// should NOT be set (and there should be a warning in the log)
String dynamicConfNameValue = testEntity.getConfig(ConfigKeys.newStringConfigKey("test.dynamic.confName"));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/23534a34/usage/camp/src/test/resources/test-entity-basic-template.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/test-entity-basic-template.yaml b/usage/camp/src/test/resources/test-entity-basic-template.yaml
index 7e31473..af9031f 100644
--- a/usage/camp/src/test/resources/test-entity-basic-template.yaml
+++ b/usage/camp/src/test/resources/test-entity-basic-template.yaml
@@ -1,5 +1,3 @@
-[#ftl]
-#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
[2/2] git commit: This closes #59
Posted by al...@apache.org.
This closes #59
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c008f296
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c008f296
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c008f296
Branch: refs/heads/master
Commit: c008f296e2e359c357b0ed5844bde3eac99562f2
Parents: aa4d150 23534a3
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jul 9 21:39:20 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 9 21:39:20 2014 +0100
----------------------------------------------------------------------
.../camp/brooklyn/DslAndRebindYamlTest.java | 8 ++++----
.../io/brooklyn/camp/brooklyn/EntitiesYamlTest.java | 16 ++++++++--------
.../test/resources/test-entity-basic-template.yaml | 2 --
3 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------