From 77f9d967a0d287f2d75e8f2cafc91f6ff66d80fc Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 22 Jun 2020 12:47:28 +0300
Subject: [PATCH] Take time zone into account in NotifyCommandTest and use 24
hour format.
---
.../Command/ScheduledSearch/NotifyCommandTest.php | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/module/VuFindConsole/tests/unit-tests/src/VuFindTest/Command/ScheduledSearch/NotifyCommandTest.php b/module/VuFindConsole/tests/unit-tests/src/VuFindTest/Command/ScheduledSearch/NotifyCommandTest.php
index befa6bb4b99..bc962a24d9c 100644
--- a/module/VuFindConsole/tests/unit-tests/src/VuFindTest/Command/ScheduledSearch/NotifyCommandTest.php
+++ b/module/VuFindConsole/tests/unit-tests/src/VuFindTest/Command/ScheduledSearch/NotifyCommandTest.php
@@ -97,7 +97,7 @@ class NotifyCommandTest extends \PHPUnit\Framework\TestCase
*/
public function testNotificationWithRecentExecution()
{
- $lastDate = date('Y-m-d h:i:s');
+ $lastDate = date('Y-m-d H:i:s');
$overrides = [
'last_notification_sent' => $lastDate,
'search_object' => null,
@@ -235,8 +235,9 @@ class NotifyCommandTest extends \PHPUnit\Framework\TestCase
);
$commandTester = new CommandTester($command);
$commandTester->execute([]);
+ $zeroDate = str_replace(' ', 'T', date('Y-m-d H:i:s', 0)) . 'Z';
$expected = "Processing 1 searches\n"
- . " No new results for search (1): 1970-01-01T00:00:00Z < 2000-01-01T00:00:00Z\n"
+ . " No new results for search (1): $zeroDate < 2000-01-01T00:00:00Z\n"
. "Done processing searches\n";
$this->assertEquals($expected, $commandTester->getDisplay());
$this->assertEquals(0, $commandTester->getStatusCode());
@@ -258,14 +259,15 @@ class NotifyCommandTest extends \PHPUnit\Framework\TestCase
$params->expects($this->any())->method('getCheckboxFacets')
->will($this->returnValue([]));
};
- $now = str_replace(' ', 'T', date('Y-m-d h:i:s')) . 'Z';
+ $date = date('Y-m-d H:i:s');
+ $expectedDate = str_replace(' ', 'T', $date) . 'Z';
$record = new \VuFindTest\RecordDriver\TestHarness();
$record->setRawData(
[
- 'FirstIndexed' => $now,
+ 'FirstIndexed' => $date,
]
);
- $resultsCallback = function ($results) use ($now, $record) {
+ $resultsCallback = function ($results) use ($record) {
$results->expects($this->any())->method('getSearchId')
->will($this->returnValue(1));
$results->expects($this->any())->method('getResults')
@@ -317,7 +319,7 @@ class NotifyCommandTest extends \PHPUnit\Framework\TestCase
$commandTester = new CommandTester($command);
$commandTester->execute([]);
$expected = "Processing 1 searches\n"
- . " New results for search (1): $now >= 2000-01-01T00:00:00Z\n"
+ . " New results for search (1): $expectedDate >= 2000-01-01T00:00:00Z\n"
. "Done processing searches\n";
$this->assertEquals($expected, $commandTester->getDisplay());
$this->assertEquals(0, $commandTester->getStatusCode());
--
GitLab