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/30 04:39:31 UTC
[05/45] git commit: fix build error
fix build error
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e30a7b32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e30a7b32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e30a7b32
Branch: refs/heads/key-row-sharding
Commit: e30a7b32258b95b1d5d74d6c9ba448dcc80a42f1
Parents: 19aa1a6
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Oct 24 16:19:36 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Oct 24 16:19:36 2014 -0600
----------------------------------------------------------------------
.../apns/MockSuccessfulProviderAdapter.java | 5 ++---
.../apns/NotificationsServiceIT.java | 19 +++----------------
.../gcm/MockSuccessfulProviderAdapter.java | 4 ++--
3 files changed, 7 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e30a7b32/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/MockSuccessfulProviderAdapter.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/MockSuccessfulProviderAdapter.java b/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/MockSuccessfulProviderAdapter.java
index 8c26ef4..e864e4f 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/MockSuccessfulProviderAdapter.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/apns/MockSuccessfulProviderAdapter.java
@@ -74,9 +74,8 @@ public class MockSuccessfulProviderAdapter implements ProviderAdapter {
}
@Override
- public Map<String, Date> getInactiveDevices(Notifier notifier,
- EntityManager em) throws Exception {
- return null;
+ public void removeInactiveDevices(Notifier notifier,
+ EntityManager em) {
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e30a7b32/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 a834400..31a653c 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
@@ -686,15 +686,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
// mock action (based on verified actual behavior) //
if (!USE_REAL_CONNECTIONS) {
ns.providerAdapters.put("apple",
- new MockSuccessfulProviderAdapter() {
- @Override
- public Map<String, Date> getInactiveDevices(
- Notifier notifier, EntityManager em)
- throws Exception {
- return Collections.singletonMap(PUSH_TOKEN,
- new Date());
- }
- });
+ new MockSuccessfulProviderAdapter());
}
// create push notification //
@@ -716,9 +708,6 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
assertEquals(
notification.getPayloads().get(notifier.getUuid().toString()),
payload);
-//
-// ns.addDevice(notification, device1);
-// ns.addDevice(notification, device2);
assertNotNull(device1.getProperty(notifier.getName()
+ NOTIFIER_ID_POSTFIX));
@@ -731,11 +720,9 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
// check provider IDs //
device1 = app.getEm().get(device1, Device.class);
- assertNull(device1
- .getProperty(notifier.getName() + NOTIFIER_ID_POSTFIX));
+ assertNull(device1 .getProperty(notifier.getName() + NOTIFIER_ID_POSTFIX));
device2 = app.getEm().get(device2, Device.class);
- assertNull(device2
- .getProperty(notifier.getName() + NOTIFIER_ID_POSTFIX));
+ assertNull(device2 .getProperty(notifier.getName() + NOTIFIER_ID_POSTFIX));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e30a7b32/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/MockSuccessfulProviderAdapter.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/MockSuccessfulProviderAdapter.java b/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/MockSuccessfulProviderAdapter.java
index 4c258fe..3836fe8 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/MockSuccessfulProviderAdapter.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/MockSuccessfulProviderAdapter.java
@@ -57,9 +57,9 @@ public class MockSuccessfulProviderAdapter implements ProviderAdapter {
}
@Override
- public Map<String, Date> getInactiveDevices(Notifier notifier,
+ public void removeInactiveDevices(Notifier notifier,
EntityManager em) throws Exception {
- return null;
+
}
@Override