diff --git a/test/SP/Repositories/NotificationRepositoryTest.php b/test/SP/Repositories/NotificationRepositoryTest.php index 721b18b6..538de646 100644 --- a/test/SP/Repositories/NotificationRepositoryTest.php +++ b/test/SP/Repositories/NotificationRepositoryTest.php @@ -142,7 +142,6 @@ class NotificationRepositoryTest extends DatabaseTestCase $data = new NotificationData(); $data->setId(4); $data->setUserId(2); - $data->setDate(time()); $data->setType('Test'); $data->setComponent('Config'); $data->setDescription(NotificationMessage::factory()->setTitle('Prueba')->setDescription(['blablabla'])); @@ -152,8 +151,17 @@ class NotificationRepositoryTest extends DatabaseTestCase $this->assertEquals(4, self::$repository->create($data)->getLastId()); - $this->assertEquals($data, self::$repository->getById(4)->getData()); + /** @var NotificationData $resultData */ + $resultData = self::$repository->getById(4)->getData(); + $this->assertEquals($data->getId(), $resultData->getId()); + $this->assertEquals($data->getUserId(), $resultData->getUserId()); + $this->assertEquals($data->getType(), $resultData->getType()); + $this->assertEquals($data->getComponent(), $resultData->getComponent()); + $this->assertEquals($data->isChecked(), $resultData->isChecked()); + $this->assertEquals($data->isOnlyAdmin(), $resultData->isOnlyAdmin()); + $this->assertEquals($data->isSticky(), $resultData->isSticky()); + $this->assertGreaterThan(0, $resultData->getDate()); } /** @@ -224,7 +232,6 @@ class NotificationRepositoryTest extends DatabaseTestCase $data = new NotificationData(); $data->setId(3); $data->setUserId(2); - $data->setDate(time()); $data->setType('Test'); $data->setComponent('Config'); $data->setDescription(NotificationMessage::factory()->setTitle('Prueba')->setDescription(['blablabla'])); @@ -234,7 +241,17 @@ class NotificationRepositoryTest extends DatabaseTestCase $this->assertEquals(1, self::$repository->update($data)); - $this->assertEquals($data, self::$repository->getById(3)->getData()); + /** @var NotificationData $resultData */ + $resultData = self::$repository->getById($data->getId())->getData(); + + $this->assertEquals($data->getId(), $resultData->getId()); + $this->assertEquals($data->getUserId(), $resultData->getUserId()); + $this->assertEquals($data->getType(), $resultData->getType()); + $this->assertEquals($data->getComponent(), $resultData->getComponent()); + $this->assertEquals($data->isChecked(), $resultData->isChecked()); + $this->assertEquals($data->isOnlyAdmin(), $resultData->isOnlyAdmin()); + $this->assertEquals($data->isSticky(), $resultData->isSticky()); + $this->assertGreaterThan(0, $resultData->getDate()); $data->setId(4); diff --git a/test/SP/Repositories/PublicLinkRepositoryTest.php b/test/SP/Repositories/PublicLinkRepositoryTest.php index f1c7502e..5da3c292 100644 --- a/test/SP/Repositories/PublicLinkRepositoryTest.php +++ b/test/SP/Repositories/PublicLinkRepositoryTest.php @@ -344,8 +344,6 @@ class PublicLinkRepositoryTest extends DatabaseTestCase */ public function testRefreshNullHash() { - $this->markTestIncomplete('Not working on Travis CI'); - $data = new PublicLinkData(); $data->setHash(null); $data->setDateExpire(time() + 3600); diff --git a/test/SP/Services/Notification/NotificationServiceTest.php b/test/SP/Services/Notification/NotificationServiceTest.php index a7e4c073..f80a9218 100644 --- a/test/SP/Services/Notification/NotificationServiceTest.php +++ b/test/SP/Services/Notification/NotificationServiceTest.php @@ -211,7 +211,6 @@ class NotificationServiceTest extends DatabaseTestCase $data = new NotificationData(); $data->setId(4); $data->setUserId(2); - $data->setDate(time()); $data->setType('Test'); $data->setComponent('Config'); $data->setDescription(NotificationMessage::factory()->setTitle('Prueba')->setDescription(['blablabla'])); @@ -221,7 +220,16 @@ class NotificationServiceTest extends DatabaseTestCase $this->assertEquals(4, self::$service->create($data)); - $this->assertEquals($data, self::$service->getById(4)); + $resultData = self::$service->getById(4); + + $this->assertEquals($data->getId(), $resultData->getId()); + $this->assertEquals($data->getUserId(), $resultData->getUserId()); + $this->assertEquals($data->getType(), $resultData->getType()); + $this->assertEquals($data->getComponent(), $resultData->getComponent()); + $this->assertEquals($data->isChecked(), $resultData->isChecked()); + $this->assertEquals($data->isOnlyAdmin(), $resultData->isOnlyAdmin()); + $this->assertEquals($data->isSticky(), $resultData->isSticky()); + $this->assertGreaterThan(0, $resultData->getDate()); } /** @@ -377,7 +385,6 @@ class NotificationServiceTest extends DatabaseTestCase $data = new NotificationData(); $data->setId(3); $data->setUserId(2); - $data->setDate(time()); $data->setType('Test'); $data->setComponent('Config'); $data->setDescription(NotificationMessage::factory()->setTitle('Prueba')->setDescription(['blablabla'])); @@ -387,7 +394,16 @@ class NotificationServiceTest extends DatabaseTestCase $this->assertEquals(1, self::$service->update($data)); - $this->assertEquals($data, self::$service->getById(3)); + $resultData = self::$service->getById(3); + + $this->assertEquals($data->getId(), $resultData->getId()); + $this->assertEquals($data->getUserId(), $resultData->getUserId()); + $this->assertEquals($data->getType(), $resultData->getType()); + $this->assertEquals($data->getComponent(), $resultData->getComponent()); + $this->assertEquals($data->isChecked(), $resultData->isChecked()); + $this->assertEquals($data->isOnlyAdmin(), $resultData->isOnlyAdmin()); + $this->assertEquals($data->isSticky(), $resultData->isSticky()); + $this->assertGreaterThan(0, $resultData->getDate()); $data->setId(4); diff --git a/test/res/config/config.xml b/test/res/config/config.xml index 1072a2be..61d36a6f 100644 --- a/test/res/config/config.xml +++ b/test/res/config/config.xml @@ -9,11 +9,11 @@ 1 1 - 3daec30b56eb1f0e506d0ddc30b22aabb855f54d + 4bd6ca38c4315865466fa38e063752800c7f2b84 0 0 - 1533498924 - 7a5107e8d9487288f65b271640f2e2337c024a02 + 1533580110 + 0b0cc60f598647ce598d8f5ae697ecf83253080b @@ -32,7 +32,7 @@ 0 - e76e0b5f66010f0f5b81834c600d3dc025b099a6 + efade17afbe1bb9f905dbe05f54da6d711289440 PDF JPG