diff options
author | Mark Pemberton <mpemberton5@gmail.com> | 2011-05-21 22:06:44 -0400 |
---|---|---|
committer | Mark Pemberton <mpemberton5@gmail.com> | 2011-05-21 22:06:44 -0400 |
commit | 342d1c3205c2f2ae9d918f66e28e8ffa153c2854 (patch) | |
tree | ef1e7b543522e51f6579f572feb2efab33bc4226 | |
parent | b105867e75f103ae2b0c54edfaa9ce6467a8a258 (diff) | |
download | semanticscuttle-342d1c3205c2f2ae9d918f66e28e8ffa153c2854.tar.gz semanticscuttle-342d1c3205c2f2ae9d918f66e28e8ffa153c2854.tar.bz2 |
Altered tests to be more timezone friendly
-rw-r--r-- | src/SemanticScuttle/Service/Bookmark.php | 2 | ||||
-rw-r--r-- | tests/Api/PostsAddTest.php | 4 | ||||
-rw-r--r-- | tests/Bookmark2TagTest.php | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php index 17ab7ba..f69b4d1 100644 --- a/src/SemanticScuttle/Service/Bookmark.php +++ b/src/SemanticScuttle/Service/Bookmark.php @@ -486,7 +486,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService } else { $time = strtotime($date); } - $datetime = gmdate('Y-m-d H:i:s', $time); + $datetime = date('Y-m-d H:i:s', $time); if ($short === '') { $short = null; diff --git a/tests/Api/PostsAddTest.php b/tests/Api/PostsAddTest.php index e6d0531..2613a87 100644 --- a/tests/Api/PostsAddTest.php +++ b/tests/Api/PostsAddTest.php @@ -111,7 +111,7 @@ TXT; $this->assertEquals($bmDescription, stripslashes($bm['bDescription'])); $this->assertEquals($bmTags, $bm['tags']); $this->assertEquals( - gmdate('Y-m-d H:i:s', strtotime($bmDatetime)), + date('Y-m-d H:i:s', strtotime($bmDatetime)), $bm['bDatetime'] ); } @@ -173,7 +173,7 @@ TXT; $this->assertEquals($bmDescription, stripslashes($bm['bDescription'])); $this->assertEquals($bmTags, $bm['tags']); $this->assertEquals( - gmdate('Y-m-d H:i:s', strtotime($bmDatetime)), + date('Y-m-d H:i:s', strtotime($bmDatetime)), $bm['bDatetime'] ); } diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php index 66a6e1f..0236a5f 100644 --- a/tests/Bookmark2TagTest.php +++ b/tests/Bookmark2TagTest.php @@ -282,16 +282,16 @@ class Bookmark2TagTest extends TestBase public function testGetPopularTagsDays() { $user = $this->addUser(); - $this->addTagBookmark($user, array('one', 'two'), 'today'); - $this->addTagBookmark($user, array('one', 'thr'), 'today'); - $this->addTagBookmark($user, array('one', 'two'), '-1 day 1 hour'); - $this->addTagBookmark($user, array('one', 'thr'), '-3 days 1 hour'); + $this->addTagBookmark($user, array('one', 'two'), 'now'); + $this->addTagBookmark($user, array('one', 'thr'), 'now'); + $this->addTagBookmark($user, array('one', 'two'), '-1 day -1 hour'); + $this->addTagBookmark($user, array('one', 'thr'), '-3 days -1 hour'); $arTags = $this->b2ts->getPopularTags(null, 10, null, 1); $this->assertInternalType('array', $arTags); $this->assertEquals(3, count($arTags)); - $this->assertContains(array('tag' => 'one', 'bCount' => '3'), $arTags); - $this->assertContains(array('tag' => 'two', 'bCount' => '2'), $arTags); + $this->assertContains(array('tag' => 'one', 'bCount' => '2'), $arTags); + $this->assertContains(array('tag' => 'two', 'bCount' => '1'), $arTags); $this->assertContains(array('tag' => 'thr', 'bCount' => '1'), $arTags); $arTags = $this->b2ts->getPopularTags(null, 10, null, 2); |