You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2014/12/22 17:54:54 UTC
[48/50] incubator-usergrid git commit: Moved PagingEntitiesTest to
use the new REST testing framework( RTF ). Fixed paging in the RTF Fixed
iterator in collection class for the RTF.
Moved PagingEntitiesTest to use the new REST testing framework( RTF ).
Fixed paging in the RTF
Fixed iterator in collection class for the RTF.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a8a4865d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a8a4865d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a8a4865d
Branch: refs/heads/two-dot-o
Commit: a8a4865d561788e94d7350c0039329c9266a2a9a
Parents: d94ccf3
Author: grey <gr...@apigee.com>
Authored: Fri Dec 19 14:27:51 2014 -0800
Committer: grey <gr...@apigee.com>
Committed: Fri Dec 19 14:27:51 2014 -0800
----------------------------------------------------------------------
.../collection/paging/PagingEntitiesTest.java | 145 +++++++++----------
.../test/resource2point0/AbstractRestIT.java | 16 +-
.../test/resource2point0/model/Collection.java | 3 +-
3 files changed, 84 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a8a4865d/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/paging/PagingEntitiesTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/paging/PagingEntitiesTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/paging/PagingEntitiesTest.java
index dcd4188..9889afb 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/paging/PagingEntitiesTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/paging/PagingEntitiesTest.java
@@ -24,14 +24,19 @@ import com.fasterxml.jackson.databind.JsonNode;
import java.io.IOException;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.usergrid.rest.AbstractRestIT;
+
+import org.apache.usergrid.persistence.index.utils.UUIDUtils;
import org.apache.usergrid.rest.TestContextSetup;
import org.apache.usergrid.rest.test.resource.CustomCollection;
+import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource2point0.model.Collection;
+import org.apache.usergrid.rest.test.resource2point0.model.Entity;
import org.apache.commons.lang.ArrayUtils;
import static org.junit.Assert.assertEquals;
import static org.apache.usergrid.utils.MapUtils.hashMap;
+import static org.junit.Assert.assertNotNull;
/**
@@ -42,100 +47,86 @@ import static org.apache.usergrid.utils.MapUtils.hashMap;
*/
public class PagingEntitiesTest extends AbstractRestIT {
- @Rule
- public TestContextSetup context = new TestContextSetup( this );
-
@Test //USERGRID-266
public void pageThroughConnectedEntities() throws IOException {
- CustomCollection activities = context.customCollection( "activities" );
long created = 0;
int maxSize = 100;
- long[] verifyCreated = new long[maxSize];
- Map actor = hashMap( "displayName", "Erin" );
- Map props = new HashMap();
+ Map<String, Object> entityPayload = new HashMap<String,Object>( );
+ String collectionName = "merp"+ UUIDUtils.newTimeUUID();
+ for( created = 0; created < maxSize; created++) {
- props.put( "actor", actor );
- props.put( "verb", "go" );
+ entityPayload.put( "name","value"+created );
+ Entity entity = new Entity(entityPayload );
+ this.app().collection( collectionName).post( entity );
- for ( int i = 0; i < maxSize; i++ ) {
-
- props.put( "ordinal", i );
- JsonNode activity = activities.create( props );
- verifyCreated[i] = activity.findValue( "created" ).longValue();
- if ( i == 0 ) {
- created = activity.findValue( "created" ).longValue();
- }
}
- ArrayUtils.reverse( verifyCreated );
-
- refreshIndex(context.getOrgName(), context.getAppName());
- String query = "select * where created >= " + created;
+ this.refreshIndex();
+ Collection sandboxCollection = this.app().collection( collectionName).get();
+ assertNotNull( sandboxCollection );
- JsonNode node = activities.query( query, "limit", "2" ); //activities.query(query,"");
- int index = 0;
- while ( node.get( "entities" ).get( "created" ) != null ) {
- assertEquals( 2, node.get( "entities" ).size() );
-
- if ( node.get( "cursor" ) != null ) {
- node = activities.query( query, "cursor", node.get( "cursor" ).toString() );
- }
-
- else {
- break;
+ created = 0;
+ for(int i = 0; i< 10; i++) {
+ while ( sandboxCollection.hasNext() ) {
+ Entity returnedEntity = sandboxCollection.next();
+ assertEquals( "value" + created++, returnedEntity.get( "name" ) );
}
+ sandboxCollection = this.app().collection( collectionName ).getNextPage( sandboxCollection, true );
}
- }
-
-
- @Test //USERGRID-1253
- public void pagingQueryReturnCorrectResults() throws Exception {
-
- CustomCollection activities = context.customCollection( "activities" );
-
- long created = 0;
- int maxSize = 23;
- long[] verifyCreated = new long[maxSize];
- Map actor = hashMap( "displayName", "Erin" );
- Map props = new HashMap();
- props.put( "actor", actor );
- props.put( "content", "bragh" );
- for ( int i = 0; i < maxSize; i++ ) {
- if ( i > 17 && i < 23 ) {
- props.put( "verb", "stop" );
- }
- else {
- props.put( "verb", "go" );
- }
- props.put( "ordinal", i );
- JsonNode activity = activities.create( props );
- verifyCreated[i] = activity.findValue( "created" ).longValue();
- if ( i == 18 ) {
- created = activity.findValue( "created" ).longValue();
- }
- }
-
- refreshIndex(context.getOrgName(), context.getAppName());
-
- String query = "select * where created >= " + created + " or verb = 'stop'";
-
- JsonNode node = activities.withQuery( query ).get();
-
- for ( int index = 0; index < 5; index++ ) {
- assertEquals( verifyCreated[maxSize - 1 - index],
- node.get( "entities" ).get( index ).get( "created" ).longValue() );
- }
-
- int totalEntitiesContained = activities.countEntities( query );
-
- assertEquals( 5, totalEntitiesContained );
}
+
+//
+// @Test //USERGRID-1253
+// public void pagingQueryReturnCorrectResults() throws Exception {
+//
+// CustomCollection activities = context.customCollection( "activities" );
+//
+// long created = 0;
+// int maxSize = 23;
+// long[] verifyCreated = new long[maxSize];
+// Map actor = hashMap( "displayName", "Erin" );
+// Map props = new HashMap();
+//
+// props.put( "actor", actor );
+// props.put( "content", "bragh" );
+//
+// for ( int i = 0; i < maxSize; i++ ) {
+//
+// if ( i > 17 && i < 23 ) {
+// props.put( "verb", "stop" );
+// }
+// else {
+// props.put( "verb", "go" );
+// }
+// props.put( "ordinal", i );
+// JsonNode activity = activities.create( props );
+// verifyCreated[i] = activity.findValue( "created" ).longValue();
+// if ( i == 18 ) {
+// created = activity.findValue( "created" ).longValue();
+// }
+// }
+//
+// refreshIndex(context.getOrgName(), context.getAppName());
+//
+// String query = "select * where created >= " + created + " or verb = 'stop'";
+//
+// JsonNode node = activities.withQuery( query ).get();
+//
+// for ( int index = 0; index < 5; index++ ) {
+// assertEquals( verifyCreated[maxSize - 1 - index],
+// node.get( "entities" ).get( index ).get( "created" ).longValue() );
+// }
+//
+// int totalEntitiesContained = activities.countEntities( query );
+//
+// assertEquals( 5, totalEntitiesContained );
+// }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a8a4865d/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
index 59d51ba..242bb43 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
@@ -21,6 +21,8 @@ import java.net.URI;
import java.net.URLClassLoader;
import java.util.Arrays;
+import javax.ws.rs.core.MediaType;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.usergrid.rest.test.resource2point0.endpoints.ApplicationsResource;
import org.apache.usergrid.rest.test.resource2point0.endpoints.OrganizationResource;
@@ -105,12 +107,22 @@ public class AbstractRestIT extends JerseyTest {
///myorg/
protected OrganizationResource org(){
- return clientSetup.restClient.org(clientSetup.getOrganization().getName());
+ return clientSetup.restClient.org( clientSetup.getOrganization().getName() );
}
//myorg/myapp
protected ApplicationsResource app(){
- return clientSetup.restClient.org(clientSetup.getOrganization().getName()).app(clientSetup.getAppName());
+ return clientSetup.restClient.org(clientSetup.getOrganization().getName()).app( clientSetup.getAppName() );
+
+ }
+
+ public void refreshIndex() {
+ //TODO: add error checking and logging
+ clientSetup.restClient.getResource().path( "/refreshindex" )
+ .queryParam( "org_name", clientSetup.getOrganization().getName() )
+ .queryParam( "app_name", clientSetup.getAppName() )
+ .accept( MediaType.APPLICATION_JSON ).post();
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a8a4865d/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Collection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Collection.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Collection.java
index eaa9358..826d3fe 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Collection.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Collection.java
@@ -21,6 +21,7 @@
package org.apache.usergrid.rest.test.resource2point0.model;
import java.util.Iterator;
+import java.util.Map;
/**
@@ -76,7 +77,7 @@ public class Collection implements Iterable<Entity>, Iterator<Entity> {
@Override
public Entity next() {
- return (Entity)entities.next();
+ return new Entity( ( Map<String, Object> ) entities.next() );
}
@Override