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 15:15:27 UTC
[3/4] incubator-brooklyn git commit: rest-server/src/test: skip test
if binaries absent
rest-server/src/test: skip test if binaries absent
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/bb4b90d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/bb4b90d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/bb4b90d4
Branch: refs/heads/master
Commit: bb4b90d4d994f6ce4ab926743b88663bb3f2355c
Parents: 7e7196e
Author: Richard Downer <ri...@apache.org>
Authored: Tue Dec 9 11:54:54 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Dec 9 11:54:54 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/bb4b90d4/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 8e358e1..049a0fa 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
@@ -32,6 +32,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;
@@ -74,6 +75,8 @@ public class CatalogResourceTest extends BrooklynRestResourceTest {
@Test
/** based on CampYamlLiteTest */
public void testRegisterCustomEntityWithBundleWhereEntityIsFromCoreAndIconFromBundle() {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String symbolicName = "my.catalog.entity.id";
String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL;
String yaml =
@@ -123,6 +126,8 @@ public class CatalogResourceTest extends BrooklynRestResourceTest {
@Test
public void testRegisterOSGiPolicy() {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String symbolicName = "my.catalog.policy.id";
String policyType = "brooklyn.osgi.tests.SimplePolicy";
String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL;