Filtering on cases plugged in as well as coverage on warnings

ministryofjustice · Nov 28, 2014 · bdab92c · bdab92c
1 parent b7d17da
commit bdab92c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 20 deletions.
diff --git a/src/Opg/Common/Model/Entity/HasCasesInterface.php b/src/Opg/Common/Model/Entity/HasCasesInterface.php
@@ -14,8 +14,8 @@ interface HasCasesInterface
     /**
      * Constants required for filtering
      */
-    const CASE_TYPE_POA = "";
-    const CASE_TYPE_DEP = "";
+    const CASE_TYPE_POA = 'Opg\Core\Model\Entity\CaseItem\PowerOfAttorney\PowerOfAttorney';
+    const CASE_TYPE_DEP = 'Opg\Core\Model\Entity\CaseItem\Deputyship\Deputyship';
 
     /**
      * @return ArrayCollection

diff --git a/tests/OpgTest/Core/Model/Entity/CaseActor/PersonTest.php b/tests/OpgTest/Core/Model/Entity/CaseActor/PersonTest.php
@@ -4,7 +4,6 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Opg\Core\Model\Entity\Address\Address;
-use Opg\Core\Model\Entity\CaseItem\Deputyship\LayDeputy;
 use Opg\Core\Model\Entity\CaseItem\PowerOfAttorney\Lpa;
 use Opg\Core\Model\Entity\CaseActor\Person;
 use \Exception;
@@ -15,14 +14,25 @@
 /**
  * Person test case.
  */
+
+class PersonStub extends Person
+{
+    public function __unset($key) {
+        switch($key) {
+            case 'warnings' :
+                $this->warnings = null;
+                break;
+        }
+    }
+}
 class PersonTest extends \PHPUnit_Framework_TestCase
 {
 
     private $person;
 
     protected function setUp ()
     {
-        $this->person = $this->getMockForAbstractClass('Opg\Core\Model\Entity\CaseActor\Person');
+        $this->person = new PersonStub();
     }
 
     public function testCreate()
@@ -151,23 +161,26 @@ public function testAddCaseCollection ()
 
         $this->person->setCases($collection);
 
-        $collection3 = $this->person->getCases();
+        $collection3 = $this->person->getPowerOfAttorneys();
 
         $this->assertEquals($collection, $collection3);
 
         for($i=0;$i<5; $i++) {
             $case = $this->getMockForAbstractClass('Opg\Core\Model\Entity\CaseItem\Deputyship\Deputyship');
             $collection2->add($case);
         }
-
         $this->person->addCases($collection2);
 
-        $collection4 = $this->person->getCases();
-        $this->markTestSkipped('Need to refactor the dep and poa bases to get the filter to work here');
 
-        $this->assertEquals($collection4->toArray(), array_merge($collection->toArray(), $collection2->toArray()));
+        $cases = $this->person->getCases()->toArray();
+        $deps  = $this->person->getDeputyShips()->toArray();
+        $poas  = $this->person->getPowerOfAttorneys()->toArray();
+        $caseComp = array_merge($poas, $deps);
+
+        $this->assertEquals($cases, $caseComp);
 
-        $this->assertCount(10, $collection4->toArray());
+        $this->assertCount(10, $cases);
+        $this->assertCount(10, $caseComp);
     }
 
     public function testRemoveCase()
@@ -314,8 +327,8 @@ public function testAddPersonCannotBeAParentOfItself()
 
     public function testAddPerson()
     {
-        $otherPerson1 = $this->getMockForAbstractClass('Opg\Core\Model\Entity\CaseActor\Person');
-        $otherPerson2 = $this->getMockForAbstractClass('Opg\Core\Model\Entity\CaseActor\Person');
+        $otherPerson1 = new PersonStub();
+        $otherPerson2 = new PersonStub();
 
         $this->assertNull($otherPerson1->getParent());
         $this->person->addChild($otherPerson1);
@@ -335,8 +348,8 @@ public function testAddPerson()
 
     public function testPersonCannotHaveMultipleParents()
     {
-        $parent1 = $this->getMockForAbstractClass('Opg\Core\Model\Entity\CaseActor\Person');
-        $parent2 = $this->getMockForAbstractClass('Opg\Core\Model\Entity\CaseActor\Person');
+        $parent1 = new PersonStub();
+        $parent2 = new PersonStub();
 
         $parent1->addChild($this->person);
 
@@ -346,7 +359,7 @@ public function testPersonCannotHaveMultipleParents()
 
     public function testGetChildren()
     {
-        $parent1 = $this->getMockForAbstractClass('Opg\Core\Model\Entity\CaseActor\Person');
+        $parent1 = new PersonStub();
 
         $parent1->addChild($this->person);
 
@@ -355,11 +368,11 @@ public function testGetChildren()
 
     public function testGetFiltered()
     {
-        $person = $this->getMockForAbstractClass('Opg\Core\Model\Entity\CaseActor\Person');
-
         $testCollection = new ArrayCollection();
         $testActiveCollection = new ArrayCollection();
 
+        unset($this->person->{'warnings'});
+        $this->assertEmpty($this->person->getWarnings()->toArray());
         $warning1 = (new Warning())->setWarningText('Test Warning 1')->setSystemStatus(true);
         $testCollection->add($warning1);
         $testActiveCollection->add($warning1);
@@ -371,11 +384,11 @@ public function testGetFiltered()
         $warning3 = (new Warning())->setWarningText('Test Warning 3')->setSystemStatus(false);
         $testCollection->add($warning3);
 
-        $person->setWarnings($testCollection);
+        $this->person->setWarnings($testCollection);
 
-        $this->assertEquals($testCollection, $person->getWarnings());
+        $this->assertEquals($testCollection, $this->person->getWarnings());
 
-        $this->assertEquals($testActiveCollection, $person->getActiveWarnings());
+        $this->assertEquals($testActiveCollection, $this->person->getActiveWarnings());
 
     }
   }