From e80b87f1c0761cd1cf9bd4812f5f2afcf576b868 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 28 Apr 2010 04:44:56 +0000 Subject: [PATCH] MINOR Fixed AggregateTest for MSSQLDatabase (wrong date formatting) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103640 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- tests/model/AggregateTest.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/model/AggregateTest.php b/tests/model/AggregateTest.php index a17fd8ca0..b9a8351e5 100644 --- a/tests/model/AggregateTest.php +++ b/tests/model/AggregateTest.php @@ -93,13 +93,13 @@ class AggregateTest extends SapphireTest { */ function testBaseFieldAggregate() { $this->assertEquals( - DataObject::Aggregate('AggregateTest_Foo')->Max('LastEdited'), - DataObject::get_one('AggregateTest_Foo', '', '', 'LastEdited DESC')->LastEdited + $this->formatDate(DataObject::Aggregate('AggregateTest_Foo')->Max('LastEdited')), + $this->formatDate(DataObject::get_one('AggregateTest_Foo', '', '', 'LastEdited DESC')->LastEdited) ); $this->assertEquals( - DataObject::Aggregate('AggregateTest_Foo')->Max('Created'), - DataObject::get_one('AggregateTest_Foo', '', '', 'Created DESC')->Created + $this->formatDate(DataObject::Aggregate('AggregateTest_Foo')->Max('Created')), + $this->formatDate(DataObject::get_one('AggregateTest_Foo', '', '', 'Created DESC')->Created) ); } /* */ @@ -175,4 +175,14 @@ class AggregateTest extends SapphireTest { } /* */ + /** + * Copied from DataObject::__construct(), special case for MSSQLDatabase. + * + * @param String + * @return String + */ + protected function formatDate($dateStr) { + $dateStr = preg_replace('/:[0-9][0-9][0-9]([ap]m)$/i', ' \\1', $dateStr); + return date('Y-m-d H:i:s', strtotime($dateStr)); + } }