Fixes t unit test classes

This commit is contained in:
gamonoid
2017-09-04 07:08:40 +02:00
parent ed36ae0672
commit 7522549a12
3 changed files with 31 additions and 33 deletions

View File

@@ -1,20 +1,19 @@
<?php <?php
include dirname(__FILE__).'/test.includes.php'; include dirname(__FILE__).'/test.includes.php';
include APP_BASE_PATH.'admin/users/api/UsersAdminManager.php';
class TestTemplate extends PHPUnit_Framework_TestCase{ class TestTemplate extends PHPUnit_Framework_TestCase{
protected $usersArray = array(); protected $usersArray = array();
private $db = null; private $db = null;
public function p($msg){ public function p($msg){
fwrite(STDOUT, $msg."\n"); fwrite(STDOUT, $msg."\n");
} }
protected function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();
} }
protected function tearDown() protected function tearDown()
@@ -22,28 +21,28 @@ class TestTemplate extends PHPUnit_Framework_TestCase{
parent::tearDown(); parent::tearDown();
} }
protected function deleteAllUsers(){ protected function deleteAllUsers(){
$user = new User(); $user = new \Users\Common\Model\User();
$users = $user->Find("username <> ?",array('admin')); $users = $user->Find("username <> ?",array('admin'));
foreach($users as $user){ foreach($users as $user){
$user->Delete(); $user->Delete();
} }
} }
protected function createNewUsers(){ protected function createNewUsers(){
$profileVar = SIGN_IN_ELEMENT_MAPPING_FIELD_NAME; $profileVar = SIGN_IN_ELEMENT_MAPPING_FIELD_NAME;
$profileClass = ucfirst(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->username = 'manager';
$user->email = 'manager@icehrm-test.com'; $user->email = 'manager@icehrm-test.com';
$user->password = '21232f297a57a5a743894a0e4a801fc3'; $user->password = '21232f297a57a5a743894a0e4a801fc3';
$user->user_level = 'Manager'; $user->user_level = 'Manager';
$user->Save(); $user->Save();
$user = new User(); $user = new \Users\Common\Model\User();
$user->username = 'profile'; $user->username = 'profile';
$user->email = 'profile@icehrm-test.com'; $user->email = 'profile@icehrm-test.com';
$user->password = '21232f297a57a5a743894a0e4a801fc3'; $user->password = '21232f297a57a5a743894a0e4a801fc3';
@@ -59,15 +58,15 @@ class TestTemplate extends PHPUnit_Framework_TestCase{
$dbLocal = NewADOConnection(APP_CON_STR); $dbLocal = NewADOConnection(APP_CON_STR);
File::SetDatabaseAdapter($dbLocal); \Model\File::SetDatabaseAdapter($dbLocal);
Setting::SetDatabaseAdapter($dbLocal); \Model\Setting::SetDatabaseAdapter($dbLocal);
Report::SetDatabaseAdapter($dbLocal); \Model\Report::SetDatabaseAdapter($dbLocal);
DataEntryBackup::SetDatabaseAdapter($dbLocal); \Model\DataEntryBackup::SetDatabaseAdapter($dbLocal);
Audit::SetDatabaseAdapter($dbLocal); \Model\Audit::SetDatabaseAdapter($dbLocal);
Notification::SetDatabaseAdapter($dbLocal); \Model\Notification::SetDatabaseAdapter($dbLocal);
RestAccessToken::SetDatabaseAdapter($dbLocal); \Model\RestAccessToken::SetDatabaseAdapter($dbLocal);
$moduleManagers = BaseService::getInstance()->getModuleManagers(); $moduleManagers = \Classes\BaseService::getInstance()->getModuleManagers();
foreach($moduleManagers as $moduleManagerObj){ foreach($moduleManagers as $moduleManagerObj){
@@ -79,7 +78,6 @@ class TestTemplate extends PHPUnit_Framework_TestCase{
$moduleManagerObj->setupUserClasses($userTables); $moduleManagerObj->setupUserClasses($userTables);
$moduleManagerObj->setupFileFieldMappings($fileFields); $moduleManagerObj->setupFileFieldMappings($fileFields);
$moduleManagerObj->setupErrorMappings($mysqlErrors); $moduleManagerObj->setupErrorMappings($mysqlErrors);
//$moduleManagerObj->setupRestEndPoints();
$moduleManagerObj->initCalculationHooks(); $moduleManagerObj->initCalculationHooks();
$modelClassList = $moduleManagerObj->getModelClasses(); $modelClassList = $moduleManagerObj->getModelClasses();

View File

@@ -12,7 +12,7 @@ class ApprovalStatusTest extends TestTemplate{
protected function setUp(){ protected function setUp(){
parent::setUp(); parent::setUp();
$emp = new Employee(); $emp = new \Employees\Common\Model\Employee();
$emp->Load("id = ?",array(1)); $emp->Load("id = ?",array(1));
$emp->supervisor = 2; $emp->supervisor = 2;
$emp->indirect_supervisors = json_encode(array(3,4)); $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"); $this->travelRec->DB()->execute("delete from EmployeeTravelRecords");
@@ -46,7 +46,7 @@ class ApprovalStatusTest extends TestTemplate{
public function testInitializeApprovalChain(){ public function testInitializeApprovalChain(){
$id = $this->travelRec->id; $id = $this->travelRec->id;
$this->initializeObjects(); $this->initializeObjects();
$as = ApprovalStatus::getInstance(); $as = \Classes\Approval\ApprovalStatus::getInstance();
$as->initializeApprovalChain('EmployeeTravelRecord',$id); $as->initializeApprovalChain('EmployeeTravelRecord',$id);
$status = $as->getAllStatuses('EmployeeTravelRecord',$id); $status = $as->getAllStatuses('EmployeeTravelRecord',$id);
$this->assertEquals(3, count($status)); $this->assertEquals(3, count($status));
@@ -56,7 +56,7 @@ class ApprovalStatusTest extends TestTemplate{
public function testUpdateApprovalStatus(){ public function testUpdateApprovalStatus(){
$id = $this->travelRec->id; $id = $this->travelRec->id;
$this->initializeObjects(); $this->initializeObjects();
$as = ApprovalStatus::getInstance(); $as = \Classes\Approval\ApprovalStatus::getInstance();
$as->initializeApprovalChain('EmployeeTravelRecord',$id); $as->initializeApprovalChain('EmployeeTravelRecord',$id);
$resp = $as->updateApprovalStatus('EmployeeTravelRecord',$id,2,1); $resp = $as->updateApprovalStatus('EmployeeTravelRecord',$id,2,1);
@@ -67,7 +67,7 @@ class ApprovalStatusTest extends TestTemplate{
$resp = $as->updateApprovalStatus('EmployeeTravelRecord',$id,3,1); $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); $resp = $as->updateApprovalStatus('EmployeeTravelRecord',$id,5,1);
$this->assertEquals(0, $resp->getObject()[0]->active); $this->assertEquals(0, $resp->getObject()[0]->active);
@@ -90,4 +90,4 @@ class ApprovalStatusTest extends TestTemplate{
fwrite(STDOUT, __METHOD__ . " End\n"); fwrite(STDOUT, __METHOD__ . " End\n");
} }
} }

View File

@@ -13,10 +13,10 @@ class LanguageManagerTest extends TestTemplate{
public function testTran(){ public function testTran(){
$this->assertEquals('cat', LanguageManager::tran('cat')); $this->assertEquals('cat', \Classes\LanguageManager::tran('cat'));
$this->assertEquals('solid', LanguageManager::tran('solid')); $this->assertEquals('solid', \Classes\LanguageManager::tran('solid'));
$this->assertEquals('one file', LanguageManager::tran('one file')); $this->assertEquals('one file', \Classes\LanguageManager::tran('one file'));
$this->assertEquals('2 files', LanguageManager::tran('2 files')); $this->assertEquals('2 files', \Classes\LanguageManager::tran('2 files'));
$this->assertEquals('User Logged In now', LanguageManager::translateTnrText('User <t>Logged In</t> now')); $this->assertEquals('User Logged In now', \Classes\LanguageManager::translateTnrText('User <t>Logged In</t> now'));
} }
} }