From 8dceb7d7a0100f3c230019e4674872a926fe5ede Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 25 Apr 2024 16:34:22 +0000 Subject: [PATCH] test fixes --- tests/Models/CategoryMapperTest.php | 2 -- tests/Models/CauseMapperTest.php | 4 ++-- tests/Models/ProcessTest.php | 2 +- tests/Models/RiskMapperTest.php | 12 +++++++++++- tests/Models/SolutionMapperTest.php | 1 + 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/tests/Models/CategoryMapperTest.php b/tests/Models/CategoryMapperTest.php index bb9619f..39caf35 100755 --- a/tests/Models/CategoryMapperTest.php +++ b/tests/Models/CategoryMapperTest.php @@ -28,7 +28,6 @@ final class CategoryMapperTest extends \PHPUnit\Framework\TestCase { $obj = new Category(); $obj->title = 'Name'; - $obj->descriptionRaw = 'Description'; $obj->responsible = 1; $obj->deputy = 1; @@ -36,7 +35,6 @@ final class CategoryMapperTest extends \PHPUnit\Framework\TestCase $objR = CategoryMapper::get()->where('id', $obj->id)->execute(); self::assertEquals($obj->title, $objR->title); - self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw); self::assertEquals($obj->responsible, $objR->responsible); self::assertEquals($obj->deputy, $objR->deputy); } diff --git a/tests/Models/CauseMapperTest.php b/tests/Models/CauseMapperTest.php index 9155460..2032c01 100755 --- a/tests/Models/CauseMapperTest.php +++ b/tests/Models/CauseMapperTest.php @@ -48,12 +48,12 @@ final class CauseMapperTest extends \PHPUnit\Framework\TestCase CauseMapper::create()->execute($obj); /** @var Cause $objR */ - $objR = CauseMapper::get()->with('risk')->with('category')->where('id', $obj->id)->execute(); + $objR = CauseMapper::get()->with('risk')->where('id', $obj->id)->execute(); self::assertGreaterThan(0, $objR->id); self::assertEquals($obj->title, $objR->title); self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw); //self::assertEquals($obj->getDepartment()->department->id, $objR->getDepartment()->department->id); - self::assertEquals($obj->category->title, $objR->category->title); + self::assertEquals($obj->category->id, $objR->category->id); self::assertEquals($obj->risk->name, $objR->risk->name); } } diff --git a/tests/Models/ProcessTest.php b/tests/Models/ProcessTest.php index b57ea45..a06617d 100755 --- a/tests/Models/ProcessTest.php +++ b/tests/Models/ProcessTest.php @@ -32,7 +32,7 @@ final class ProcessTest extends \PHPUnit\Framework\TestCase self::assertEquals('', $obj->description); self::assertEquals('', $obj->descriptionRaw); self::assertNull($obj->department); - self::assertNull($obj->unit); + self::assertEquals(0, $obj->unit); self::assertNull($obj->responsible); self::assertNull($obj->deputy); } diff --git a/tests/Models/RiskMapperTest.php b/tests/Models/RiskMapperTest.php index ef67c2d..a725470 100755 --- a/tests/Models/RiskMapperTest.php +++ b/tests/Models/RiskMapperTest.php @@ -77,8 +77,18 @@ final class RiskMapperTest extends \PHPUnit\Framework\TestCase $obj->files[] = $media; RiskMapper::create()->execute($obj); + self::assertGreaterThan(0, $obj->id); - $objR = RiskMapper::get()->with('project')->with('project/project')->with('causes')->with('solutions')->with('riskObjects')->with('files')->where('id', $obj->id)->execute(); + $objR = RiskMapper::get() + ->with('project') + ->with('causes') + ->with('solutions') + ->with('riskObjects') + ->with('files') + ->where('id', $obj->id) + ->execute(); + + self::assertGreaterThan(0, $objR->id); self::assertEquals($obj->name, $objR->name); self::assertEquals($obj->descriptionRaw, $objR->descriptionRaw); self::assertEquals($obj->unit, $objR->unit); diff --git a/tests/Models/SolutionMapperTest.php b/tests/Models/SolutionMapperTest.php index f28d76d..7086077 100755 --- a/tests/Models/SolutionMapperTest.php +++ b/tests/Models/SolutionMapperTest.php @@ -37,6 +37,7 @@ final class SolutionMapperTest extends \PHPUnit\Framework\TestCase $obj->risk = new Risk(); SolutionMapper::create()->execute($obj); + self::assertGreaterThan(0, $obj->id); $objR = SolutionMapper::get()->where('id', $obj->id)->execute(); self::assertGreaterThan(0, $objR->id);