brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [9/9] incubator-brooklyn git commit: rest-server/src/test: skip test if binaries absent
Date Tue, 09 Dec 2014 15:48:15 GMT
rest-server/src/test: skip test if binaries absent

Conflicts:
	usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.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/3b2eac0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3b2eac0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3b2eac0d

Branch: refs/heads/0.7.0-M2-incubating
Commit: 3b2eac0df44a8565aa2b4feec546e0a5fb486485
Parents: fcbcc1d
Author: Richard Downer <richard@apache.org>
Authored: Tue Dec 9 11:54:54 2014 +0000
Committer: Richard Downer <richard@apache.org>
Committed: Tue Dec 9 14:40:15 2014 +0000

----------------------------------------------------------------------
 .../test/java/brooklyn/rest/resources/CatalogResourceTest.java  | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3b2eac0d/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java
b/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java
index 8047ef5..0ea47f0 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogResourceTest.java
@@ -31,6 +31,7 @@ import java.util.Set;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import brooklyn.test.TestResourceUnavailableException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
@@ -69,6 +70,8 @@ public class CatalogResourceTest extends BrooklynRestResourceTest {
   @Test
   /** based on CampYamlLiteTest */
   public void testRegisterCustomEntityWithBundleWhereEntityIsFromCoreAndIconFromBundle()
{
+    TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
     String registeredTypeName = "my.catalog.entity.id";
     String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL;
     String yaml =
@@ -119,6 +122,8 @@ public class CatalogResourceTest extends BrooklynRestResourceTest {
 
   @Test
   public void testRegisterOSGiPolicy() {
+    TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
     String registeredTypeName = "my.catalog.policy.id";
     String policyType = "brooklyn.osgi.tests.SimplePolicy";
     String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL;


Mime
View raw message