You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/12/09 16:48:10 UTC
[4/9] incubator-brooklyn git commit: CampYamlLiteTest: skip tests if
binaries absent
CampYamlLiteTest: skip tests if binaries absent
Conflicts:
core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/232d3114
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/232d3114
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/232d3114
Branch: refs/heads/0.7.0-M2-incubating
Commit: 232d311485118f4d74ce59bb526544f3d6efec76
Parents: 9980f85
Author: Richard Downer <ri...@apache.org>
Authored: Tue Dec 9 10:50:39 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Dec 9 14:34:09 2014 +0000
----------------------------------------------------------------------
core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/232d3114/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java b/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java
index e952f00..6d1746e 100644
--- a/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java
+++ b/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java
@@ -20,6 +20,8 @@ package brooklyn.camp.lite;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
+
+import brooklyn.test.TestResourceUnavailableException;
import io.brooklyn.camp.spi.Assembly;
import io.brooklyn.camp.spi.AssemblyTemplate;
import io.brooklyn.camp.spi.pdp.PdpYamlTest;
@@ -152,6 +154,8 @@ public class CampYamlLiteTest {
@Test
public void testYamlServiceForCatalog() {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
CatalogItem<?, ?> realItem = mgmt.getCatalog().addItem(Streams.readFullyString(getClass().getResourceAsStream("test-app-service-blueprint.yaml")));
Iterable<CatalogItem<Object, Object>> retrievedItems = mgmt.getCatalog()
.getCatalogItems(CatalogPredicates.registeredType(Predicates.equalTo("catalog-name")));
@@ -173,6 +177,8 @@ public class CampYamlLiteTest {
@Test
public void testRegisterCustomEntityWithBundleWhereEntityIsFromCoreAndIconFromBundle() throws IOException {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String registeredTypeName = "my.catalog.app.id";
String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL;
String yaml = getSampleMyCatalogAppYaml(registeredTypeName, bundleUrl);
@@ -184,6 +190,8 @@ public class CampYamlLiteTest {
@Test
public void testResetXmlWithCustomEntity() throws IOException {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String registeredTypeName = "my.catalog.app.id";
String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL;
String yaml = getSampleMyCatalogAppYaml(registeredTypeName, bundleUrl);