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:56 UTC
[03/23] incubator-usergrid git commit: appdelete still not working
appdelete still not working
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a8bb3f21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a8bb3f21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a8bb3f21
Branch: refs/heads/USERGRID-744
Commit: a8bb3f2138cfcbdd872cc1fc96c2b73cc2ee4793
Parents: 269f019
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Jun 11 10:22:02 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Jun 11 10:22:02 2015 -0600
----------------------------------------------------------------------
.../src/test/java/org/apache/usergrid/CoreApplication.java | 6 +++++-
.../usergrid/rest/test/resource2point0/ClientSetup.java | 7 ++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a8bb3f21/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java b/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java
index e56412e..465d238 100644
--- a/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java
+++ b/stack/core/src/test/java/org/apache/usergrid/CoreApplication.java
@@ -232,7 +232,11 @@ public class CoreApplication implements Application, TestRule {
@Override
public synchronized void refreshIndex() {
//Insert test entity and find it
- setup.getEmf().refreshIndex(em.getApplicationId());
+ setup.getEmf().refreshIndex(CpNamingUtils.getManagementApplicationId().getUuid());
+
+ if(!em.getApplicationId().equals(CpNamingUtils.getManagementApplicationId().getUuid())) {
+ setup.getEmf().refreshIndex(em.getApplicationId());
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a8bb3f21/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
index 4cf28e5..2654184 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java
@@ -23,6 +23,7 @@ package org.apache.usergrid.rest.test.resource2point0;
import java.io.IOException;
+import org.apache.usergrid.corepersistence.util.CpNamingUtils;
import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
import org.apache.usergrid.rest.test.resource2point0.model.Application;
import org.apache.usergrid.rest.test.resource2point0.model.Credentials;
@@ -165,7 +166,11 @@ public class ClientSetup implements TestRule {
}
public void refreshIndex() {
- this.restClient.refreshIndex(getOrganizationName(),getAppName(),getAppUuid());
+ this.restClient.refreshIndex(getOrganizationName(),getAppName(), CpNamingUtils.getManagementApplicationId().getUuid().toString());
+
+ if(!CpNamingUtils.getManagementApplicationId().getUuid().toString().equals(getAppUuid())) {
+ this.restClient.refreshIndex(getOrganizationName(), getAppName(), getAppUuid());
+ }
}
public RestClient getRestClient(){