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:25 UTC
[1/4] incubator-brooklyn git commit: CampYamlLiteTest: skip tests if
binaries absent
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 566fd49ab -> f365b9b22
CampYamlLiteTest: skip tests 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/8178a7f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8178a7f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8178a7f9
Branch: refs/heads/master
Commit: 8178a7f9a3f8ebf9f44ea1dcc97e3f67a4f0b3bd
Parents: 404f145
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 10:50:39 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/8178a7f9/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 6355c12..b9b4bca 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.symbolicName(Predicates.equalTo("catalog-name")));
@@ -175,6 +179,8 @@ public class CampYamlLiteTest {
@Test
public void testRegisterCustomEntityWithBundleWhereEntityIsFromCoreAndIconFromBundle() throws IOException {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String symbolicName = "my.catalog.app.id";
String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL;
String yaml = getSampleMyCatalogAppYaml(symbolicName, bundleUrl);
@@ -186,6 +192,8 @@ public class CampYamlLiteTest {
@Test
public void testResetXmlWithCustomEntity() throws IOException {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String symbolicName = "my.catalog.app.id";
String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL;
String yaml = getSampleMyCatalogAppYaml(symbolicName, bundleUrl);
[2/4] incubator-brooklyn git commit: usage/camp/src/test: skip test
if binary is absent
Posted by ri...@apache.org.
usage/camp/src/test: skip test if binary is 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/7e7196e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7e7196e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7e7196e0
Branch: refs/heads/master
Commit: 7e7196e038c1ca8ee8fdee579a6882660a14fbe2
Parents: 8178a7f
Author: Richard Downer <ri...@apache.org>
Authored: Tue Dec 9 11:29:55 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Dec 9 11:29:55 2014 +0000
----------------------------------------------------------------------
.../camp/brooklyn/ReferencedYamlTest.java | 3 ++
.../CatalogOsgiVersionMoreEntityTest.java | 21 +++++++++++++
.../brooklyn/catalog/CatalogYamlEntityTest.java | 32 ++++++++++++++++++++
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 4 +++
4 files changed, 60 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7e7196e0/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/ReferencedYamlTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/ReferencedYamlTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/ReferencedYamlTest.java
index 048fa8f..d4f079a 100644
--- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/ReferencedYamlTest.java
+++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/ReferencedYamlTest.java
@@ -20,6 +20,7 @@ package io.brooklyn.camp.brooklyn;
import java.util.Collection;
+import brooklyn.test.TestResourceUnavailableException;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -132,6 +133,8 @@ public class ReferencedYamlTest extends AbstractYamlTest {
*/
@Test
public void testCatalogLeaksBundlesToReferencedYaml() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String parentCatalogId = "my.catalog.app.id.url.parent";
addCatalogItem(
"brooklyn.catalog:",
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7e7196e0/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java
index 016a83a..3527a5d 100644
--- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java
+++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java
@@ -18,6 +18,7 @@
*/
package io.brooklyn.camp.brooklyn.catalog;
+import brooklyn.test.TestResourceUnavailableException;
import io.brooklyn.camp.brooklyn.AbstractYamlTest;
import io.brooklyn.camp.brooklyn.spi.creation.BrooklynEntityMatcher;
@@ -41,6 +42,8 @@ public class CatalogOsgiVersionMoreEntityTest extends AbstractYamlTest {
@Test
public void testMoreEntityV1() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar");
+
addCatalogItem(getLocalResource("more-entity-v1-osgi-catalog.yaml"));
Entity app = createAndStartApplication("services: [ { type: 'more-entity:1.0' } ]");
Entity moreEntity = Iterables.getOnlyElement(app.getChildren());
@@ -54,6 +57,9 @@ public class CatalogOsgiVersionMoreEntityTest extends AbstractYamlTest {
* if we passed the correct loader at that point we could avoid those warnings. */
@Test
public void testMoreEntityV1WithPolicy() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar");
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-entities.jar");
+
addCatalogItem(getLocalResource("simple-policy-osgi-catalog.yaml"));
addCatalogItem(getLocalResource("more-entity-v1-with-policy-osgi-catalog.yaml"));
Entity app = createAndStartApplication("services: [ { type: 'more-entity:1.0' } ]");
@@ -69,6 +75,9 @@ public class CatalogOsgiVersionMoreEntityTest extends AbstractYamlTest {
@Test
public void testMoreEntityV2() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar");
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-entities.jar");
+
addCatalogItem(getLocalResource("more-entity-v2-osgi-catalog.yaml"));
Entity app = createAndStartApplication("services: [ { type: 'more-entity:1.0' } ]");
Entity moreEntity = Iterables.getOnlyElement(app.getChildren());
@@ -86,6 +95,10 @@ public class CatalogOsgiVersionMoreEntityTest extends AbstractYamlTest {
@Test
/** TODO this test works if we assume most recent version wins, but semantics TBC */
public void testMoreEntityV2ThenV1GivesV1() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar");
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar");
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-entities.jar");
+
addCatalogItem(getLocalResource("more-entity-v2-osgi-catalog.yaml"));
forceCatalogUpdate();
addCatalogItem(getLocalResource("more-entity-v1-osgi-catalog.yaml"));
@@ -101,6 +114,10 @@ public class CatalogOsgiVersionMoreEntityTest extends AbstractYamlTest {
* in either case this works */
@Test
public void testMoreEntityV1ThenV2GivesV2() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar");
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar");
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-entities.jar");
+
addCatalogItem(getLocalResource("more-entity-v1-osgi-catalog.yaml"));
forceCatalogUpdate();
addCatalogItem(getLocalResource("more-entity-v2-osgi-catalog.yaml"));
@@ -113,6 +130,10 @@ public class CatalogOsgiVersionMoreEntityTest extends AbstractYamlTest {
@Test
public void testMoreEntityBothV1AndV2() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.jar");
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.jar");
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/brooklyn/osgi/brooklyn-test-osgi-entities.jar");
+
addCatalogItem(getLocalResource("more-entity-v1-called-v1-osgi-catalog.yaml"));
addCatalogItem(getLocalResource("more-entity-v2-osgi-catalog.yaml"));
Entity v1 = createAndStartApplication("services: [ { type: 'more-entity-v1:1.0' } ]");
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7e7196e0/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
index fe09586..cb804a5 100644
--- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
+++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
@@ -21,6 +21,8 @@ package io.brooklyn.camp.brooklyn.catalog;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
+
+import brooklyn.test.TestResourceUnavailableException;
import io.brooklyn.camp.brooklyn.AbstractYamlTest;
import java.util.Collection;
@@ -44,6 +46,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testAddCatalogItem() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String symbolicName = "my.catalog.app.id.load";
addCatalogOSGiEntity(symbolicName);
CatalogItem<?, ?> item = mgmt().getCatalog().getCatalogItem(symbolicName, TEST_VERSION);
@@ -54,6 +58,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testAddCatalogItemWithoutVersion() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String id = "unversioned.app";
addCatalogItem(
"brooklyn.catalog:",
@@ -69,12 +75,16 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testLaunchApplicationReferencingCatalog() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String symbolicName = "my.catalog.app.id.launch";
registerAndLaunchAndAssertSimpleEntity(symbolicName, SIMPLE_ENTITY_TYPE);
}
@Test
public void testLaunchApplicationUnverionedCatalogReference() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String symbolicName = "my.catalog.app.id.fail";
addCatalogOSGiEntity(symbolicName, SIMPLE_ENTITY_TYPE);
try {
@@ -90,6 +100,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testLaunchApplicationWithCatalogReferencingOtherCatalog() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String referencedSymbolicName = "my.catalog.app.id.referenced";
String referrerSymbolicName = "my.catalog.app.id.referring";
addCatalogOSGiEntity(referencedSymbolicName, SIMPLE_ENTITY_TYPE);
@@ -110,6 +122,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testLaunchApplicationChildWithCatalogReferencingOtherCatalog() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String referencedSymbolicName = "my.catalog.app.id.child.referenced";
String referrerSymbolicName = "my.catalog.app.id.child.referring";
addCatalogOSGiEntity(referencedSymbolicName, SIMPLE_ENTITY_TYPE);
@@ -142,6 +156,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testLaunchApplicationWithTypeUsingJavaColonPrefix() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String symbolicName = SIMPLE_ENTITY_TYPE;
String serviceName = "java:"+SIMPLE_ENTITY_TYPE;
registerAndLaunchAndAssertSimpleEntity(symbolicName, serviceName);
@@ -149,6 +165,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testLaunchApplicationLoopWithJavaTypeName() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String symbolicName = SIMPLE_ENTITY_TYPE;
String serviceName = SIMPLE_ENTITY_TYPE;
registerAndLaunchAndAssertSimpleEntity(symbolicName, serviceName);
@@ -156,6 +174,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testLaunchApplicationChildLoopCatalogIdFails() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String referrerSymbolicName = "my.catalog.app.id.child.referring";
try {
addCatalogChildOSGiEntity(referrerSymbolicName, ver(referrerSymbolicName));
@@ -167,6 +187,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testReferenceInstalledBundleByName() {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String firstItemId = "my.catalog.app.id.register_bundle";
String secondItemId = "my.catalog.app.id.reference_bundle";
addCatalogItem(
@@ -249,6 +271,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testFullBundleReference() {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String itemId = "my.catalog.app.id.full_ref";
addCatalogItem(
"brooklyn.catalog:",
@@ -270,6 +294,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
*/
@Test
public void testFullBundleReferenceUrlMetaOverridesLocalNameVersion() {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String firstItemId = "my.catalog.app.id.register_bundle";
String secondItemId = "my.catalog.app.id.reference_bundle";
String nonExistentId = "non_existent_id";
@@ -307,6 +333,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test(expectedExceptions = IllegalStateException.class)
public void testUpdatingItemFails() {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String id = "my.catalog.app.id.duplicate";
addCatalogOSGiEntity(id);
addCatalogOSGiEntity(id);
@@ -314,6 +342,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testForcedUpdatingItem() {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String id = "my.catalog.app.id.duplicate";
addCatalogOSGiEntity(id);
forceCatalogUpdate();
@@ -323,6 +353,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testCreateSpecFromCatalogItem() {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String id = "my.catalog.app.id.create_spec";
addCatalogOSGiEntity(id);
BrooklynCatalog catalog = mgmt().getCatalog();
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7e7196e0/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
index 8dbc3ab..d83c11a 100644
--- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
+++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
@@ -19,6 +19,8 @@
package io.brooklyn.camp.brooklyn.catalog;
import static org.testng.Assert.assertEquals;
+
+import brooklyn.test.TestResourceUnavailableException;
import io.brooklyn.camp.brooklyn.AbstractYamlTest;
import org.testng.annotations.Test;
@@ -111,6 +113,8 @@ public class CatalogYamlPolicyTest extends AbstractYamlTest {
}
private void addCatalogOSGiPolicy(String symbolicName, String serviceType) {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
addCatalogItem(
"brooklyn.catalog:",
" id: " + symbolicName,
[4/4] incubator-brooklyn git commit: Merge and close #379
Posted by ri...@apache.org.
Merge and close #379
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f365b9b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f365b9b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f365b9b2
Branch: refs/heads/master
Commit: f365b9b22819a9eb0db7b0bf175054c4e1d8c714
Parents: 566fd49 bb4b90d
Author: Richard Downer <ri...@apache.org>
Authored: Tue Dec 9 14:15:12 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Dec 9 14:15:12 2014 +0000
----------------------------------------------------------------------
.../brooklyn/camp/lite/CampYamlLiteTest.java | 8 +++++
.../camp/brooklyn/ReferencedYamlTest.java | 3 ++
.../CatalogOsgiVersionMoreEntityTest.java | 21 +++++++++++++
.../brooklyn/catalog/CatalogYamlEntityTest.java | 32 ++++++++++++++++++++
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 4 +++
.../rest/resources/CatalogResourceTest.java | 5 +++
6 files changed, 73 insertions(+)
----------------------------------------------------------------------
[3/4] incubator-brooklyn git commit: rest-server/src/test: skip test
if binaries absent
Posted by ri...@apache.org.
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;