From 0d3646f78679e56f2c132c8e366c9fd2898940c7 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 23 Dec 2020 20:11:52 +0100 Subject: [PATCH] fix test bugs --- Admin/Install/db.json | 4 ++-- tests/Models/4KanbanCardMapperTest.php | 14 ++++++++------ tests/Models/KanbanCardTest.php | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Admin/Install/db.json b/Admin/Install/db.json index e21382b..c3b2221 100755 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -54,7 +54,7 @@ "name": "kanban_board_tag", "fields": { "kanban_board_tag_id": { - "name": "kanban_board_id", + "name": "kanban_board_tag_id", "type": "INT", "null": false, "primary": true, @@ -177,7 +177,7 @@ "name": "kanban_card_tag", "fields": { "kanban_card_tag_id": { - "name": "kanban_card_id", + "name": "kanban_card_tag_id", "type": "INT", "null": false, "primary": true, diff --git a/tests/Models/4KanbanCardMapperTest.php b/tests/Models/4KanbanCardMapperTest.php index 0889629..742c2be 100755 --- a/tests/Models/4KanbanCardMapperTest.php +++ b/tests/Models/4KanbanCardMapperTest.php @@ -19,6 +19,8 @@ use Modules\Kanban\Models\CardStatus; use Modules\Kanban\Models\CardType; use Modules\Kanban\Models\KanbanCard; use Modules\Kanban\Models\KanbanCardMapper; +use Modules\Tag\Models\Tag; +use Modules\Tag\Models\NullTag; use phpOMS\Utils\RnG\Text; /** @@ -41,8 +43,8 @@ class KanbanCardMapperTest extends \PHPUnit\Framework\TestCase $card->setOrder(1); $card->setColumn(1); $card->createdBy = new NullAccount(1); - $card->addLabel(1); - $card->addLabel(2); + $card->addTag(new Tag()); + $card->addTag(new Tag()); $id = KanbanCardMapper::create($card); self::assertGreaterThan(0, $card->getId()); @@ -74,8 +76,8 @@ class KanbanCardMapperTest extends \PHPUnit\Framework\TestCase $card->setOrder(1); $card->setColumn(1); $card->createdBy = new NullAccount(1); - $card->addLabel(1); - $card->addLabel(2); + $card->addTag(new Tag()); + $card->addTag(new Tag()); $id = KanbanCardMapper::create($card); self::assertGreaterThan(0, $card->getId()); @@ -100,8 +102,8 @@ class KanbanCardMapperTest extends \PHPUnit\Framework\TestCase $card->setOrder(\mt_rand(1, 10)); $card->setColumn(\mt_rand(1, 4)); $card->createdBy = new NullAccount(1); - $card->addLabel(2); - $card->addLabel(3); + $card->addTag(new NullTag(1)); + $card->addTag(new NullTag(2)); $id = KanbanCardMapper::create($card); } diff --git a/tests/Models/KanbanCardTest.php b/tests/Models/KanbanCardTest.php index d475719..62b17ff 100755 --- a/tests/Models/KanbanCardTest.php +++ b/tests/Models/KanbanCardTest.php @@ -43,7 +43,7 @@ class KanbanCardTest extends \PHPUnit\Framework\TestCase self::assertEquals(0, $card->createdBy->getId()); self::assertInstanceOf('\DateTimeImmutable', $card->createdAt); self::assertEquals([], $card->getComments()); - self::assertEquals([], $card->getLabels()); + self::assertEquals([], $card->getTags()); self::assertEquals([], $card->getMedia()); }