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 2014/10/16 06:30:46 UTC
[04/15] git commit: adding collections test
adding collections test
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dc9211bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dc9211bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dc9211bd
Branch: refs/heads/cloudformation-update
Commit: dc9211bd4fdbe375f075f48b2abfc14b640fe549
Parents: 72fc2bd
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Oct 14 16:39:44 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Oct 14 16:39:44 2014 -0600
----------------------------------------------------------------------
.../AbstractServiceNotificationIT.java | 2 ++
.../apns/NotificationsServiceIT.java | 20 ++++++++++++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc9211bd/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java b/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java
index f67d731..651c94f 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/AbstractServiceNotificationIT.java
@@ -63,6 +63,8 @@ public class AbstractServiceNotificationIT extends AbstractServiceIT {
return ns;
}
+
+
protected Notification scheduleNotificationAndWait(Notification notification)
throws Exception {
long timeout = System.currentTimeMillis() + 60000;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc9211bd/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java
index 935f6b6..aef4da5 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/NotificationsServiceIT.java
@@ -64,6 +64,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
private NotificationsService ns;
QueueListener listener;
private String notifierName = "apNs";
+ private User user2;
@BeforeClass
public static void setup(){
@@ -114,8 +115,23 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
user1.setUsername("user1");
user1.setEmail("user1@usergrid.org");
user1 = app.getEm().create(user1);
- app.getEm().createConnection(user1, "devices", device1);
- app.getEm().createConnection(user1, "devices", device2);
+
+ // create User
+ user2 = new User();
+ user2.setUsername("user2");
+ user2.setEmail("user2@usergrid.org");
+ user2 = app.getEm().create(user2);
+
+ app.clear();
+ e = app.testRequest(ServiceAction.POST, 1, "users",user2.getUuid(),"devices",device1.getUuid()).getEntity();
+ app.clear();
+ e = app.testRequest(ServiceAction.POST, 1, "users",user1.getUuid(),"devices",device1.getUuid()).getEntity();
+ List device1Users = app.getEm().getCollection(device1,"users",null,100, Query.Level.REFS,false).getEntities();
+ assertEquals(device1Users.size(),1);
+
+ app.clear();
+ e = app.testRequest(ServiceAction.POST, 1, "users",user1.getUuid(),"devices",device2.getUuid()).getEntity();
+
// create Group
group1 = new Group();