activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cshan...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-6177
Date Mon, 22 Feb 2016 12:51:59 GMT
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.13.x e81c32f63 -> a1f309ea1


https://issues.apache.org/jira/browse/AMQ-6177

Fixing CronParserTest so that it checks 24 hour format properly when
using a timezone shifted by 30 minutes

Thanks to Jamie Goodyear for the patch

(cherry picked from commit 0f445a535f8ec1135d6769a9e7c1503fd7b26121)


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

Branch: refs/heads/activemq-5.13.x
Commit: a1f309ea19c3766157566bcef1f3b1a02458a0de
Parents: e81c32f
Author: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Authored: Mon Feb 22 12:50:07 2016 +0000
Committer: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Committed: Mon Feb 22 12:51:51 2016 +0000

----------------------------------------------------------------------
 .../org/apache/activemq/broker/scheduler/CronParserTest.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/a1f309ea/activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java
----------------------------------------------------------------------
diff --git a/activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java
b/activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java
index 2733602..af9f1aa 100644
--- a/activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java
+++ b/activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java
@@ -270,8 +270,8 @@ public class CronParserTest {
         calender.setTimeInMillis(next);
         LOG.debug("next:" + calender.getTime());
         long result = next - current;
-        if (startHours == 8 && startMinutes == 50) {
-            assertEquals(60*40*1000,result);
+        if (startHours == 20 && startMinutes == 50) {
+            assertEquals(60*40*1000,result); // allow for 30 min offset timezone
         } else {
             assertEquals(60*10*1000,result);
         }


Mime
View raw message