You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/07/09 23:46:24 UTC
[11/50] git commit: Add test - get entity definition from OSGi based
YAML.
Add test - get entity definition from OSGi based YAML.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5328b60d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5328b60d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5328b60d
Branch: refs/heads/master
Commit: 5328b60d08194e5f860c2099fed03d7cc31a95be
Parents: 8b41b32
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Jul 7 12:59:56 2014 +0300
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 9 22:34:43 2014 +0100
----------------------------------------------------------------------
.../resources/CatalogBundleResourceTest.java | 48 +++++++++++++-------
1 file changed, 32 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5328b60d/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java
index fda34b0..f4884e8 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/CatalogBundleResourceTest.java
@@ -9,9 +9,9 @@ import javax.ws.rs.core.Response;
import org.testng.annotations.Test;
-import brooklyn.entity.basic.BasicApplication;
import brooklyn.management.osgi.OsgiStandaloneTest;
import brooklyn.rest.domain.ApplicationSummary;
+import brooklyn.rest.domain.CatalogEntitySummary;
import brooklyn.rest.testing.BrooklynRestResourceTest;
import com.sun.jersey.api.client.ClientResponse;
@@ -19,8 +19,36 @@ import com.sun.jersey.api.client.ClientResponse;
public class CatalogBundleResourceTest extends BrooklynRestResourceTest {
@Test
- public void testDeployApplicationYaml() throws Exception {
- String registeredTypeName = "my.catalog.app.id";
+ public void testListApplicationYaml() throws Exception {
+ String registeredTypeName = "my.catalog.app.id.load";
+ addCatalogOSGiEntity(registeredTypeName);
+
+ CatalogEntitySummary entityItem = client().resource("/v1/catalog/entities/"+registeredTypeName)
+ .get(CatalogEntitySummary.class);
+
+ assertEquals(entityItem.getRegisteredType(), registeredTypeName);
+
+ }
+
+ @Test
+ public void testLaunchApplicationYaml() throws Exception {
+ String registeredTypeName = "my.catalog.app.id.launch";
+ addCatalogOSGiEntity(registeredTypeName);
+
+ String yaml = "{ name: simple-app-yaml, location: localhost, services: [ { serviceType: "+registeredTypeName+" } ] }";
+
+ ClientResponse response = client().resource("/v1/applications")
+ .entity(yaml, "application/x-yaml")
+ .post(ClientResponse.class);
+ assertTrue(response.getStatus()/100 == 2, "response is "+response);
+
+ // Expect app to be running
+ URI appUri = response.getLocation();
+ waitForApplicationToBeRunning(response.getLocation());
+ assertEquals(client().resource(appUri).get(ApplicationSummary.class).getSpec().getName(), "simple-app-yaml");
+ }
+
+ private void addCatalogOSGiEntity(String registeredTypeName) {
String catalogYaml =
"name: "+registeredTypeName+"\n"+
// FIXME name above should be unnecessary when brooklyn.catalog below is working
@@ -40,18 +68,6 @@ public class CatalogBundleResourceTest extends BrooklynRestResourceTest {
.post(ClientResponse.class, catalogYaml);
assertEquals(catalogResponse.getStatus(), Response.Status.CREATED.getStatusCode());
-
- String yaml = "{ name: simple-app-yaml, location: localhost, services: [ { serviceType: "+registeredTypeName+" } ] }";
-
- ClientResponse response = client().resource("/v1/applications")
- .entity(yaml, "application/x-yaml")
- .post(ClientResponse.class);
- assertTrue(response.getStatus()/100 == 2, "response is "+response);
-
- // Expect app to be running
- URI appUri = response.getLocation();
- waitForApplicationToBeRunning(response.getLocation());
- assertEquals(client().resource(appUri).get(ApplicationSummary.class).getSpec().getName(), "simple-app-yaml");
- }
+ }
}