You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/10/01 16:51:49 UTC

[13/35] git commit: removing static from tests

removing static from tests


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

Branch: refs/heads/two-dot-o-rebuildable-index
Commit: c0f377dfdc03ea25cb3452c3a9bad3e290e12746
Parents: 86edd64
Author: Shawn Feldman <sf...@apache.org>
Authored: Sun Sep 28 09:49:40 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Sun Sep 28 09:49:40 2014 -0600

----------------------------------------------------------------------
 .../apache/usergrid/services/notifications/QueueListener.java  | 6 +++---
 .../services/notifications/apns/NotificationsServiceIT.java    | 2 +-
 .../services/notifications/gcm/NotificationsServiceIT.java     | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c0f377df/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
index 056c3ca..043bcb2 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
@@ -35,8 +35,8 @@ import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class QueueListener  {
-    public static final long MESSAGE_TRANSACTION_TIMEOUT = 60 * 5 * 1000;
-    public static  long DEFAULT_SLEEP = 5000;
+    public  final long MESSAGE_TRANSACTION_TIMEOUT = 60 * 5 * 1000;
+    public   long DEFAULT_SLEEP = 5000;
 
     private static final Logger LOG = LoggerFactory.getLogger(QueueListener.class);
 
@@ -63,7 +63,7 @@ public class QueueListener  {
     ExecutorService pool;
     List<Future> futures;
 
-    public static final String MAX_THREADS = "2";
+    public  final String MAX_THREADS = "2";
     private Integer batchSize = 1000;
     private String[] queueNames;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c0f377df/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 a47dc99..1985b19 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
@@ -71,7 +71,6 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
     public void before() throws Exception {
         ApplicationQueueManager.DEFAULT_QUEUE_NAME = "notifications/test/" + UUID.randomUUID().toString()+";"+"notifications/test/" + UUID.randomUUID().toString();
 
-        QueueListener.DEFAULT_SLEEP = 200;
         super.before();
         // create apns notifier //
         app.clear();
@@ -132,6 +131,7 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
         ns.TEST_PATH_QUERY = pathQuery;
 
         listener = new QueueListener(ns.getServiceManagerFactory(),ns.getEntityManagerFactory(),ns.getMetricsFactory(), new Properties());
+        listener.DEFAULT_SLEEP = 200;
         listener.run();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c0f377df/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 eb3c8b8..fdcf7b6 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
@@ -64,7 +64,6 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
     @Before
     public void before() throws Exception {
         ApplicationQueueManager.DEFAULT_QUEUE_NAME = "notifications/test/" + UUID.randomUUID().toString()+";"+"notifications/test/" + UUID.randomUUID().toString();
-        QueueListener.DEFAULT_SLEEP = 200;
 
         super.before();
 
@@ -107,6 +106,8 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
         ns.TEST_PATH_QUERY = pathQuery;
         listener = new QueueListener(ns.getServiceManagerFactory(),
                 ns.getEntityManagerFactory(),ns.getMetricsFactory(), new Properties());
+        listener.DEFAULT_SLEEP = 200;
+
         listener.run();
     }