diff options
| -rw-r--r-- | tests/Base.php | 4 | ||||
| -rw-r--r-- | tests/CommentTest.php | 50 |
2 files changed, 41 insertions, 13 deletions
diff --git a/tests/Base.php b/tests/Base.php index 236d0000..4a0fe044 100644 --- a/tests/Base.php +++ b/tests/Base.php @@ -1,5 +1,9 @@ <?php +if (version_compare(PHP_VERSION, '5.5.0', '<')) { + require __DIR__.'/../vendor/password.php'; +} + require_once __DIR__.'/../vendor/PicoDb/Database.php'; require_once __DIR__.'/../core/event.php'; require_once __DIR__.'/../core/translator.php'; diff --git a/tests/CommentTest.php b/tests/CommentTest.php index 8c7cce26..46f05abc 100644 --- a/tests/CommentTest.php +++ b/tests/CommentTest.php @@ -69,24 +69,48 @@ class CommentTest extends Base { $c = new Comment($this->db, $this->event); - $this->assertTrue($c->validateCreation(['user_id' => 1, 'task_id' => 1, 'comment' => 'bla'])[0]); - $this->assertFalse($c->validateCreation(['user_id' => 1, 'task_id' => 1, 'comment' => ''])[0]); - $this->assertFalse($c->validateCreation(['user_id' => 1, 'task_id' => 'a', 'comment' => 'bla'])[0]); - $this->assertFalse($c->validateCreation(['user_id' => 'b', 'task_id' => 1, 'comment' => 'bla'])[0]); - $this->assertFalse($c->validateCreation(['user_id' => 1, 'comment' => 'bla'])[0]); - $this->assertFalse($c->validateCreation(['task_id' => 1, 'comment' => 'bla'])[0]); - $this->assertFalse($c->validateCreation(['comment' => 'bla'])[0]); - $this->assertFalse($c->validateCreation([])[0]); + $result = $c->validateCreation(array('user_id' => 1, 'task_id' => 1, 'comment' => 'bla')); + $this->assertTrue($result[0]); + + $result = $c->validateCreation(array('user_id' => 1, 'task_id' => 1, 'comment' => '')); + $this->assertFalse($result[0]); + + $result = $c->validateCreation(array('user_id' => 1, 'task_id' => 'a', 'comment' => 'bla')); + $this->assertFalse($result[0]); + + $result = $c->validateCreation(array('user_id' => 'b', 'task_id' => 1, 'comment' => 'bla')); + $this->assertFalse($result[0]); + + $result = $c->validateCreation(array('user_id' => 1, 'comment' => 'bla')); + $this->assertFalse($result[0]); + + $result = $c->validateCreation(array('task_id' => 1, 'comment' => 'bla')); + $this->assertFalse($result[0]); + + $result = $c->validateCreation(array('comment' => 'bla')); + $this->assertFalse($result[0]); + + $result = $c->validateCreation(array()); + $this->assertFalse($result[0]); } public function testValidateModification() { $c = new Comment($this->db, $this->event); - $this->assertTrue($c->validateModification(['id' => 1, 'comment' => 'bla'])[0]); - $this->assertFalse($c->validateModification(['id' => 1, 'comment' => ''])[0]); - $this->assertFalse($c->validateModification(['comment' => 'bla'])[0]); - $this->assertFalse($c->validateModification(['id' => 'b', 'comment' => 'bla'])[0]); - $this->assertFalse($c->validateModification([])[0]); + $result = $c->validateModification(array('id' => 1, 'comment' => 'bla')); + $this->assertTrue($result[0]); + + $result = $c->validateModification(array('id' => 1, 'comment' => '')); + $this->assertFalse($result[0]); + + $result = $c->validateModification(array('comment' => 'bla')); + $this->assertFalse($result[0]); + + $result = $c->validateModification(array('id' => 'b', 'comment' => 'bla')); + $this->assertFalse($result[0]); + + $result = $c->validateModification(array()); + $this->assertFalse($result[0]); } } |