X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FCRM%2FCore%2FCommunityMessagesTest.php;h=6250f90769416790d73e66f00f7595f616c3168a;hb=397d0aec7771968e6ad649229f9a72c9c0e9b12c;hp=53cc94004c0619bad8edfb8109576b3d8ca593df;hpb=4cbe18b880934fc136c432057b8612cefd988522;p=civicrm-core.git
diff --git a/tests/phpunit/CRM/Core/CommunityMessagesTest.php b/tests/phpunit/CRM/Core/CommunityMessagesTest.php
index 53cc94004c..6250f90769 100644
--- a/tests/phpunit/CRM/Core/CommunityMessagesTest.php
+++ b/tests/phpunit/CRM/Core/CommunityMessagesTest.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.5 |
+ | CiviCRM version 4.6 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
@@ -28,7 +28,18 @@
require_once 'CiviTest/CiviUnitTestCase.php';
+
+/**
+ * Class CRM_Core_CommunityMessagesTest
+ */
class CRM_Core_CommunityMessagesTest extends CiviUnitTestCase {
+
+ /**
+ * The max difference between two times such that they should be
+ * treated as equals (expressed in seconds).
+ */
+ const APPROX_TIME_EQUALITY = 2;
+
/**
* @var CRM_Utils_Cache_Interface
*/
@@ -185,7 +196,7 @@ class CRM_Core_CommunityMessagesTest extends CiviUnitTestCase {
);
$doc1 = $communityMessages->getDocument();
$this->assertEquals('
First valid response
', $doc1['messages'][0]['markup']);
- $this->assertEquals(strtotime('2013-03-01 10:10:00'), $doc1['expires']);
+ $this->assertApproxEquals(strtotime('2013-03-01 10:10:00'), $doc1['expires'], self::APPROX_TIME_EQUALITY);
// second try, $doc1 hasn't expired yet, so still use it
CRM_Utils_Time::setTime('2013-03-01 10:09:00');
@@ -195,7 +206,7 @@ class CRM_Core_CommunityMessagesTest extends CiviUnitTestCase {
);
$doc2 = $communityMessages->getDocument();
$this->assertEquals('First valid response
', $doc2['messages'][0]['markup']);
- $this->assertEquals(strtotime('2013-03-01 10:10:00'), $doc2['expires']);
+ $this->assertApproxEquals(strtotime('2013-03-01 10:10:00'), $doc2['expires'], self::APPROX_TIME_EQUALITY);
// third try, $doc1 expired, update it
CRM_Utils_Time::setTime('2013-03-01 12:00:02'); // more than 2 hours later (DEFAULT_RETRY)
@@ -205,7 +216,7 @@ class CRM_Core_CommunityMessagesTest extends CiviUnitTestCase {
);
$doc3 = $communityMessages->getDocument();
$this->assertEquals('Second valid response
', $doc3['messages'][0]['markup']);
- $this->assertEquals(strtotime('2013-03-01 12:10:02'), $doc3['expires']);
+ $this->assertApproxEquals(strtotime('2013-03-01 12:10:02'), $doc3['expires'], self::APPROX_TIME_EQUALITY);
}
/**
@@ -270,7 +281,7 @@ class CRM_Core_CommunityMessagesTest extends CiviUnitTestCase {
);
$doc1 = $communityMessages->getDocument();
$this->assertEquals('First valid response
', $doc1['messages'][0]['markup']);
- $this->assertEquals(strtotime('2013-03-01 10:10:00'), $doc1['expires']);
+ $this->assertApproxEquals(strtotime('2013-03-01 10:10:00'), $doc1['expires'], self::APPROX_TIME_EQUALITY);
// second try, $doc1 has expired; bad response; keep old data
CRM_Utils_Time::setTime('2013-03-01 12:00:02'); // more than 2 hours later (DEFAULT_RETRY)
@@ -300,7 +311,7 @@ class CRM_Core_CommunityMessagesTest extends CiviUnitTestCase {
);
$doc4 = $communityMessages->getDocument();
$this->assertEquals('Second valid response
', $doc4['messages'][0]['markup']);
- $this->assertEquals(strtotime('2013-03-01 12:20:02'), $doc4['expires']);
+ $this->assertApproxEquals(strtotime('2013-03-01 12:20:02'), $doc4['expires'], self::APPROX_TIME_EQUALITY);
}
/**
@@ -353,7 +364,7 @@ class CRM_Core_CommunityMessagesTest extends CiviUnitTestCase {
$this->assertEquals($trials, $freq['Two
']);
}
- function testEvalMarkup() {
+ public function testEvalMarkup() {
$communityMessages = new CRM_Core_CommunityMessages(
$this->cache,
$this->expectNoHttpRequest()