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/06/12 23:00:55 UTC
[02/23] incubator-usergrid git commit: fix app delete
fix app delete
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/269f0199
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/269f0199
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/269f0199
Branch: refs/heads/USERGRID-744
Commit: 269f01990050ed8d6fbe3765c59972b1480d6335
Parents: be5ec67
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Jun 11 09:35:55 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Jun 11 09:35:55 2015 -0600
----------------------------------------------------------------------
.../resources/usergrid-custom-test.properties | 2 +-
.../rest/applications/ApplicationDeleteIT.java | 31 ++++++++------------
.../resources/usergrid-custom-test.properties | 2 +-
.../resources/usergrid-custom-test.properties | 2 +-
4 files changed, 16 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/269f0199/stack/core/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --git a/stack/core/src/test/resources/usergrid-custom-test.properties b/stack/core/src/test/resources/usergrid-custom-test.properties
index 5490eae..74e0fdd 100644
--- a/stack/core/src/test/resources/usergrid-custom-test.properties
+++ b/stack/core/src/test/resources/usergrid-custom-test.properties
@@ -24,7 +24,7 @@ elasticsearch.number_shards=1
elasticsearch.number_replicas=0
elasticsearch.index_prefix=core_tests
elasticsearch.managment_index=usergrid_core_management
-cassandra.application.keyspace=core_tests_schema
+#cassandra.keyspace.application=core_tests_schema
elasticsearch.queue_impl.resolution=true
elasticsearch.buffer_timeout=1
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/269f0199/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
index 3a6d1c3..bdd6e46 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
@@ -25,6 +25,7 @@ import org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt.ManagementRe
import org.apache.usergrid.rest.test.resource2point0.model.*;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,10 +41,13 @@ public class ApplicationDeleteIT extends AbstractRestIT {
public static final int INDEXING_WAIT = 3000;
- UUID appid ;
+ Token orgAdminToken;
+ String orgName;
@Before
public void setup(){
- appid = UUID.randomUUID();
+ orgAdminToken = getAdminToken( clientSetup.getUsername(), clientSetup.getUsername());
+ orgName = clientSetup.getOrganization().getName();
+
}
/**
@@ -61,12 +65,9 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// create app with a collection of "things"
- String orgName = clientSetup.getOrganization().getName();
- String appToDeleteName = clientSetup.getAppName() + appid;
- Token orgAdminToken = getAdminToken( clientSetup.getUsername(), clientSetup.getUsername());
-
List<Entity> entities = new ArrayList<>();
+ String appToDeleteName = clientSetup.getAppName() + UUID.randomUUID();
UUID appToDeleteId = createAppWithCollection(orgName, appToDeleteName, orgAdminToken, entities);
// delete the app
@@ -195,13 +196,9 @@ public class ApplicationDeleteIT extends AbstractRestIT {
*/
@Test
public void testAppRestore() throws Exception {
+ String appToDeleteName = clientSetup.getAppName() + UUID.randomUUID();
// create app with a collection of "things"
-
- String orgName = clientSetup.getOrganization().getName();
- String appToDeleteName = clientSetup.getAppName() + appid;
- Token orgAdminToken = getAdminToken( clientSetup.getUsername(), clientSetup.getUsername());
-
List<Entity> entities = new ArrayList<>();
UUID appToDeleteId = createAppWithCollection(orgName, appToDeleteName, orgAdminToken, entities);
@@ -275,13 +272,9 @@ public class ApplicationDeleteIT extends AbstractRestIT {
*/
@Test
public void testAppRestoreConflict() throws Exception {
+ String appToDeleteName = clientSetup.getAppName() + UUID.randomUUID();
// create app with a collection of "things"
-
- String orgName = clientSetup.getOrganization().getName();
- String appToDeleteName = clientSetup.getAppName() + appid;
- Token orgAdminToken = getAdminToken( clientSetup.getUsername(), clientSetup.getUsername());
-
List<Entity> entities = new ArrayList<>();
UUID appToDeleteId = createAppWithCollection(orgName, appToDeleteName, orgAdminToken, entities);
@@ -293,6 +286,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
.queryParam( "access_token", orgAdminToken.getAccessToken() )
.queryParam("app_delete_confirm", "confirm_delete_of_application_and_data")
.delete();
+ refreshIndex();
// create new app with same name
@@ -321,11 +315,11 @@ public class ApplicationDeleteIT extends AbstractRestIT {
*/
@Test
public void testAppDeleteConflict() throws Exception {
+ String appToDeleteName = clientSetup.getAppName() + UUID.randomUUID();
// create app with a collection of "things"
String orgName = clientSetup.getOrganization().getName();
- String appToDeleteName = clientSetup.getAppName() + appid;
Token orgAdminToken = getAdminToken( clientSetup.getUsername(), clientSetup.getUsername());
List<Entity> entities = new ArrayList<>();
@@ -339,7 +333,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
.queryParam( "access_token", orgAdminToken.getAccessToken() )
.queryParam("app_delete_confirm", "confirm_delete_of_application_and_data")
.delete();
-
+ refreshIndex();
// create new app with same name
UUID newAppId = createAppWithCollection(orgName, appToDeleteName, orgAdminToken, entities);
@@ -390,6 +384,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
entities.add( createResponse.getEntities().get(0) );
}
+ refreshIndex();
return appId;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/269f0199/stack/rest/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/usergrid-custom-test.properties b/stack/rest/src/test/resources/usergrid-custom-test.properties
index 1208ec8..a55ca8b 100644
--- a/stack/rest/src/test/resources/usergrid-custom-test.properties
+++ b/stack/rest/src/test/resources/usergrid-custom-test.properties
@@ -45,4 +45,4 @@ elasticsearch.index_prefix=rest_tests
usergrid.use.default.queue=true
elasticsearch.managment_index=usergrid_rest_management
-cassandra.application.keyspace=rest_tests_schema
+#cassandra.keyspace.application=rest_tests_schema
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/269f0199/stack/services/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --git a/stack/services/src/test/resources/usergrid-custom-test.properties b/stack/services/src/test/resources/usergrid-custom-test.properties
index 1661c97..b52880d 100644
--- a/stack/services/src/test/resources/usergrid-custom-test.properties
+++ b/stack/services/src/test/resources/usergrid-custom-test.properties
@@ -31,7 +31,7 @@ usergrid.scheduler.job.timeout=300000
usergrid.notifications.listener.run=false
elasticsearch.index_prefix=services_tests
elasticsearch.managment_index=usergrid_services_management
-cassandra.application.keyspace=service_tests_schema
+#cassandra.keyspace.application=service_tests_schema
elasticsearch.buffer_timeout=1
elasticsearch.queue_impl.resolution=true