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:32 UTC
[3/5] brooklyn-server git commit: Add additional test case for
BROOKLYN-343.
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;