You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/16 23:01:13 UTC

[06/50] incubator-usergrid git commit: Added workaround to get the proper response from a import/includes endpoint.

Added workaround to get the proper response from a import/includes endpoint.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fb8a1f09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fb8a1f09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fb8a1f09

Branch: refs/heads/USERGRID-365
Commit: fb8a1f09b1578b9ce14fc3dfa19db00534ffee8d
Parents: f14e312
Author: grey <gr...@apigee.com>
Authored: Wed Feb 11 14:30:49 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Wed Feb 11 14:30:49 2015 -0800

----------------------------------------------------------------------
 .../org/apache/usergrid/rest/management/ImportResourceIT.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fb8a1f09/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 52f03cd..d1912a0 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
@@ -33,6 +33,7 @@ import org.apache.usergrid.management.importer.S3Upload;
 import org.apache.usergrid.persistence.index.impl.ElasticSearchResource;
 import org.apache.usergrid.persistence.index.utils.UUIDUtils;
 import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
 import org.apache.usergrid.rest.test.resource2point0.model.Collection;
 import org.apache.usergrid.rest.test.resource2point0.model.Entity;
 import org.apache.usergrid.rest.test.resource2point0.model.Organization;
@@ -442,9 +443,11 @@ public class ImportResourceIT extends AbstractRestIT {
                                        .addToPath("import" ).addToPath(importEntity.getUuid().toString() )
                                        .addToPath("includes" ).get();
 
+        ApiResponse importGetIncludesResponse = importGetIncludes.getResponse();
+
         assertNotNull(importGet);
         assertNotNull( importGetIncludes );
-        assertEquals( 1,importGetIncludes.size());
+        assertEquals( 1,importGetIncludesResponse.getEntityCount());
 
         assertEquals("FINISHED", importGet.get("state"));
         assertEquals(1, importGet.get("fileCount"));