From e81a1102f7f1ba99b599fcdb7ba0f988ac2fe803 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Fri, 22 Apr 2016 17:44:28 +0200
Subject: [PATCH] Unit test fixes

---
 Models/Employee.php       |  7 ++++++-
 Models/EmployeeMapper.php | 17 ++++++++++-------
 Models/PositionType.php   |  2 +-
 Models/StaffList.php      |  4 ++--
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Models/Employee.php b/Models/Employee.php
index 4ebd846..e2ddfea 100644
--- a/Models/Employee.php
+++ b/Models/Employee.php
@@ -13,7 +13,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-namespace Modules\HumanResources\Models;
+namespace Modules\HumanResourceManagement\Models;
 
 use Modules\Admin\Models\Account;
 
@@ -52,4 +52,9 @@ class Employee {
     public function getAccount() : Account {
         return $this->account;
     }
+
+    public function getId() : int
+    {
+        return $this->id;
+    }
 }
diff --git a/Models/EmployeeMapper.php b/Models/EmployeeMapper.php
index a9b4898..067617e 100644
--- a/Models/EmployeeMapper.php
+++ b/Models/EmployeeMapper.php
@@ -13,11 +13,14 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-namespace Modules\Admin\Models;
+namespace Modules\HumanResourceManagement\Models;
 
+use Modules\Admin\Models\AccountMapper;
+use Modules\HumanResourceManagement\Models\EmployeeHistoryMapper;
+use Modules\HumanResourceManagement\Models\EmployeeStatus;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
 
-class EmployeeMapper
+class EmployeeMapper extends DataMapperAbstract
 {
 
     /**
@@ -33,22 +36,22 @@ class EmployeeMapper
 
     protected static $ownsOne = [
         'account' => [
-            'mapper'         => \Modules\Admin\Models\AccountMapper::class,
+            'mapper'         => AccountMapper::class,
             'src'            => 'hr_staff',
         ],
     ];
 
     protected static $hasMany = [
         'history' => [
-            'mapper' => \Modules\HumanResourceManagement\Models\EmployeeHistoryMapper::class,
-            'relationmapper' => \Modules\HumanResourceManagement\Models\EmployeeHistoryMapper::class,
+            'mapper' => EmployeeHistoryMapper::class,
+            'relationmapper' => EmployeeHistoryMapper::class,
             'table' => 'hr_history',
             'src' => 'hr_history_staff',
             'dst' => null,
         ],
         'status' => [
-            'mapper' => \Modules\HumanResourceManagement\Models\EmployeeStatus::class,
-            'relationmapper' => \Modules\HumanResourceManagement\Models\EmployeeStatus::class,
+            'mapper' => EmployeeStatus::class,
+            'relationmapper' => EmployeeStatus::class,
             'table' => 'hr_status',
             'src' => 'hr_status_staff',
             'dst' => null,
diff --git a/Models/PositionType.php b/Models/PositionType.php
index b63a984..cc45225 100644
--- a/Models/PositionType.php
+++ b/Models/PositionType.php
@@ -13,7 +13,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-namespace Modules\HumanResources\Models;
+namespace Modules\HumanResourceManagement\Models;
 
 use phpOMS\Datatypes\Enum;
 
diff --git a/Models/StaffList.php b/Models/StaffList.php
index 0434251..207224c 100644
--- a/Models/StaffList.php
+++ b/Models/StaffList.php
@@ -13,7 +13,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-namespace Modules\HumanResources\Models;
+namespace Modules\HumanResourceManagement\Models;
 
 use phpOMS\DataStorage\Database\DatabaseType;
 
@@ -34,7 +34,7 @@ class StaffList
     /**
      * Database instance.
      *
-     * @var \phpOMS\DataStorage\Database\Database
+     * @var \phpOMS\DataStorage\Database\Pool
      * @since 1.0.0
      */
     private $dbPool = null;