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/06 19:41:12 UTC
[4/6] start queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/53810396/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 27e6d27..faa5091 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
@@ -62,10 +62,11 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
private User user1;
private NotificationsService ns;
QueueListener listener;
+ private String notifierName = "apNs";
@BeforeClass
public static void setup(){
- ApplicationQueueManager.DEFAULT_QUEUE_NAME = "notifications/test/" + UUID.randomUUID().toString()+";"+"notifications/test/" + UUID.randomUUID().toString();
+ ApplicationQueueManager.DEFAULT_QUEUE_NAME = "test";
}
@Override
@@ -75,7 +76,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
super.before();
// create apns notifier //
app.clear();
- app.put("name", "apNs");
+ app.put("name", notifierName);
app.put("provider",PROVIDER);
app.put("environment", USE_REAL_CONNECTIONS ? "development" : "mock");
// app.put("certificatePassword","pushy-test");
@@ -93,10 +94,8 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
app.clear();
app.put(notifierKey, PUSH_TOKEN);
app.put("name", "device1");
-
e = app.testRequest(ServiceAction.POST, 1, "devices").getEntity();
app.testRequest(ServiceAction.GET, 1, "devices", e.getUuid());
-
device1 = app.getEm().get(e.getUuid(), Device.class);
assertEquals(device1.getProperty(notifierKey), PUSH_TOKEN);
@@ -105,6 +104,9 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
app.put("name", "device2");
e = app.testRequest(ServiceAction.POST, 1, "devices").getEntity();
device2 = app.getEm().get(e.getUuid(), Device.class);
+ Map<String, Object> props = app.getEm().getProperties(e);
+ assertEquals(device2.getProperty(notifierKey), PUSH_TOKEN);
+ app.getEm().refreshIndex();
// create User
user1 = new User();
@@ -130,6 +132,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
PathQuery pathQuery = new PathQuery( new SimpleEntityRef(app.getEm().getApplicationRef()), query);
ns.TEST_PATH_QUERY = pathQuery;
+ app.getEm().refreshIndex();
listener = new QueueListener(ns.getServiceManagerFactory(),ns.getEntityManagerFactory(),ns.getMetricsFactory(), new Properties());
listener.DEFAULT_SLEEP = 200;
@@ -181,7 +184,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
// verify Query for CREATED state
Query query = new Query();
- query.addEqualityFilter("state", Notification.State.FINISHED.toString());
+ query.addEqualityFilter("state", Notification.State.STARTED.toString());
Results results = app.getEm().searchCollection(
app.getEm().getApplicationRef(), "notifications", query);
Entity entity = results.getEntitiesMap().get(notification.getUuid());
@@ -465,24 +468,18 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
public void twoDevicesOneNotifier() throws Exception {
// create push notification //
-
-
app.clear();
String payload = getPayload();
Map<String, String> payloads = new HashMap<String, String>(1);
- payloads.put(notifier.getUuid().toString(), payload);
+ payloads.put(notifierName, payload);
app.put("payloads", payloads);
app.put("queued", System.currentTimeMillis());
- Entity e = app.testRequest(ServiceAction.POST, 1, "notifications")
- .getEntity();
+ Entity e = app.testRequest(ServiceAction.POST, 1, "notifications").getEntity();
app.testRequest(ServiceAction.GET, 1, "notifications", e.getUuid());
- Notification notification = app.getEm().get(e.getUuid(),
- Notification.class);
- assertEquals(
- notification.getPayloads().get(notifier.getUuid().toString()),
- payload);
+ Notification notification = app.getEm().get(e.getUuid(),Notification.class);
+ //assertEquals(notification.getPayloads().get(notifier.getUuid().toString()),payload);
// perform push //
@@ -494,9 +491,10 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
@Test
public void twoDevicesTwoNotifiers() throws Exception {
+ String notifier2Name = "apNs2";
// create a 2nd notifier //
app.clear();
- app.put("name", "apNs2");
+ app.put("name", notifier2Name);
app.put("provider", PROVIDER);
app.put("environment", "development");
InputStream fis = getClass().getClassLoader().getResourceAsStream(
@@ -516,10 +514,10 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
assertEquals(notifier2.getProvider(), PROVIDER);
assertEquals(notifier2.getEnvironment(), "development");
- String key = notifier.getName() + NOTIFIER_ID_POSTFIX;
- String key2 = notifier2.getName() + NOTIFIER_ID_POSTFIX;
+ String key = notifierName + NOTIFIER_ID_POSTFIX;
+ String key2 = notifier2Name + NOTIFIER_ID_POSTFIX;
device2.setProperty(key, null);
- device2.setProperty(key2, null);
+ device2.setProperty(key2, PUSH_TOKEN);
app.getEm().update(device2);
app.getEm().refreshIndex();
@@ -529,8 +527,8 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
app.clear();
String payload = getPayload();
Map<String, String> payloads = new HashMap<String, String>(1);
- payloads.put(notifier.getUuid().toString(), payload);
- payloads.put(notifier2.getUuid().toString(), payload);
+ payloads.put(notifierName, payload);
+ payloads.put(notifier2Name, payload);
app.put("payloads", payloads);
app.put("queued", System.currentTimeMillis());
@@ -539,11 +537,8 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
app.getEm().refreshIndex();
- Notification notification = app.getEm().get(e.getUuid(),
- Notification.class);
- assertEquals(
- notification.getPayloads().get(notifier.getUuid().toString()),
- payload);
+ Notification notification = app.getEm().get(e.getUuid(), Notification.class);
+ assertEquals(notification.getPayloads().get(notifierName), payload);
// perform push //
notification = scheduleNotificationAndWait(notification);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/53810396/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 8907226..034723e 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
@@ -61,7 +61,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
@BeforeClass
public static void setup(){
- ApplicationQueueManager.DEFAULT_QUEUE_NAME = "notifications/test/" + UUID.randomUUID().toString()+";"+"notifications/test/" + UUID.randomUUID().toString();
+ ApplicationQueueManager.DEFAULT_QUEUE_NAME = "test";
}
@Override
@Before