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:01:13 UTC
[20/23] incubator-usergrid git commit: fix tests
fix tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/66b97cbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/66b97cbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/66b97cbf
Branch: refs/heads/USERGRID-744
Commit: 66b97cbf0bd38cf3696af02c9c43270de455ebc6
Parents: 42860a0
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Jun 12 12:15:30 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Jun 12 12:15:30 2015 -0600
----------------------------------------------------------------------
.../org/apache/usergrid/corepersistence/CpRelationManager.java | 3 ++-
.../test/java/org/apache/usergrid/persistence/PathQueryIT.java | 4 ++++
.../test/java/org/apache/usergrid/persistence/PermissionsIT.java | 1 +
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/66b97cbf/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
index 1260278..3df09e6 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
@@ -346,8 +346,9 @@ public class CpRelationManager implements RelationManager {
@Override
public Entity addToCollection( String collectionName, EntityRef itemRef ) throws Exception {
+ Preconditions.checkNotNull(itemRef,"itemref is null");
CollectionInfo collection = getDefaultSchema().getCollection( headEntity.getType(), collectionName );
- if ( ( collection != null ) && !collection.getType().equals( itemRef.getType() ) ) {
+ if ( ( collection != null && collection.getType()!=null ) && !collection.getType().equals( itemRef.getType() ) ) {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/66b97cbf/stack/core/src/test/java/org/apache/usergrid/persistence/PathQueryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/PathQueryIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/PathQueryIT.java
index fee93c3..e6ecf97 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PathQueryIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PathQueryIT.java
@@ -65,6 +65,8 @@ public class PathQueryIT extends AbstractCoreIT {
app.refreshIndex();
+ Thread.sleep(1000);
+
// pick an arbitrary user, ensure it has 5 devices
Results devices = em.getCollection( users.get( 10 ), "devices", null, 20, Level.IDS, false );
assertEquals( 5, devices.size() );
@@ -92,6 +94,7 @@ public class PathQueryIT extends AbstractCoreIT {
deviceQuery.setLimit( pageSize );
int expectedDeviceQuerySize = 3;
+
PathQuery<EntityRef> usersPQ = new PathQuery<EntityRef>(
new SimpleEntityRef( em.getApplicationRef()), userQuery );
PathQuery<Entity> devicesPQ = usersPQ.chain( deviceQuery );
@@ -200,6 +203,7 @@ public class PathQueryIT extends AbstractCoreIT {
assertEquals( expectedGroupQuerySize * expectedUserQuerySize, userSet.size() );
+ Thread.sleep(1000);
// ORIGINAL TEST, restore
PathQuery groupsPQ2 = new PathQuery(new SimpleEntityRef( em.getApplicationRef() ), groupQuery );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/66b97cbf/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
index 8ee0bf5..a01692a 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
@@ -147,6 +147,7 @@ public class PermissionsIT extends AbstractCoreIT {
em.deleteGroupRole( group.getUuid(), "author" );
app.refreshIndex();
+ Thread.sleep(1000);
roles = em.getGroupRoles( group.getUuid() );
assertEquals( "proper number of group roles not set", 1, roles.size() );