fixing datetime tests on php7.1

- related to issue #600
oroinc · Dec 30, 2016 · 67792db · 67792db
1 parent 0f71ad3
commit 67792db
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractAddressTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Entity/AbstractAddressTest.php
@@ -68,7 +68,7 @@ public function testBeforeSave()
         $this->assertNotNull($address->getCreated());
         $this->assertNotNull($address->getUpdated());
 
-        $this->assertEquals($address->getCreated(), $address->getUpdated());
+        $this->assertEquals($address->getCreated(), $address->getUpdated(), '', 1);
     }
 
     public function testGetRegionName()

diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Entity/EmailBodyTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Entity/EmailBodyTest.php
@@ -66,7 +66,7 @@ public function testBeforeSave()
         $this->assertEquals(false, $entity->getBodyIsText());
         $this->assertEquals(false, $entity->getHasAttachments());
         $this->assertEquals(false, $entity->getPersistent());
-        $this->assertGreaterThanOrEqual($createdAt, $entity->getCreated());
+        $this->assertGreaterThanOrEqual($entity->getCreated(), $createdAt);
     }
 
     public function testTextBodyGetterAndSetter()

diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Entity/EmailTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Entity/EmailTest.php
@@ -102,7 +102,7 @@ public function testBeforeSave()
         $createdAt = new \DateTime('now', new \DateTimeZone('UTC'));
 
         $this->assertEquals(Email::NORMAL_IMPORTANCE, $entity->getImportance());
-        $this->assertGreaterThanOrEqual($createdAt, $entity->getCreated());
+        $this->assertGreaterThanOrEqual($entity->getCreated(), $createdAt);
     }
 
     public function testIsHeadGetterAndSetter()

diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Entity/EmailThreadTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Entity/EmailThreadTest.php
@@ -32,7 +32,7 @@ public function testBeforeSave()
         $createdAt = new \DateTime('now', new \DateTimeZone('UTC'));
 
         $this->assertEquals(Email::NORMAL_IMPORTANCE, $entity->getImportance());
-        $this->assertGreaterThanOrEqual($createdAt, $entity->getCreated());
+        $this->assertGreaterThanOrEqual($entity->getCreated(), $createdAt);
     }
 
     /**

diff --git a/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ChoiceAccountTypeTest.php b/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ChoiceAccountTypeTest.php
@@ -160,6 +160,8 @@ public function testBindValidData($formData, $expectedViewData, $expectedModelDa
      */
     public function setDataProvider()
     {
+        $tokenDateTime = new \DateTime();
+
         return [
             'should have only accountType field' => [
                 [
@@ -188,7 +190,7 @@ public function setDataProvider()
                         'imapHost' => '',
                         'imapPort' => '',
                         'imapEncryption' => '',
-                        'accessTokenExpiresAt' => new \DateTime(),
+                        'accessTokenExpiresAt' => $tokenDateTime,
                         'accessToken' => 'token',
                         'googleAuthCode' => 'googleAuthCode'
                     ],
@@ -197,7 +199,7 @@ public function setDataProvider()
                     'accountType' => 'gmail',
                     'userEmailOrigin' => $this->getUserEmailOrigin([
                         'user' => 'test',
-                        'accessTokenExpiresAt' => new \DateTime(),
+                        'accessTokenExpiresAt' => $tokenDateTime,
                         'googleAuthCode' => 'googleAuthCode',
                         'accessToken' => 'token',
                     ])
@@ -206,7 +208,7 @@ public function setDataProvider()
                     'accountType' => 'gmail',
                     'userEmailOrigin' => $this->getUserEmailOrigin([
                         'user' => 'test',
-                        'accessTokenExpiresAt' => new \DateTime(),
+                        'accessTokenExpiresAt' => $tokenDateTime,
                         'googleAuthCode' => 'googleAuthCode',
                         'accessToken' => 'token'
                     ])
@@ -220,7 +222,7 @@ public function setDataProvider()
                         'imapHost' => '',
                         'imapPort' => '',
                         'imapEncryption' => '',
-                        'accessTokenExpiresAt' => new \DateTime(),
+                        'accessTokenExpiresAt' => $tokenDateTime,
                         'accessToken' => '',
                         'googleAuthCode' => 'googleAuthCode',
                         'password' => '111'

diff --git a/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ConfigurationGmailTypeTest.php b/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ConfigurationGmailTypeTest.php
@@ -141,6 +141,8 @@ public function testBindValidData($formData, $expectedViewData, $expectedModelDa
      */
     public function setDataProvider()
     {
+        $tokenDateTime = new \DateTime();
+
         return [
             'should bind correct data' => [
                 [
@@ -151,7 +153,7 @@ public function setDataProvider()
                     'smtpHost' => 'smtp.gmail.com',
                     'smtpPort' => '993',
                     'smtpEncryption' => 'ssl',
-                    'accessTokenExpiresAt' => new \DateTime(),
+                    'accessTokenExpiresAt' => $tokenDateTime,
                     'accessToken' => '1',
                     'refreshToken' => '111'
                 ],
@@ -163,7 +165,7 @@ public function setDataProvider()
                     'smtpHost' => 'smtp.gmail.com',
                     'smtpPort' => '993',
                     'smtpEncryption' => 'ssl',
-                    'accessTokenExpiresAt' => new \DateTime(),
+                    'accessTokenExpiresAt' => $tokenDateTime,
                     'accessToken' => '1',
                     'refreshToken' => '111'
                 ],
@@ -175,7 +177,7 @@ public function setDataProvider()
                     'smtpHost' => 'smtp.gmail.com',
                     'smtpPort' => '993',
                     'smtpEncryption' => 'ssl',
-                    'accessTokenExpiresAt' => new \DateTime(),
+                    'accessTokenExpiresAt' => $tokenDateTime,
                     'accessToken' => '1',
                     'refreshToken' => '111'
                 ],

diff --git a/src/Oro/Bundle/NotificationBundle/Tests/Unit/EventListener/MassNotificationListenerTest.php b/src/Oro/Bundle/NotificationBundle/Tests/Unit/EventListener/MassNotificationListenerTest.php
@@ -64,7 +64,7 @@ function ($logEntity) use ($message, $date) {
                 $this->assertEquals($logEntity->getSender(), 'test <[email protected]>');
                 $this->assertEquals($logEntity->getSubject(), 'test subject');
                 $this->assertEquals($logEntity->getBody(), 'test body');
-                $this->assertEquals($logEntity->getScheduledAt(), $date);
+                $this->assertEquals($logEntity->getScheduledAt(), $date, '', 1);
                 $this->assertEquals($logEntity->getStatus(), MassNotification::STATUS_SUCCESS);
 
                 return true;