From 7522549a128b3f89a02159cf04c520c3e69e6e68 Mon Sep 17 00:00:00 2001 From: gamonoid Date: Mon, 4 Sep 2017 07:08:40 +0200 Subject: [PATCH] Fixes t unit test classes --- test/TestTemplate.php | 40 +++++++++++++--------------- test/classes/ApprovalStatusTest.php | 12 ++++----- test/classes/LanguageManagerTest.php | 12 ++++----- 3 files changed, 31 insertions(+), 33 deletions(-) diff --git a/test/TestTemplate.php b/test/TestTemplate.php index c9f68537..9483e248 100644 --- a/test/TestTemplate.php +++ b/test/TestTemplate.php @@ -1,20 +1,19 @@ Find("username <> ?",array('admin')); foreach($users as $user){ $user->Delete(); } } - + protected function createNewUsers(){ - + $profileVar = SIGN_IN_ELEMENT_MAPPING_FIELD_NAME; $profileClass = ucfirst(SIGN_IN_ELEMENT_MAPPING_FIELD_NAME); - - $user = new User(); + + $user = new \Users\Common\Model\User(); $user->username = 'manager'; $user->email = 'manager@icehrm-test.com'; $user->password = '21232f297a57a5a743894a0e4a801fc3'; $user->user_level = 'Manager'; $user->Save(); - - $user = new User(); + + $user = new \Users\Common\Model\User(); $user->username = 'profile'; $user->email = 'profile@icehrm-test.com'; $user->password = '21232f297a57a5a743894a0e4a801fc3'; @@ -59,15 +58,15 @@ class TestTemplate extends PHPUnit_Framework_TestCase{ $dbLocal = NewADOConnection(APP_CON_STR); - File::SetDatabaseAdapter($dbLocal); - Setting::SetDatabaseAdapter($dbLocal); - Report::SetDatabaseAdapter($dbLocal); - DataEntryBackup::SetDatabaseAdapter($dbLocal); - Audit::SetDatabaseAdapter($dbLocal); - Notification::SetDatabaseAdapter($dbLocal); - RestAccessToken::SetDatabaseAdapter($dbLocal); + \Model\File::SetDatabaseAdapter($dbLocal); + \Model\Setting::SetDatabaseAdapter($dbLocal); + \Model\Report::SetDatabaseAdapter($dbLocal); + \Model\DataEntryBackup::SetDatabaseAdapter($dbLocal); + \Model\Audit::SetDatabaseAdapter($dbLocal); + \Model\Notification::SetDatabaseAdapter($dbLocal); + \Model\RestAccessToken::SetDatabaseAdapter($dbLocal); - $moduleManagers = BaseService::getInstance()->getModuleManagers(); + $moduleManagers = \Classes\BaseService::getInstance()->getModuleManagers(); foreach($moduleManagers as $moduleManagerObj){ @@ -79,7 +78,6 @@ class TestTemplate extends PHPUnit_Framework_TestCase{ $moduleManagerObj->setupUserClasses($userTables); $moduleManagerObj->setupFileFieldMappings($fileFields); $moduleManagerObj->setupErrorMappings($mysqlErrors); - //$moduleManagerObj->setupRestEndPoints(); $moduleManagerObj->initCalculationHooks(); $modelClassList = $moduleManagerObj->getModelClasses(); diff --git a/test/classes/ApprovalStatusTest.php b/test/classes/ApprovalStatusTest.php index 5e6b2318..d4726ba7 100644 --- a/test/classes/ApprovalStatusTest.php +++ b/test/classes/ApprovalStatusTest.php @@ -12,7 +12,7 @@ class ApprovalStatusTest extends TestTemplate{ protected function setUp(){ parent::setUp(); - $emp = new Employee(); + $emp = new \Employees\Common\Model\Employee(); $emp->Load("id = ?",array(1)); $emp->supervisor = 2; $emp->indirect_supervisors = json_encode(array(3,4)); @@ -23,7 +23,7 @@ class ApprovalStatusTest extends TestTemplate{ - $this->travelRec = new EmployeeTravelRecord(); + $this->travelRec = new \Travel\Common\Model\EmployeeTravelRecord(); $this->travelRec->DB()->execute("delete from EmployeeTravelRecords"); @@ -46,7 +46,7 @@ class ApprovalStatusTest extends TestTemplate{ public function testInitializeApprovalChain(){ $id = $this->travelRec->id; $this->initializeObjects(); - $as = ApprovalStatus::getInstance(); + $as = \Classes\Approval\ApprovalStatus::getInstance(); $as->initializeApprovalChain('EmployeeTravelRecord',$id); $status = $as->getAllStatuses('EmployeeTravelRecord',$id); $this->assertEquals(3, count($status)); @@ -56,7 +56,7 @@ class ApprovalStatusTest extends TestTemplate{ public function testUpdateApprovalStatus(){ $id = $this->travelRec->id; $this->initializeObjects(); - $as = ApprovalStatus::getInstance(); + $as = \Classes\Approval\ApprovalStatus::getInstance(); $as->initializeApprovalChain('EmployeeTravelRecord',$id); $resp = $as->updateApprovalStatus('EmployeeTravelRecord',$id,2,1); @@ -67,7 +67,7 @@ class ApprovalStatusTest extends TestTemplate{ $resp = $as->updateApprovalStatus('EmployeeTravelRecord',$id,3,1); - $this->assertEquals(IceResponse::ERROR, $resp->getStatus()); + $this->assertEquals(\Classes\IceResponse::ERROR, $resp->getStatus()); $resp = $as->updateApprovalStatus('EmployeeTravelRecord',$id,5,1); $this->assertEquals(0, $resp->getObject()[0]->active); @@ -90,4 +90,4 @@ class ApprovalStatusTest extends TestTemplate{ fwrite(STDOUT, __METHOD__ . " End\n"); } -} \ No newline at end of file +} diff --git a/test/classes/LanguageManagerTest.php b/test/classes/LanguageManagerTest.php index 4b1b7924..d3795b02 100644 --- a/test/classes/LanguageManagerTest.php +++ b/test/classes/LanguageManagerTest.php @@ -13,10 +13,10 @@ class LanguageManagerTest extends TestTemplate{ public function testTran(){ - $this->assertEquals('cat', LanguageManager::tran('cat')); - $this->assertEquals('solid', LanguageManager::tran('solid')); - $this->assertEquals('one file', LanguageManager::tran('one file')); - $this->assertEquals('2 files', LanguageManager::tran('2 files')); - $this->assertEquals('User Logged In now', LanguageManager::translateTnrText('User Logged In now')); + $this->assertEquals('cat', \Classes\LanguageManager::tran('cat')); + $this->assertEquals('solid', \Classes\LanguageManager::tran('solid')); + $this->assertEquals('one file', \Classes\LanguageManager::tran('one file')); + $this->assertEquals('2 files', \Classes\LanguageManager::tran('2 files')); + $this->assertEquals('User Logged In now', \Classes\LanguageManager::translateTnrText('User Logged In now')); } -} \ No newline at end of file +}