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 2014/10/15 22:03:23 UTC
git commit: fixing query to all
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 3b1276650 -> 479bbeb6d
fixing query to all
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/479bbeb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/479bbeb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/479bbeb6
Branch: refs/heads/two-dot-o
Commit: 479bbeb6d4dad8fce0ca0c1800bd45799d86c8e1
Parents: 3b12766
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Oct 15 14:03:04 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Oct 15 14:03:04 2014 -0600
----------------------------------------------------------------------
.../notifications/apns/NotificationsServiceIT.java | 11 +++++------
.../notifications/gcm/NotificationsServiceIT.java | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/479bbeb6/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 905483e..e0c3b37 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
@@ -463,7 +463,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
app.put("queued", System.currentTimeMillis());
app.put("debug",true);
- Entity e = app.testRequest(ServiceAction.POST, 1, "notifications",";ql=notifications").getEntity();
+ Entity e = app.testRequest(ServiceAction.POST, 1, "devices","notifications").getEntity();
app.testRequest(ServiceAction.GET, 1, "notifications", e.getUuid());
Notification notification = app.getEm().get(e.getUuid(),Notification.class);
@@ -521,7 +521,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
app.put("queued", System.currentTimeMillis());
app.put("debug",true);
- e = app.testRequest(ServiceAction.POST, 1, "notifications",";ql=notifications").getEntity();
+ e = app.testRequest(ServiceAction.POST, 1, "devices","notifications").getEntity();
app.testRequest(ServiceAction.GET, 1, "notifications", e.getUuid());
app.getEm().refreshIndex();
@@ -554,8 +554,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
app.put("p12Certificate", certBytes);
fis.close();
- Entity e = app.testRequest(ServiceAction.POST, 1, "notifiers")
- .getEntity();
+ Entity e = app.testRequest(ServiceAction.POST, 1, "notifiers").getEntity();
app.testRequest(ServiceAction.GET, 1, "notifiers", nameValue);
app.getEm().refreshIndex();
@@ -602,7 +601,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
app.getEm().refreshIndex();
- checkReceipts(notification, 2);
+ checkReceipts(notification, 1);
}
@Ignore("todo: how can I mock this?")
@@ -842,7 +841,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
app.put("debug",true);
// create a notification
- entity = app.testRequest(ServiceAction.POST, 1, "notifications",";ql=notifications").getEntity();
+ entity = app.testRequest(ServiceAction.POST, 1, "devices","notifications").getEntity();
app.testRequest(ServiceAction.GET, 1, "notifications", entity.getUuid());
app.getEm().refreshIndex();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/479bbeb6/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
index 7143413..932c560 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
@@ -221,7 +221,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
app.put("queued", System.currentTimeMillis());
app.put("debug",true);
- Entity e = app.testRequest(ServiceAction.POST, 1, "notifications",";ql=notifications") .getEntity();
+ Entity e = app.testRequest(ServiceAction.POST, 1, "devices","notifications") .getEntity();
app.testRequest(ServiceAction.GET, 1, "notifications", e.getUuid());
Notification notification = app.getEm().get(e.getUuid(), Notification.class);