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/07 21:27:25 UTC
[09/17] git commit: adding mock for test
adding mock for 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/bdb97958
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bdb97958
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bdb97958
Branch: refs/heads/two-dot-o-events
Commit: bdb97958324bc02c2f07f62a2a0e15af65470c5e
Parents: c5e9285
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Oct 7 10:56:26 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Oct 7 10:56:26 2014 -0600
----------------------------------------------------------------------
.../services/notifications/ApplicationQueueManager.java | 3 ---
.../services/notifications/AbstractServiceNotificationIT.java | 1 -
.../services/notifications/apns/NotificationsServiceIT.java | 7 +++++--
.../services/notifications/gcm/NotificationsServiceIT.java | 6 +++---
4 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bdb97958/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
index 8f3eb54..5d2e554 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
@@ -83,8 +83,6 @@ public class ApplicationQueueManager {
this.queueName = getQueueNames(properties);
}
-
-
public boolean scheduleQueueJob(Notification notification) throws Exception{
return jobScheduler.scheduleQueueJob(notification);
}
@@ -281,7 +279,6 @@ public class ApplicationQueueManager {
* @param messages
* @throws Exception
*/
-
public Observable sendBatchToProviders( final List<QueueMessage> messages, final String queuePath) {
LOG.info("sending batch of {} notifications.", messages.size());
final Meter sendMeter = metricsFactory.getMeter(NotificationsService.class, "send");
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bdb97958/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 8acb0f1..f67d731 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
@@ -91,7 +91,6 @@ public class AbstractServiceNotificationIT extends AbstractServiceIT {
List<EntityRef> list =new ArrayList<EntityRef>();//get all
while(it.hasNext()){
Receipt receipt =it.next();
-
if(receipt.getNotificationUUID().equals(notification.getUuid())) {
list.add(receipt);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bdb97958/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 92bedda..f1d2dea 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
@@ -124,8 +124,10 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
app.getEm().createConnection(group1, "users", user1);
ns = getNotificationService();
-// TestQueueManager qm = new TestQueueManager();
-// ns.TEST_QUEUE_MANAGER = qm;
+
+ TestQueueManager qm = new TestQueueManager();
+ ns.TEST_QUEUE_MANAGER = qm;
+
Query query = new Query();
//query.addIdentifier(sp.getIdentifier());
query.setLimit(100);
@@ -137,6 +139,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
app.getEm().refreshIndex();
listener = new QueueListener(ns.getServiceManagerFactory(),ns.getEntityManagerFactory(),ns.getMetricsFactory(), new Properties());
+ listener.TEST_QUEUE_MANAGER = qm;
listener.DEFAULT_SLEEP = 200;
listener.start();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bdb97958/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 7e8dfdd..6edf0b5 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
@@ -100,8 +100,8 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
device2 = app.getEm().get(e.getUuid(), Device.class);
ns = getNotificationService();
-// TestQueueManager qm = new TestQueueManager();
-// ns.TEST_QUEUE_MANAGER = qm;
+ TestQueueManager qm = new TestQueueManager();
+ ns.TEST_QUEUE_MANAGER = qm;
Query query = new Query();
//query.addIdentifier(sp.getIdentifier());
@@ -114,7 +114,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
listener = new QueueListener(ns.getServiceManagerFactory(),
ns.getEntityManagerFactory(),ns.getMetricsFactory(), new Properties());
listener.DEFAULT_SLEEP = 200;
-
+ listener.TEST_QUEUE_MANAGER = qm;
listener.start();
}