Commit 8fe28ca9 authored by stefanooldeman's avatar stefanooldeman

test formatDate on correct input

parent 7c1c2adf
...@@ -187,29 +187,50 @@ class Solarium_Query_HelperTest extends PHPUnit_Framework_TestCase ...@@ -187,29 +187,50 @@ class Solarium_Query_HelperTest extends PHPUnit_Framework_TestCase
public function testFormatTimestampInput() public function testFormatTimestampInput()
{ {
$actual = $this->_helper->formatDate(strtotime('2011-10-01'));
$this->assertNotEquals( $this->assertNotEquals(
false, false,
$this->_helper->formatDate(strtotime('2011-10-01')), $actual,
'Expects timestamp input to be accpted' 'Expects timestamp input to be accpted'
); );
$this->assertEquals(
$this->_mockFormatDateOutput(strtotime('2011-10-01')),
$actual,
'Expects formatDate with Timstamp input to output ISO8601 with stripped timezone'
);
} }
public function testFormatDateStringInput() public function testFormatDateStringInput()
{ {
$actual = $this->_helper->formatDate(date('Y-m-d', strtotime('2011-10-01')));
$this->assertNotEquals( $this->assertNotEquals(
false, false,
$this->_helper->formatDate(date('Y-m-d', strtotime('2011-10-01'))), $actual,
'Expects date string inputs to be accepted' 'Expects date string inputs to be accepted'
); );
$this->assertEquals(
$this->_mockFormatDateOutput(strtotime('2011-10-01')),
$actual,
'Expects formatDate with String input to output ISO8601 with stripped timezone'
);
} }
public function testFormatDateTimeInput() public function testFormatDateTimeInput()
{ {
$actual = $this->_helper->formatDate(new DateTime(strtotime('2011-10-01')));
$this->assertNotEquals( $this->assertNotEquals(
false, false,
$this->_helper->formatDate(new DateTime(strtotime('2011-10-01'))), $actual,
'Expects DateTime object to be accepted' 'Expects DateTime object to be accepted'
); );
$this->assertEquals(
$this->_mockFormatDateOutput(strtotime('2011-10-01')),
$actual,
'Expects formatDate with DateTime input to output ISO8601 with stripped timezone'
);
} }
public function testFormatDate() public function testFormatDate()
...@@ -218,6 +239,17 @@ class Solarium_Query_HelperTest extends PHPUnit_Framework_TestCase ...@@ -218,6 +239,17 @@ class Solarium_Query_HelperTest extends PHPUnit_Framework_TestCase
$expected = strtoupper('Z'); $expected = strtoupper('Z');
$actual = substr($this->_helper->formatDate(time()), 19, 20); $actual = substr($this->_helper->formatDate(time()), 19, 20);
$this->assertEquals($expected, $actual, 'Expects last charachter to be uppercased Z'); $this->assertEquals($expected, $actual, 'Expects last charachter to be uppercased Z');
$this->assertEquals(
$this->_mockFormatDateOutput(time()),
$this->_helper->formatDate(time())
);
}
protected function _mockFormatDateOutput($timestamp)
{
$date = new DateTime($timestamp);
return strstr($date->format(DateTime::ISO8601), '+', true) . 'Z';
} }
public function testAssemble() public function testAssemble()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment