You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/06/03 00:35:44 UTC
incubator-usergrid git commit: Simplified test in ApplicationCreateIT
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 6be835ca8 -> 6f20aa48c
Simplified test in ApplicationCreateIT
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6f20aa48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6f20aa48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6f20aa48
Branch: refs/heads/two-dot-o-dev
Commit: 6f20aa48c372cd18fabc99cf3b7f5a081f3b2f5d
Parents: 6be835c
Author: GERey <gr...@apigee.com>
Authored: Tue Jun 2 15:35:43 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Tue Jun 2 15:35:43 2015 -0700
----------------------------------------------------------------------
.../rest/applications/ApplicationCreateIT.java | 30 +++++++-------------
1 file changed, 11 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6f20aa48/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
index 360db82..4929a4c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.MediaType;
import java.util.*;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -47,27 +48,18 @@ public class ApplicationCreateIT extends AbstractRestIT {
*/
@Test
public void testCreateAndImmediateGet() throws Exception {
+
+ String orgName = clientSetup.getOrganizationName();
+ String appName = clientSetup.getAppName() + "_new_app";
+ Map applicationMap = new HashMap<String, Object>( );
+ applicationMap.put( "name", appName );
- // create app
+ Entity appCreateResponse = this.management().orgs().organization( orgName ).apps().post(
+ clientSetup.getSuperuserToken(),applicationMap );
- String orgName = clientSetup.getOrganization().getName();
- String appName = clientSetup.getAppName() + "_new_app";
- Token orgAdminToken = getAdminToken(clientSetup.getUsername(), clientSetup.getUsername());
+ Entity response = this.management().orgs().organization( orgName ).addToPath( "apps" ).addToPath( appName ).get();
- ApiResponse appCreateResponse = clientSetup.getRestClient()
- .management().orgs().organization(orgName).app().getResource()
- .queryParam("access_token", orgAdminToken.getAccessToken())
- .type( MediaType.APPLICATION_JSON )
- .post(ApiResponse.class, new Application(appName));
- appCreateResponse.getEntities().get(0).getUuid();
-
- // should be able to immediately get the application's roles collection
-
- ApiResponse response = clientSetup.getRestClient().getResource()
- .path("/" + clientSetup.getOrganizationName() + "/" + appName + "/roles" )
- .queryParam( "access_token", orgAdminToken.getAccessToken() )
- .get(ApiResponse.class);
- assertTrue( !response.getEntities().isEmpty() );
+ assertNotNull( response );
}
@@ -107,7 +99,7 @@ public class ApplicationCreateIT extends AbstractRestIT {
String orgName, String appName, Token orgAdminToken, List<Entity> entities) {
ApiResponse appCreateResponse = clientSetup.getRestClient()
- .management().orgs().organization(orgName).app().post(new Application( appName ));
+ .management().orgs().organization( orgName ).app().post( new Application( appName ) );
UUID appId = appCreateResponse.getEntities().get(0).getUuid();
refreshIndex();