Add TestResourceUnavailable check in 2 new tests Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a92ff140 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a92ff140 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a92ff140
Branch: refs/heads/master Commit: a92ff140c69c2ae502e3c77ce0f4ac5f4de29888 Parents: 3650dfa Author: Richard Downer <[email protected]> Authored: Tue Jun 23 13:09:15 2015 +0100 Committer: Richard Downer <[email protected]> Committed: Tue Jun 23 13:09:15 2015 +0100 ---------------------------------------------------------------------- .../entity/rebind/persister/XmlMementoSerializerTest.java | 3 +++ .../io/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java | 2 ++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a92ff140/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java index 0aeaa86..7f0f3c9 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java @@ -30,6 +30,8 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; +import brooklyn.management.osgi.OsgiTestResources; +import brooklyn.test.TestResourceUnavailableException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -212,6 +214,7 @@ public class XmlMementoSerializerTest { @Test public void testEntitySpecFromOsgi() throws Exception { + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiTestResources.BROOKLYN_TEST_MORE_ENTITIES_V1_PATH); ManagementContext mgmt = LocalManagementContextForTests.builder(true).disableOsgi(false).build(); try { CatalogItem<?, ?> ci = OsgiVersionMoreEntityTest.addMoreEntityV1(mgmt, "1.0"); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a92ff140/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java index 44ea9a8..4de4cf1 100644 --- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java +++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java @@ -18,6 +18,7 @@ */ package io.brooklyn.camp.brooklyn.catalog; +import brooklyn.test.TestResourceUnavailableException; import io.brooklyn.camp.brooklyn.AbstractYamlTest; import java.io.File; @@ -79,6 +80,7 @@ public class AbstractCatalogXmlTest extends AbstractYamlTest { } private File createJar(ResourceUtils ru) { + TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_PATH); File tmpJar = Os.newTempFile("osgi-entities-", ".jar"); InputStream in = ru.getResourceFromUrl("classpath://" + OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_PATH); copy(in, tmpJar);
