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 16:48:14 UTC
[8/9] incubator-brooklyn git commit: usage/camp/src/test: skip test
if binary is absent
usage/camp/src/test: skip test if binary is absent
Conflicts:
usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.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/fcbcc1db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/fcbcc1db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/fcbcc1db
Branch: refs/heads/0.7.0-M2-incubating
Commit: fcbcc1dbac2635f99fa80d21ca38c9b852f6b3f7
Parents: 232d311
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 14:40:10 2014 +0000
----------------------------------------------------------------------
.../camp/brooklyn/ReferencedYamlTest.java | 3 +++
.../CatalogOsgiVersionMoreEntityTest.java | 21 ++++++++++++++++++++
.../brooklyn/catalog/CatalogYamlEntityTest.java | 16 +++++++++++++++
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 4 ++++
4 files changed, 44 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fcbcc1db/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 05bb8c0..1ab683f 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;
@@ -130,6 +131,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/fcbcc1db/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 9281e61..1f09db0 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 } ]");
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 } ]");
@@ -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 } ]");
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"));
addCatalogItem(getLocalResource("more-entity-v1-osgi-catalog.yaml"));
Entity app = createAndStartApplication("services: [ { type: more-entity } ]");
@@ -100,6 +113,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"));
addCatalogItem(getLocalResource("more-entity-v2-osgi-catalog.yaml"));
Entity app = createAndStartApplication("services: [ { type: more-entity } ]");
@@ -111,6 +128,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 } ]");
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fcbcc1db/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 83cd46d..712d8df 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;
@@ -42,6 +44,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testAddCatalogItem() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String registeredTypeName = "my.catalog.app.id.load";
addCatalogOSGiEntity(registeredTypeName);
@@ -53,12 +57,16 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testLaunchApplicationReferencingCatalog() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String registeredTypeName = "my.catalog.app.id.launch";
registerAndLaunchAndAssertSimpleEntity(registeredTypeName, SIMPLE_ENTITY_TYPE);
}
@Test
public void testLaunchApplicationWithCatalogReferencingOtherCatalog() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String referencedRegisteredTypeName = "my.catalog.app.id.referenced";
String referrerRegisteredTypeName = "my.catalog.app.id.referring";
addCatalogOSGiEntity(referencedRegisteredTypeName, SIMPLE_ENTITY_TYPE);
@@ -79,6 +87,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testLaunchApplicationChildWithCatalogReferencingOtherCatalog() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String referencedRegisteredTypeName = "my.catalog.app.id.child.referenced";
String referrerRegisteredTypeName = "my.catalog.app.id.child.referring";
addCatalogOSGiEntity(referencedRegisteredTypeName, SIMPLE_ENTITY_TYPE);
@@ -111,6 +121,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testLaunchApplicationWithTypeUsingJavaColonPrefix() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String registeredTypeName = SIMPLE_ENTITY_TYPE;
String serviceName = "java:"+SIMPLE_ENTITY_TYPE;
registerAndLaunchAndAssertSimpleEntity(registeredTypeName, serviceName);
@@ -118,6 +130,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testLaunchApplicationLoopWithJavaTypeName() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String registeredTypeName = SIMPLE_ENTITY_TYPE;
String serviceName = SIMPLE_ENTITY_TYPE;
registerAndLaunchAndAssertSimpleEntity(registeredTypeName, serviceName);
@@ -125,6 +139,8 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
@Test
public void testLaunchApplicationChildLoopCatalogIdFails() throws Exception {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
String referrerRegisteredTypeName = "my.catalog.app.id.child.referring";
try {
addCatalogChildOSGiEntity(referrerRegisteredTypeName, referrerRegisteredTypeName);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fcbcc1db/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 0d5c44d..a9980bb 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 registeredTypeName, String serviceType) {
+ TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_PATH);
+
addCatalogItem(
"brooklyn.catalog:",
" id: " + registeredTypeName,