From a9f0381b1a83974d4bb3eff46bbe17e796c114d6 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 17 Jul 2021 21:12:30 +0200 Subject: [PATCH] phpunit bug fixes --- Admin/Install/db.json | 20 ++++++++++---------- tests/Models/WikiCategoryMapperTest.php | 10 +++++----- tests/Models/WikiCategoryTest.php | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Admin/Install/db.json b/Admin/Install/db.json index 713c8df..9bc2321 100755 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -135,25 +135,25 @@ } } }, - "wiki_article": { - "name": "wiki_article", + "wiki_article_media": { + "name": "wiki_article_media", "fields": { - "wiki_article_id": { - "name": "wiki_article_id", + "wiki_article_media_id": { + "name": "wiki_article_media_id", "type": "INT", "null": false, "primary": true, "autoincrement": true }, - "wiki_article_src": { - "name": "wiki_article_src", + "wiki_article_media_src": { + "name": "wiki_article_media_src", "type": "INT", "null": false, - "foreignTable": "wiki_article", - "foreignKey": "wiki_article_id" + "foreignTable": "wiki_article_media", + "foreignKey": "wiki_article_media_id" }, - "wiki_article_dst": { - "name": "wiki_article_dst", + "wiki_article_media_dst": { + "name": "wiki_article_media_dst", "type": "INT", "null": false, "foreignTable": "media", diff --git a/tests/Models/WikiCategoryMapperTest.php b/tests/Models/WikiCategoryMapperTest.php index a53a92f..364903b 100755 --- a/tests/Models/WikiCategoryMapperTest.php +++ b/tests/Models/WikiCategoryMapperTest.php @@ -40,14 +40,14 @@ class WikiCategoryMapperTest extends \PHPUnit\Framework\TestCase */ public function testCR() : void { - $this->category->setName('Test Category'); + $this->category->setL11n('Test Category'); $id = WikiCategoryMapper::create($this->category); self::assertGreaterThan(0, $this->category->getId()); self::assertEquals($id, $this->category->getId()); $categoryR = WikiCategoryMapper::get($this->category->getId()); - self::assertEquals($this->category->getName(), $categoryR->getName()); + self::assertEquals($this->category->getL11n(), $categoryR->getL11n()); } /** @@ -57,7 +57,7 @@ class WikiCategoryMapperTest extends \PHPUnit\Framework\TestCase */ public function testChildCR() : void { - $this->category->setName('Test Category2'); + $this->category->setL11n('Test Category2'); $this->category->parent = new NullWikiCategory(1); $id = WikiCategoryMapper::create($this->category); @@ -65,7 +65,7 @@ class WikiCategoryMapperTest extends \PHPUnit\Framework\TestCase self::assertEquals($id, $this->category->getId()); $categoryR = WikiCategoryMapper::get($this->category->getId()); - self::assertEquals($this->category->getName(), $categoryR->getName()); + self::assertEquals($this->category->getL11n(), $categoryR->getL11n()); self::assertEquals($this->category->parent->getId(), $categoryR->parent->getId()); } @@ -80,7 +80,7 @@ class WikiCategoryMapperTest extends \PHPUnit\Framework\TestCase $text = new Text(); $category = new WikiCategory(); - $category->setName($text->generateText(\mt_rand(1, 3))); + $category->setL11n($text->generateText(\mt_rand(1, 3))); $id = WikiCategoryMapper::create($category); } diff --git a/tests/Models/WikiCategoryTest.php b/tests/Models/WikiCategoryTest.php index 8dcc84c..7f40f6d 100755 --- a/tests/Models/WikiCategoryTest.php +++ b/tests/Models/WikiCategoryTest.php @@ -41,7 +41,7 @@ class WikiCategoryTest extends \PHPUnit\Framework\TestCase { self::assertEquals(0, $this->category->getId()); self::assertEquals(0, $this->category->app->getId()); - self::assertEquals('', $this->category->getName()); + self::assertEquals('', $this->category->getL11n()); self::assertEquals('/', $this->category->getVirtualPath()); self::assertEquals(0, $this->category->parent->getId()); } @@ -64,8 +64,8 @@ class WikiCategoryTest extends \PHPUnit\Framework\TestCase */ public function testNameInputOutput() : void { - $this->category->setName('Category Name'); - self::assertEquals('Category Name', $this->category->getName()); + $this->category->setL11n('Category Name'); + self::assertEquals('Category Name', $this->category->getL11n()); } /**