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:53 UTC
[11/15] git commit: changing to uuid
changing to uuid
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ac598c34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ac598c34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ac598c34
Branch: refs/heads/cloudformation-update
Commit: ac598c3409a6278fd5df46c4fd6cc2dde08df8a2
Parents: 479bbeb
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Oct 15 14:24:22 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Oct 15 14:24:22 2014 -0600
----------------------------------------------------------------------
.../notifications/gcm/NotificationsServiceIT.java | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ac598c34/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 932c560..ea0b7da 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
@@ -17,13 +17,11 @@
package org.apache.usergrid.services.notifications.gcm;
import org.apache.usergrid.persistence.*;
+import org.apache.usergrid.persistence.entities.*;
import org.apache.usergrid.persistence.index.query.Query;
import org.apache.usergrid.services.ServiceParameter;
import org.apache.usergrid.services.TestQueueManager;
import org.apache.usergrid.services.notifications.*;
-import org.apache.usergrid.persistence.entities.Notification;
-import org.apache.usergrid.persistence.entities.Notifier;
-import org.apache.usergrid.persistence.entities.Receipt;
import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,7 +30,6 @@ import java.io.IOException;
import java.lang.reflect.Field;
import java.util.*;
-import org.apache.usergrid.persistence.entities.Device;
import org.apache.usergrid.services.ServiceAction;
import static org.junit.Assert.*;
@@ -180,15 +177,13 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
// create user asdf
app.put("username", "asdf");
app.put("email", "asdf@adsf.com");
- Entity user = app.testRequest(ServiceAction.POST, 1, "users").getEntity();
+ User user = (User) app.testRequest(ServiceAction.POST, 1, "users").getEntity();
assertNotNull(user);
// post an existing device to user's devices collection
- Entity device = app.testRequest(ServiceAction.POST, 1, "users",
- user.getUuid(), "devices", device1.getUuid()).getEntity();
+ Entity device = app.testRequest(ServiceAction.POST, 1, "users", user.getUuid(), "devices", device1.getUuid()).getEntity();
assertEquals(device.getUuid(), device1.getUuid());
-
// create and post notification
String payload = "Hello, World!";
Map<String, String> payloads = new HashMap<String, String>(1);
@@ -196,7 +191,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
app.put("payloads", payloads);
app.put("queued", System.currentTimeMillis());
app.put("debug",true);
- Entity e = app.testRequest(ServiceAction.POST, 1,"users","asdf", "notifications").getEntity();
+ Entity e = app.testRequest(ServiceAction.POST, 1,"users",user.getUuid(), "notifications").getEntity();
app.testRequest(ServiceAction.GET, 1, "notifications", e.getUuid());
app.getEm().refreshIndex();