usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject git commit: Meant to commit these with my notification fixes Friday.
Date Mon, 08 Sep 2014 13:29:54 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o 55e5c163c -> 3b73cec8a


Meant to commit these with my notification fixes Friday.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3b73cec8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3b73cec8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3b73cec8

Branch: refs/heads/two-dot-o
Commit: 3b73cec8a8d118bc77b33d1ff14161c7edb2ef7a
Parents: 55e5c16
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Mon Sep 8 09:29:38 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Mon Sep 8 09:29:38 2014 -0400

----------------------------------------------------------------------
 stack/services/pom.xml                                        | 2 +-
 .../services/notifications/apns/NotificationsServiceIT.java   | 4 ++++
 .../services/notifications/gcm/NotificationsServiceIT.java    | 7 +++----
 3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3b73cec8/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 3a27a50..e401440 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -27,7 +27,7 @@
   <!-- Override these properties in your settings.xml in an active profile -->
   <properties>
     <services.it.forkCount>3</services.it.forkCount>
-    <services.it.reuseForks>true</services.it.reuseForks>
+    <services.it.reuseForks>false</services.it.reuseForks>
     <services.it.parallel>suites</services.it.parallel>
     <services.it.threadCount>2</services.it.threadCount>
   </properties>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3b73cec8/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 41eb376..13cd29f 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
@@ -535,6 +535,8 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT
{
         // perform push //
         notification = scheduleNotificationAndWait(notification);
 
+        app.getEm().refreshIndex();
+
         checkReceipts(notification, 2); //the second notifier isn't associated correctly
so its 3 instead of 4
     }
 
@@ -592,6 +594,8 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT
{
         // perform push //
         notification = scheduleNotificationAndWait(notification);
 
+        app.getEm().refreshIndex();
+
         checkReceipts(notification, 2);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3b73cec8/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 e77541f..e860258 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
@@ -18,15 +18,12 @@ package org.apache.usergrid.services.notifications.gcm;
 
 import org.apache.usergrid.persistence.*;
 import org.apache.usergrid.persistence.index.query.Query;
-import org.apache.usergrid.services.AbstractServiceIT;
-import org.apache.usergrid.services.ServiceManagerFactory;
 import org.apache.usergrid.services.ServiceParameter;
 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.junit.rules.TestName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,7 +33,6 @@ import java.util.*;
 
 import org.apache.usergrid.persistence.entities.Device;
 import org.apache.usergrid.services.ServiceAction;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import static org.junit.Assert.*;
 import static org.apache.usergrid.services.notifications.NotificationsService.NOTIFIER_ID_POSTFIX;
@@ -218,6 +214,9 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT
{
 
         // perform push //
         notification = scheduleNotificationAndWait(notification);
+
+        app.getEm().refreshIndex();
+
         checkReceipts(notification, 1);
     }
 


Mime
View raw message