commit 1ccdef868ae798add88f51e269df87c01bd8544f
author Richard Downer <richard@apache.org> Wed Mar 30 12:24:45 2016 +0100
committer Richard Downer <richard@apache.org> Wed Mar 30 15:07:37 2016 +0000
tree bed844136f413ae1b3857d9a3144669be71f2886
parent 2bc65e34e4b0d72e4f4a5f9759a4092d72d822d0

Fix test dependencies on binary resources

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 cfa88d4..9c3f511 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
@@ -822,6 +822,7 @@
     }
     
     private void addCatalogOSGiEntity(String symbolicName, String serviceType, boolean extraLib) {
+        TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
         addCatalogItems(
             "brooklyn.catalog:",
             "  id: " + symbolicName,
@@ -837,6 +838,7 @@
     }
 
     private void addCatalogOSGiEntities(String ...namesAndTypes) {
+        TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
         List<String> lines = MutableList.of(
             "brooklyn.catalog:",
             "  name: My Catalog App",
@@ -857,6 +859,7 @@
         addCatalogItems(lines);
     }
     private void addCatalogChildOSGiEntityWithServicesBlock(String symbolicName, String serviceType) {
+        TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
         addCatalogItems(
             "brooklyn.catalog:",
             "  id: " + symbolicName,
@@ -873,6 +876,7 @@
             "      - type: " + serviceType);
     }
     private void addCatalogChildOSGiEntity(String symbolicName, String serviceType) {
+        TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
         addCatalogItems(
             "brooklyn.catalog:",
             "  id: " + symbolicName,