From ec0ecc5b0387924f061865f4ec12dbfc5b7018fe Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 17 Jul 2016 17:15:14 -0400
Subject: Added event for removed comments with some refactoring

---
 .../units/EventBuilder/CommentEventBuilderTest.php |  37 +++++++
 tests/units/Job/CommentEventJobTest.php            |  52 ++++++++++
 tests/units/Model/CommentModelTest.php             | 106 +++++++++++++++++++++
 tests/units/Model/CommentTest.php                  | 106 ---------------------
 4 files changed, 195 insertions(+), 106 deletions(-)
 create mode 100644 tests/units/EventBuilder/CommentEventBuilderTest.php
 create mode 100644 tests/units/Job/CommentEventJobTest.php
 create mode 100644 tests/units/Model/CommentModelTest.php
 delete mode 100644 tests/units/Model/CommentTest.php

(limited to 'tests')

diff --git a/tests/units/EventBuilder/CommentEventBuilderTest.php b/tests/units/EventBuilder/CommentEventBuilderTest.php
new file mode 100644
index 00000000..a490799e
--- /dev/null
+++ b/tests/units/EventBuilder/CommentEventBuilderTest.php
@@ -0,0 +1,37 @@
+<?php
+
+use Kanboard\EventBuilder\CommentEventBuilder;
+use Kanboard\Model\CommentModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+
+require_once __DIR__.'/../Base.php';
+
+class CommentEventBuilderTest extends Base
+{
+    public function testWithMissingComment()
+    {
+        $commentEventBuilder = new CommentEventBuilder($this->container);
+        $commentEventBuilder->withCommentId(42);
+        $this->assertNull($commentEventBuilder->build());
+    }
+
+    public function testBuild()
+    {
+        $commentModel = new CommentModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $commentEventBuilder = new CommentEventBuilder($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'bla bla', 'user_id' => 1)));
+
+        $commentEventBuilder->withCommentId(1);
+        $event = $commentEventBuilder->build();
+
+        $this->assertInstanceOf('Kanboard\Event\CommentEvent', $event);
+        $this->assertNotEmpty($event['comment']);
+        $this->assertNotEmpty($event['task']);
+    }
+}
diff --git a/tests/units/Job/CommentEventJobTest.php b/tests/units/Job/CommentEventJobTest.php
new file mode 100644
index 00000000..88742feb
--- /dev/null
+++ b/tests/units/Job/CommentEventJobTest.php
@@ -0,0 +1,52 @@
+<?php
+
+use Kanboard\Job\CommentEventJob;
+use Kanboard\Model\CommentModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\TaskCreationModel;
+
+require_once __DIR__.'/../Base.php';
+
+class CommentEventJobTest extends Base
+{
+    public function testJobParams()
+    {
+        $commentEventJob = new CommentEventJob($this->container);
+        $commentEventJob->withParams(123, 'foobar');
+
+        $this->assertSame(array(123, 'foobar'), $commentEventJob->getJobParams());
+    }
+
+    public function testWithMissingComment()
+    {
+        $this->container['dispatcher']->addListener(CommentModel::EVENT_CREATE, function() {});
+
+        $commentEventJob = new CommentEventJob($this->container);
+        $commentEventJob->execute(42, CommentModel::EVENT_CREATE);
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertEmpty($called);
+    }
+
+    public function testTriggerEvents()
+    {
+        $this->container['dispatcher']->addListener(CommentModel::EVENT_CREATE, function() {});
+        $this->container['dispatcher']->addListener(CommentModel::EVENT_UPDATE, function() {});
+        $this->container['dispatcher']->addListener(CommentModel::EVENT_REMOVE, function() {});
+
+        $commentModel = new CommentModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
+        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'foobar', 'user_id' => 1)));
+        $this->assertTrue($commentModel->update(array('id' => 1, 'comment' => 'test')));
+        $this->assertTrue($commentModel->remove(1));
+
+        $called = $this->container['dispatcher']->getCalledListeners();
+        $this->assertArrayHasKey(CommentModel::EVENT_CREATE.'.closure', $called);
+        $this->assertArrayHasKey(CommentModel::EVENT_UPDATE.'.closure', $called);
+        $this->assertArrayHasKey(CommentModel::EVENT_REMOVE.'.closure', $called);
+    }
+}
diff --git a/tests/units/Model/CommentModelTest.php b/tests/units/Model/CommentModelTest.php
new file mode 100644
index 00000000..4178a839
--- /dev/null
+++ b/tests/units/Model/CommentModelTest.php
@@ -0,0 +1,106 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\CommentModel;
+
+class CommentModelTest extends Base
+{
+    public function testCreate()
+    {
+        $commentModel = new CommentModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
+        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'bla bla', 'user_id' => 1)));
+        $this->assertEquals(2, $commentModel->create(array('task_id' => 1, 'comment' => 'bla bla')));
+
+        $comment = $commentModel->getById(1);
+        $this->assertNotEmpty($comment);
+        $this->assertEquals('bla bla', $comment['comment']);
+        $this->assertEquals(1, $comment['task_id']);
+        $this->assertEquals(1, $comment['user_id']);
+        $this->assertEquals('admin', $comment['username']);
+        $this->assertEquals(time(), $comment['date_creation'], '', 3);
+
+        $comment = $commentModel->getById(2);
+        $this->assertNotEmpty($comment);
+        $this->assertEquals('bla bla', $comment['comment']);
+        $this->assertEquals(1, $comment['task_id']);
+        $this->assertEquals(0, $comment['user_id']);
+        $this->assertEquals('', $comment['username']);
+        $this->assertEquals(time(), $comment['date_creation'], '', 3);
+    }
+
+    public function testGetAll()
+    {
+        $commentModel = new CommentModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
+        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
+        $this->assertEquals(2, $commentModel->create(array('task_id' => 1, 'comment' => 'c2', 'user_id' => 1)));
+        $this->assertEquals(3, $commentModel->create(array('task_id' => 1, 'comment' => 'c3', 'user_id' => 1)));
+
+        $comments = $commentModel->getAll(1);
+
+        $this->assertNotEmpty($comments);
+        $this->assertEquals(3, count($comments));
+        $this->assertEquals(1, $comments[0]['id']);
+        $this->assertEquals(2, $comments[1]['id']);
+        $this->assertEquals(3, $comments[2]['id']);
+
+        $this->assertEquals(3, $commentModel->count(1));
+    }
+
+    public function testUpdate()
+    {
+        $commentModel = new CommentModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
+        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
+        $this->assertTrue($commentModel->update(array('id' => 1, 'comment' => 'bla')));
+
+        $comment = $commentModel->getById(1);
+        $this->assertNotEmpty($comment);
+        $this->assertEquals('bla', $comment['comment']);
+    }
+
+    public function testRemove()
+    {
+        $commentModel = new CommentModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
+        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
+
+        $this->assertTrue($commentModel->remove(1));
+        $this->assertFalse($commentModel->remove(1));
+        $this->assertFalse($commentModel->remove(1111));
+    }
+
+    public function testGetProjectId()
+    {
+        $commentModel = new CommentModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
+        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
+
+        $this->assertEquals(1, $commentModel->getProjectId(1));
+        $this->assertSame(0, $commentModel->getProjectId(2));
+    }
+}
diff --git a/tests/units/Model/CommentTest.php b/tests/units/Model/CommentTest.php
deleted file mode 100644
index 574b5a87..00000000
--- a/tests/units/Model/CommentTest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-require_once __DIR__.'/../Base.php';
-
-use Kanboard\Model\TaskCreationModel;
-use Kanboard\Model\ProjectModel;
-use Kanboard\Model\CommentModel;
-
-class CommentTest extends Base
-{
-    public function testCreate()
-    {
-        $commentModel = new CommentModel($this->container);
-        $taskCreationModel = new TaskCreationModel($this->container);
-        $projectModel = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
-        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'bla bla', 'user_id' => 1)));
-        $this->assertEquals(2, $commentModel->create(array('task_id' => 1, 'comment' => 'bla bla')));
-
-        $comment = $commentModel->getById(1);
-        $this->assertNotEmpty($comment);
-        $this->assertEquals('bla bla', $comment['comment']);
-        $this->assertEquals(1, $comment['task_id']);
-        $this->assertEquals(1, $comment['user_id']);
-        $this->assertEquals('admin', $comment['username']);
-        $this->assertEquals(time(), $comment['date_creation'], '', 3);
-
-        $comment = $commentModel->getById(2);
-        $this->assertNotEmpty($comment);
-        $this->assertEquals('bla bla', $comment['comment']);
-        $this->assertEquals(1, $comment['task_id']);
-        $this->assertEquals(0, $comment['user_id']);
-        $this->assertEquals('', $comment['username']);
-        $this->assertEquals(time(), $comment['date_creation'], '', 3);
-    }
-
-    public function testGetAll()
-    {
-        $commentModel = new CommentModel($this->container);
-        $taskCreationModel = new TaskCreationModel($this->container);
-        $projectModel = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
-        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
-        $this->assertEquals(2, $commentModel->create(array('task_id' => 1, 'comment' => 'c2', 'user_id' => 1)));
-        $this->assertEquals(3, $commentModel->create(array('task_id' => 1, 'comment' => 'c3', 'user_id' => 1)));
-
-        $comments = $commentModel->getAll(1);
-
-        $this->assertNotEmpty($comments);
-        $this->assertEquals(3, count($comments));
-        $this->assertEquals(1, $comments[0]['id']);
-        $this->assertEquals(2, $comments[1]['id']);
-        $this->assertEquals(3, $comments[2]['id']);
-
-        $this->assertEquals(3, $commentModel->count(1));
-    }
-
-    public function testUpdate()
-    {
-        $commentModel = new CommentModel($this->container);
-        $taskCreationModel = new TaskCreationModel($this->container);
-        $projectModel = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
-        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
-        $this->assertTrue($commentModel->update(array('id' => 1, 'comment' => 'bla')));
-
-        $comment = $commentModel->getById(1);
-        $this->assertNotEmpty($comment);
-        $this->assertEquals('bla', $comment['comment']);
-    }
-
-    public function validateRemove()
-    {
-        $commentModel = new CommentModel($this->container);
-        $taskCreationModel = new TaskCreationModel($this->container);
-        $projectModel = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
-        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
-
-        $this->assertTrue($commentModel->remove(1));
-        $this->assertFalse($commentModel->remove(1));
-        $this->assertFalse($commentModel->remove(1111));
-    }
-
-    public function testGetProjectId()
-    {
-        $commentModel = new CommentModel($this->container);
-        $taskCreationModel = new TaskCreationModel($this->container);
-        $projectModel = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 3, 'owner_id' => 1)));
-        $this->assertEquals(1, $commentModel->create(array('task_id' => 1, 'comment' => 'c1', 'user_id' => 1)));
-
-        $this->assertEquals(1, $commentModel->getProjectId(1));
-        $this->assertSame(0, $commentModel->getProjectId(2));
-    }
-}
-- 
cgit v1.2.3