You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/02/09 23:12:08 UTC
[5/5] incubator-usergrid git commit: Removed tests for code that no
longer exists. Fixed RestTests to function with new endpoints.
Removed tests for code that no longer exists. Fixed RestTests to function with new endpoints.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6855e173
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6855e173
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6855e173
Branch: refs/heads/two-dot-o-import
Commit: 6855e17311b30df910c987cbc485127fb9e9e10b
Parents: 8d911f7
Author: grey <gr...@apigee.com>
Authored: Mon Feb 9 11:10:27 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Mon Feb 9 11:10:27 2015 -0800
----------------------------------------------------------------------
.../rest/management/ImportResourceIT.java | 90 ++------------------
1 file changed, 8 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6855e173/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
index 9d1ff1a..eac59df 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
@@ -56,86 +56,12 @@ public class ImportResourceIT extends AbstractRestIT {
String app = clientSetup.getAppName();
Entity payload = payloadBuilder();
///management/orgs/orgname/apps/appname/collection/users/import
- Entity entity = this.management().orgs().organization( org ).app().addToPath( app ).addToPath( "collection" ).addToPath( "users" ).addToPath( "import" ).post( payload );
-
+ Entity entity = this.management().orgs().organization( org ).app().addToPath( app ).addToPath( "import" ).post( payload );
assertNotNull( entity );
assertNotNull( entity.getString( "Import Entity" ));
}
- @Ignore("Test isn't currently supported")
- @Test
- public void importApplicationUUIDRetTest() throws Exception {
-
- String org = clientSetup.getOrganizationName();
- String app = clientSetup.getAppName();
- Entity payload = payloadBuilder();
- ///management/orgs/orgname/apps/appname/import
- Entity entity = this.management().orgs().organization(org).app().addToPath( app ).addToPath("import").post(payload);
-
- assertNotNull( entity );
- assertNotNull( entity.getString( "Import Entity" ) );
-
-
- }
-
- @Ignore("Test isn't currently supported")
- @Test
- public void importOrganizationUUIDRetTest() throws Exception {
-
- String org = clientSetup.getOrganizationName();
- String app = clientSetup.getAppName();
- Entity payload = payloadBuilder();
- ///management/orgs/orgname/import
- Entity entity = this.management().orgs().organization(org).addToPath("import").post(payload);
-
- assertNotNull( entity );
- assertNotNull( entity.getString( "Import Entity" ) );
-
- }
-
- @Ignore("Test isn't currently supported")
- @Test
- public void importGetOrganizationJobStatTest() throws Exception {
-
- String org = clientSetup.getOrganizationName();
- String app = clientSetup.getAppName();
- Entity payload = payloadBuilder();
- ///management/orgs/orgname/import
- Entity entity = this.management().orgs().organization(org).addToPath("import").post(payload);
- String importEntity = entity.getString( "Import Entity" );
-
-
- assertNotNull( entity );
- assertNotNull( importEntity );
-
- entity = this.management().orgs().organization(org).addToPath("import").addToPath(importEntity).get();
-
- assertEquals( "SCHEDULED", entity.getString( "state" ) );//TODO: do tests for other states in service tier
-
- }
-
-
- @Ignore("Test isn't currently supported")
- @Test
- public void importGetApplicationJobStatTest() throws Exception {
-
- String org = clientSetup.getOrganizationName();
- String app = clientSetup.getAppName();
- Entity payload = payloadBuilder();
- ///management/orgs/orgname/apps/appname/import
- Entity entity = this.management().orgs().organization( org ).app().addToPath( app ).addToPath("import").post(payload);
- String importEntity = entity.getString( "Import Entity" );
-
- assertNotNull( entity );
- assertNotNull( importEntity );
-
- entity = this.management().orgs().organization( org ).addToPath("import").addToPath(importEntity).get();
-
- assertEquals( "SCHEDULED", entity.getString( "state" ) );//TODO: do tests for other states in service tier
- }
-
-
@Test
public void importGetCollectionJobStatTest() throws Exception {
@@ -143,15 +69,15 @@ public class ImportResourceIT extends AbstractRestIT {
String app = clientSetup.getAppName();
Entity payload = payloadBuilder();
///management/orgs/orgname/apps/appname/import
- Entity entity = this.management().orgs().organization( org ).app().addToPath( app ).addToPath("collection")
- .addToPath("users").addToPath("import").post(payload);
+ Entity entity = this.management().orgs().organization( org ).app().addToPath( app ).addToPath( "import" ).post( payload );
+
String importEntity = entity.getString( "Import Entity" );
assertNotNull( entity );
assertNotNull( importEntity );
- entity = this.management().orgs().organization(org).addToPath("import").addToPath(importEntity).get();
+ entity = this.management().orgs().organization(org).app().addToPath( app ).addToPath("import").addToPath(importEntity).get();
assertEquals( "SCHEDULED", entity.getString( "state" ) );//TODO: do tests for other states in service tier
@@ -171,8 +97,7 @@ public class ImportResourceIT extends AbstractRestIT {
String app = clientSetup.getAppName();
Entity payload = payloadBuilder();
///management/orgs/orgname/apps/appname/import
- Entity entity = this.management().orgs().organization(org).app().addToPath( app ).addToPath("collection")
- .addToPath("users").addToPath("import").post(payload);
+ Entity entity = this.management().orgs().organization( org ).app().addToPath( app ).addToPath( "import" ).post( payload );
String importEntity = entity.getString( "Import Entity" );
@@ -200,8 +125,8 @@ public class ImportResourceIT extends AbstractRestIT {
//try to read with the new token, which should fail as unauthorized
try {
- Entity newEntity = this.management().orgs().organization(org).apps(app).addToPath("collection")
- .addToPath("users").addToPath("import").get();
+ this.management().orgs().organization(org).app().addToPath( app )
+ .addToPath("import").addToPath(importEntity).get();
fail("Should not be able to read import job with unauthorized token");
} catch ( UniformInterfaceException ex ) {
errorParse( 401,"unauthorized",ex);
@@ -215,6 +140,7 @@ public class ImportResourceIT extends AbstractRestIT {
*
*/
+ @Ignore("Test has not been revised")
@Test
public void importPostToAppWithValidButUnauthorizedToken() throws Exception {
//it should also post to an org app that doesn't belong to the token