Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
index 77a6e2f..d002f18 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
@@ -67,7 +67,7 @@
try {
node = mapper.readTree(
resource().path( "/management/orgs/" + orgName + "/apps/" + appName + "/collection/users/export" )
- .queryParam( "access_token", context.getActiveUser().getToken() )
+ .queryParam( "access_token", token )
.accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
.post( String.class, payload ) );
}
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
index 58691a1..5e6c100 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
@@ -27,6 +27,8 @@
import javax.ws.rs.core.MediaType;
import com.fasterxml.jackson.databind.JsonNode;
+
+import org.junit.Rule;
import org.junit.Test;
import org.apache.commons.lang.StringUtils;
@@ -34,12 +36,15 @@
import org.apache.usergrid.cassandra.Concurrent;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.management.OrganizationOwnerInfo;
+import org.apache.usergrid.persistence.index.utils.UUIDUtils;
import org.apache.usergrid.rest.AbstractRestIT;
+import org.apache.usergrid.rest.TestContextSetup;
import org.apache.usergrid.rest.management.organizations.OrganizationsResource;
import com.sun.jersey.api.client.ClientResponse.Status;
import com.sun.jersey.api.client.UniformInterfaceException;
import com.sun.jersey.api.representation.Form;
+
import java.io.IOException;
import static org.apache.usergrid.utils.MapUtils.hashMap;
@@ -55,46 +60,43 @@
@Concurrent()
public class ManagementResourceIT extends AbstractRestIT {
+ @Rule
+ public TestContextSetup context = new TestContextSetup( this );
+
+
public ManagementResourceIT() throws Exception {
}
-
-
/**
* Test that admins can't view organizations they're not authorized to view.
*/
@Test
public void crossOrgsNotViewable() throws Exception {
- OrganizationOwnerInfo orgInfo = setup.getMgmtSvc().createOwnerAndOrganization( "crossOrgsNotViewable",
- "crossOrgsNotViewable", "TestName", "crossOrgsNotViewable@usergrid.org", "password" );
+ String username = "test" + UUIDUtils.newTimeUUID();
+ String name = username;
+ String email = username + "@usergrid.com";
+ String password = "password";
+ String orgName = username;
- refreshIndex("test-organization", "test-app");
+ Map payload =
+ hashMap( "email", email ).map( "username", username ).map( "name", name ).map( "password", password )
+ .map( "organization", orgName ).map( "company", "Apigee" );
+
+ JsonNode node = mapper.readTree(
+ resource().path( "/management/organizations" ).accept( MediaType.APPLICATION_JSON )
+ .type( MediaType.APPLICATION_JSON_TYPE ).post( String.class, payload ) );
// check that the test admin cannot access the new org info
Status status = null;
try {
- resource().path( String.format( "/management/orgs/%s", orgInfo.getOrganization().getName() ) )
- .queryParam( "access_token", adminAccessToken ).accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE ).get( String.class );
- }
- catch ( UniformInterfaceException uie ) {
- status = uie.getResponse().getClientResponseStatus();
- }
-
- assertNotNull( status );
- assertEquals( Status.UNAUTHORIZED, status );
-
- status = null;
-
- try {
- resource().path( String.format( "/management/orgs/%s", orgInfo.getOrganization().getUuid() ) )
- .queryParam( "access_token", adminAccessToken ).accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE ).get( String.class );
+ resource().path( String.format( "/management/orgs/%s", orgName ) )
+ .queryParam( "access_token", context.getActiveUser().getToken() )
+ .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE ).get( String.class );
}
catch ( UniformInterfaceException uie ) {
status = uie.getResponse().getClientResponseStatus();
@@ -106,9 +108,9 @@
// this admin should have access to test org
status = null;
try {
- resource().path( "/management/orgs/test-organization" ).queryParam( "access_token", adminAccessToken )
- .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
- .get( String.class );
+ resource().path( "/management/orgs/" + context.getOrgName() )
+ .queryParam( "access_token", context.getActiveUser().getToken() )
+ .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE ).get( String.class );
}
catch ( UniformInterfaceException uie ) {
status = uie.getResponse().getClientResponseStatus();
@@ -116,13 +118,13 @@
assertNull( status );
- OrganizationInfo org = setup.getMgmtSvc().getOrganizationByName( "test-organization" );
+ //test getting the organization by org
status = null;
try {
- resource().path( String.format( "/management/orgs/%s", org.getUuid() ) )
- .queryParam( "access_token", adminAccessToken ).accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE ).get( String.class );
+ resource().path( String.format( "/management/orgs/%s", context.getOrgUuid() ) )
+ .queryParam( "access_token", context.getActiveUser().getToken() )
+ .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE ).get( String.class );
}
catch ( UniformInterfaceException uie ) {
status = uie.getResponse().getClientResponseStatus();
@@ -132,9 +134,6 @@
}
-
-
-
/**
* Test that we can support over 10 items in feed.
*/
@@ -147,7 +146,7 @@
users1.add( "follower" + Integer.toString( i ) );
}
- refreshIndex("test-organization", "test-app");
+ refreshIndex( context.getOrgName(), context.getAppName() );
checkFeed( "leader1", users1 );
//try with 11
@@ -164,20 +163,20 @@
//create user
createUser( leader );
- refreshIndex("test-organization", "test-app");
+ refreshIndex( context.getOrgName(), context.getAppName() );
String preFollowContent = leader + ": pre-something to look for " + UUID.randomUUID().toString();
addActivity( leader, leader + " " + leader + "son", preFollowContent );
- refreshIndex("test-organization", "test-app");
-
+ refreshIndex( context.getOrgName(), context.getAppName() );
+
String lastUser = followers.get( followers.size() - 1 );
int i = 0;
for ( String user : followers ) {
createUser( user );
- refreshIndex("test-organization", "test-app");
+ refreshIndex( context.getOrgName(), context.getAppName() );
follow( user, leader );
- refreshIndex("test-organization", "test-app");
+ refreshIndex( context.getOrgName(), context.getAppName() );
}
userFeed = getUserFeed( lastUser );
assertTrue( userFeed.size() == 1 );
@@ -188,7 +187,7 @@
String postFollowContent = leader + ": something to look for " + UUID.randomUUID().toString();
addActivity( leader, leader + " " + leader + "son", postFollowContent );
- refreshIndex("test-organization", "test-app");
+ refreshIndex( context.getOrgName(), context.getAppName() );
//check feed
userFeed = getUserFeed( lastUser );
@@ -203,25 +202,28 @@
private void createUser( String username ) {
Map<String, Object> payload = new LinkedHashMap<String, Object>();
payload.put( "username", username );
- resource().path( "/test-organization/test-app/users" ).queryParam( "access_token", access_token )
- .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
- .post( String.class, payload );
+ resource().path( "" + context.getOrgName() + "/" + context.getAppName() + "/users" )
+ .queryParam( "access_token", context.getActiveUser().getToken() ).accept( MediaType.APPLICATION_JSON )
+ .type( MediaType.APPLICATION_JSON_TYPE ).post( String.class, payload );
}
private JsonNode getUserFeed( String username ) throws IOException {
- JsonNode userFeed = mapper.readTree( resource().path( "/test-organization/test-app/users/" + username + "/feed" )
- .queryParam( "access_token", access_token ).accept( MediaType.APPLICATION_JSON )
- .get( String.class ));
+ JsonNode userFeed = mapper.readTree( resource()
+ .path( "/" + context.getOrgName() + "/" + context.getAppName() + "/users/" + username + "/feed" )
+ .queryParam( "access_token", context.getActiveUser().getToken() ).accept( MediaType.APPLICATION_JSON )
+ .get( String.class ) );
return userFeed.get( "entities" );
}
private void follow( String user, String followUser ) {
//post follow
- resource().path( "/test-organization/test-app/users/" + user + "/following/users/" + followUser )
- .queryParam( "access_token", access_token ).accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE ).post( String.class, new HashMap<String, String>() );
+ resource()
+ .path( "/" + context.getOrgName() + "/" + context.getAppName() + "/users/" + user + "/following/users/"
+ + followUser ).queryParam( "access_token", context.getActiveUser().getToken() )
+ .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
+ .post( String.class, new HashMap<String, String>() );
}
@@ -233,8 +235,8 @@
actorMap.put( "displayName", name );
actorMap.put( "username", user );
activityPayload.put( "actor", actorMap );
- resource().path( "/test-organization/test-app/users/" + user + "/activities" )
- .queryParam( "access_token", access_token ).accept( MediaType.APPLICATION_JSON )
+ resource().path( "/" + context.getOrgName() + "/" + context.getAppName() + "/users/" + user + "/activities" )
+ .queryParam( "access_token", context.getActiveUser().getToken() ).accept( MediaType.APPLICATION_JSON )
.type( MediaType.APPLICATION_JSON_TYPE ).post( String.class, activityPayload );
}
@@ -242,43 +244,48 @@
@Test
public void mgmtCreateAndGetApplication() throws Exception {
- OrganizationInfo orgInfo = setup.getMgmtSvc().getOrganizationByName( "test-organization" );
Map<String, String> data = new HashMap<String, String>();
data.put( "name", "mgmt-org-app" );
+ String orgName = context.getOrgName();
+
// POST /applications
- JsonNode appdata = mapper.readTree( resource().path( "/management/orgs/" + orgInfo.getUuid() + "/applications" )
- .queryParam( "access_token", adminToken() ).accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE ).post( String.class, data ));
+ JsonNode appdata = mapper.readTree( resource().path( "/management/orgs/" + orgName + "/applications" )
+ .queryParam( "access_token", context.getActiveUser().getToken() )
+ .accept( MediaType.APPLICATION_JSON )
+ .type( MediaType.APPLICATION_JSON_TYPE )
+ .post( String.class, data ) );
logNode( appdata );
appdata = getEntity( appdata, 0 );
- refreshIndex("test-organization", "test-app");
+ refreshIndex( orgName, context.getAppName() );
- assertEquals( "test-organization/mgmt-org-app", appdata.get( "name" ).asText() );
- assertNotNull(appdata.get( "metadata" ));
- assertNotNull(appdata.get( "metadata" ).get( "collections" ));
- assertNotNull(appdata.get( "metadata" ).get( "collections" ).get( "roles" ));
- assertNotNull(appdata.get( "metadata" ).get( "collections" ).get( "roles" ).get( "title" ));
+ assertEquals( orgName.toLowerCase() + "/mgmt-org-app", appdata.get( "name" ).asText() );
+ assertNotNull( appdata.get( "metadata" ) );
+ assertNotNull( appdata.get( "metadata" ).get( "collections" ) );
+ assertNotNull( appdata.get( "metadata" ).get( "collections" ).get( "roles" ) );
+ assertNotNull( appdata.get( "metadata" ).get( "collections" ).get( "roles" ).get( "title" ) );
assertEquals( "Roles", appdata.get( "metadata" ).get( "collections" ).get( "roles" ).get( "title" ).asText() );
assertEquals( 3, appdata.get( "metadata" ).get( "collections" ).get( "roles" ).get( "count" ).asInt() );
- refreshIndex("test-organization", "test-app");
+ refreshIndex( orgName, context.getAppName() );
// GET /applications/mgmt-org-app
- appdata = mapper.readTree( resource().path( "/management/orgs/" + orgInfo.getUuid() + "/applications/mgmt-org-app" )
- .queryParam( "access_token", adminToken() ).accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE ).get( String.class ));
+ appdata = mapper.readTree(
+ resource().path( "/management/orgs/" + context.getOrgUuid() + "/applications/mgmt-org-app" )
+ .queryParam( "access_token", context.getActiveUser().getToken() )
+ .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE )
+ .get( String.class ) );
logNode( appdata );
- assertEquals( "test-organization", appdata.get( "organization" ).asText() );
+ assertEquals( orgName.toLowerCase(), appdata.get( "organization" ).asText() );
assertEquals( "mgmt-org-app", appdata.get( "applicationName" ).asText() );
- assertEquals( "http://sometestvalue/test-organization/mgmt-org-app", appdata.get( "uri" ).textValue() );
+ assertEquals( "http://sometestvalue/" + orgName.toLowerCase() + "/mgmt-org-app",
+ appdata.get( "uri" ).textValue() );
appdata = getEntity( appdata, 0 );
- assertEquals( "test-organization/mgmt-org-app", appdata.get( "name" ).asText() );
+ assertEquals( orgName.toLowerCase() + "/mgmt-org-app", appdata.get( "name" ).asText() );
assertEquals( "Roles", appdata.get( "metadata" ).get( "collections" ).get( "roles" ).get( "title" ).asText() );
assertEquals( 3, appdata.get( "metadata" ).get( "collections" ).get( "roles" ).get( "count" ).asInt() );
}
-
}
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
index 466610e..e3bcd2d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
@@ -59,7 +59,6 @@
public class OrganizationsIT extends AbstractRestIT {
private static final Logger LOG = LoggerFactory.getLogger( OrganizationsIT.class );
- //For Testing OrganizationUpdate
@Rule
public TestContextSetup context = new TestContextSetup( this );