You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/09/08 11:17:21 UTC
[1/2] brooklyn-server git commit: Add a couple of tests to further
illustrate possible syntaxes for includes
Repository: brooklyn-server
Updated Branches:
refs/heads/master f97b9eb9b -> 66b9b1c51
Add a couple of tests to further illustrate possible syntaxes for includes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d97a5d78
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d97a5d78
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d97a5d78
Branch: refs/heads/master
Commit: d97a5d78a85229d41e3b90595fd565f1d8ab782a
Parents: f97b9eb
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Thu Sep 8 11:59:57 2016 +0100
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Thu Sep 8 11:59:57 2016 +0100
----------------------------------------------------------------------
.../camp/brooklyn/ReferencedYamlTest.java | 25 +++++++++++++++++
.../src/test/resources/yaml-ref-more.bom | 29 ++++++++++++++++++++
.../src/test/resources/yaml-ref-simple.bom | 29 ++++++++++++++++++++
3 files changed, 83 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d97a5d78/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
index 79402f2..6dcc105 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java
@@ -242,6 +242,31 @@ public class ReferencedYamlTest extends AbstractYamlTest {
}
@Test
+ public void testCatalogReferenceByMultipleUrls() throws Exception {
+ addCatalogItems(
+ "brooklyn.catalog:",
+ " items:",
+ " - include: classpath://yaml-ref-simple.bom",
+ " - include: classpath://yaml-ref-more.bom"
+ );
+
+ assertCatalogReference();
+ }
+
+ @Test
+ public void testCatalogReferenceByMultipleUrlsSimplerSyntax() throws Exception {
+ addCatalogItems(
+ "brooklyn.catalog:",
+ " items:",
+ " - classpath://yaml-ref-simple.bom",
+ " - classpath://yaml-ref-more.bom"
+ );
+
+ assertCatalogReference();
+ }
+
+
+ @Test
public void testCatalogReferenceSeesPreviousItems() throws Exception {
addCatalogItems(
"brooklyn.catalog:",
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d97a5d78/camp/camp-brooklyn/src/test/resources/yaml-ref-more.bom
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/yaml-ref-more.bom b/camp/camp-brooklyn/src/test/resources/yaml-ref-more.bom
new file mode 100644
index 0000000..4610f9c
--- /dev/null
+++ b/camp/camp-brooklyn/src/test/resources/yaml-ref-more.bom
@@ -0,0 +1,29 @@
+# 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
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+brooklyn.catalog:
+ version: 0.1.2
+ itemType: entity
+ displayName: More Entity
+ brooklyn.libraries:
+ - classpath:/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar
+ items:
+ - id: yaml.nested.catalog.more
+ item:
+ type: org.apache.brooklyn.test.osgi.entities.more.MoreEntity
+
+
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d97a5d78/camp/camp-brooklyn/src/test/resources/yaml-ref-simple.bom
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/resources/yaml-ref-simple.bom b/camp/camp-brooklyn/src/test/resources/yaml-ref-simple.bom
new file mode 100644
index 0000000..38993a1
--- /dev/null
+++ b/camp/camp-brooklyn/src/test/resources/yaml-ref-simple.bom
@@ -0,0 +1,29 @@
+# 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
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+brooklyn.catalog:
+ version: 0.1.2
+ itemType: entity
+ displayName: Just Simple
+ brooklyn.libraries:
+ - classpath:/brooklyn/osgi/brooklyn-test-osgi-entities.jar
+ items:
+ - id: yaml.nested.catalog.simple
+ item:
+ type: org.apache.brooklyn.test.osgi.entities.SimpleEntity
+
+
[2/2] brooklyn-server git commit: Closes #324
Posted by sv...@apache.org.
Closes #324
Add a couple of tests to illustrate possible syntaxes for includes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/66b9b1c5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/66b9b1c5
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/66b9b1c5
Branch: refs/heads/master
Commit: 66b9b1c51102f58ee305a8832a177bb7815e31fc
Parents: f97b9eb d97a5d7
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Sep 8 14:17:03 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Sep 8 14:17:03 2016 +0300
----------------------------------------------------------------------
.../camp/brooklyn/ReferencedYamlTest.java | 25 +++++++++++++++++
.../src/test/resources/yaml-ref-more.bom | 29 ++++++++++++++++++++
.../src/test/resources/yaml-ref-simple.bom | 29 ++++++++++++++++++++
3 files changed, 83 insertions(+)
----------------------------------------------------------------------