From 3332949c8baae581ea70ce5c61bb2a6225100422 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sat, 26 Apr 2014 14:41:19 -0400 Subject: Make unit tests compatible with PHP 5.3 and 5.4 --- tests/CommentTest.php | 50 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 13 deletions(-) (limited to 'tests/CommentTest.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]); } } -- cgit v1.2.3