From 6d6ad346437c1cb8c1c2a37c246aa00c9380044b Mon Sep 17 00:00:00 2001 From: REJack Date: Tue, 11 Dec 2018 12:18:59 +0100 Subject: [PATCH] fixed Database Tests --- tests/Aauth/Database/GroupToGroupModelTest.php | 1 - tests/Aauth/Database/GroupToUserModelTest.php | 1 - tests/Aauth/Database/PermToGroupModelTest.php | 5 ----- tests/Aauth/Database/PermToUserModelTest.php | 17 ++++++----------- tests/Aauth/Database/UserVariableModelTest.php | 16 ++++++++-------- 5 files changed, 14 insertions(+), 26 deletions(-) diff --git a/tests/Aauth/Database/GroupToGroupModelTest.php b/tests/Aauth/Database/GroupToGroupModelTest.php index 052d2b8..1b5c84b 100644 --- a/tests/Aauth/Database/GroupToGroupModelTest.php +++ b/tests/Aauth/Database/GroupToGroupModelTest.php @@ -25,7 +25,6 @@ class GroupToGroupModelTest extends CIDatabaseTestCase public function testInsert() { $groupToGroup = $this->model->insert(99, 99); - $this->assertTrue($groupToGroup); $this->seeInDatabase($this->config->dbTableGroupToGroup, [ 'group_id' => 99, 'subgroup_id' => 99, diff --git a/tests/Aauth/Database/GroupToUserModelTest.php b/tests/Aauth/Database/GroupToUserModelTest.php index 77c7e81..6677fd2 100644 --- a/tests/Aauth/Database/GroupToUserModelTest.php +++ b/tests/Aauth/Database/GroupToUserModelTest.php @@ -25,7 +25,6 @@ class GroupToUserModelTest extends CIDatabaseTestCase public function testInsert() { $groupToGroup = $this->model->insert(99, 99); - $this->assertTrue($groupToGroup); $this->seeInDatabase($this->config->dbTableGroupToUser, [ 'group_id' => 99, 'user_id' => 99, diff --git a/tests/Aauth/Database/PermToGroupModelTest.php b/tests/Aauth/Database/PermToGroupModelTest.php index bdac5ec..a589e22 100644 --- a/tests/Aauth/Database/PermToGroupModelTest.php +++ b/tests/Aauth/Database/PermToGroupModelTest.php @@ -24,7 +24,6 @@ class PermToGroupModelTest extends CIDatabaseTestCase public function testInsert() { $permToGroup = $this->model->insert(99, 99); - $this->assertTrue($permToGroup); $this->seeInDatabase($this->config->dbTablePermToGroup, [ 'perm_id' => 99, 'group_id' => 99, @@ -33,10 +32,6 @@ class PermToGroupModelTest extends CIDatabaseTestCase public function testExistsFalse() { - $this->hasInDatabase($this->config->dbTablePermToGroup, [ - 'perm_id' => 99, - 'group_id' => 99, - ]); $permToGroup = $this->model->exists(99, 99); $this->assertFalse($permToGroup); } diff --git a/tests/Aauth/Database/PermToUserModelTest.php b/tests/Aauth/Database/PermToUserModelTest.php index a3937a6..a7faeac 100644 --- a/tests/Aauth/Database/PermToUserModelTest.php +++ b/tests/Aauth/Database/PermToUserModelTest.php @@ -24,7 +24,6 @@ class PermToUserModelTest extends CIDatabaseTestCase public function testInsert() { $permToUser = $this->model->insert(99, 99); - $this->assertTrue($permToUser); $this->seeInDatabase($this->config->dbTablePermToUser, [ 'perm_id' => 99, 'user_id' => 99, @@ -33,10 +32,6 @@ class PermToUserModelTest extends CIDatabaseTestCase public function testExistsFalse() { - $this->hasInDatabase($this->config->dbTablePermToUser, [ - 'perm_id' => 99, - 'user_id' => 99, - ]); $permToUser = $this->model->exists(99, 99); $this->assertFalse($permToUser); } @@ -51,15 +46,15 @@ class PermToUserModelTest extends CIDatabaseTestCase $this->assertTrue($permToUser); } - public function testFindAllByGroupId() + public function testFindAllByUserId() { - $permsToUser = $this->model->findAllByGroupId(99); + $permsToUser = $this->model->findAllByUserId(99); $this->assertCount(0, $permsToUser); $this->hasInDatabase($this->config->dbTablePermToUser, [ 'perm_id' => 99, 'user_id' => 99, ]); - $permsToUser = $this->model->findAllByGroupId(99); + $permsToUser = $this->model->findAllByUserId(99); $this->assertCount(1, $permsToUser); } @@ -104,7 +99,7 @@ class PermToUserModelTest extends CIDatabaseTestCase $this->seeNumRecords(0, $this->config->dbTablePermToUser, $criteria); } - public function testDeleteAllByGroupId() + public function testDeleteAllByUserId() { $this->hasInDatabase($this->config->dbTablePermToUser, [ 'perm_id' => 99, @@ -114,7 +109,7 @@ class PermToUserModelTest extends CIDatabaseTestCase 'user_id' => 99, ]; $this->seeNumRecords(1, $this->config->dbTablePermToUser, $criteria); - $this->model->deleteAllByGroupId(99); + $this->model->deleteAllByUserId(99); $this->seeNumRecords(0, $this->config->dbTablePermToUser, $criteria); } @@ -129,7 +124,7 @@ class PermToUserModelTest extends CIDatabaseTestCase 'perm_id' => 98, 'user_id' => 99, ]); - $permsToUser = $this->model->findAllByGroupId(99); + $permsToUser = $this->model->findAllByUserId(99); $this->assertCount(2, $permsToUser); } } diff --git a/tests/Aauth/Database/UserVariableModelTest.php b/tests/Aauth/Database/UserVariableModelTest.php index 21fa770..9430d90 100644 --- a/tests/Aauth/Database/UserVariableModelTest.php +++ b/tests/Aauth/Database/UserVariableModelTest.php @@ -33,7 +33,7 @@ class UserVariableModelTest extends CIDatabaseTestCase $this->hasInDatabase($this->config->dbTableUserVariables, [ 'user_id' => 99, 'data_key' => 'test', - 'date_value' => 'TRUE', + 'data_value' => 'TRUE', ]); $userVariable = $this->model->find(99, 'test'); $this->assertEquals('TRUE', $userVariable); @@ -44,7 +44,7 @@ class UserVariableModelTest extends CIDatabaseTestCase $this->hasInDatabase($this->config->dbTableUserVariables, [ 'user_id' => 99, 'data_key' => 'test', - 'date_value' => 'TRUE', + 'data_value' => 'TRUE', ]); $userVariables = $this->model->findAll(99); $this->assertCount(1, $userVariables); @@ -56,7 +56,7 @@ class UserVariableModelTest extends CIDatabaseTestCase $this->seeInDatabase($this->config->dbTableUserVariables, [ 'user_id' => 99, 'data_key' => 'test', - 'date_value' => 'TRUE', + 'data_value' => 'TRUE', ]); } @@ -67,7 +67,7 @@ class UserVariableModelTest extends CIDatabaseTestCase $this->seeInDatabase($this->config->dbTableUserVariables, [ 'user_id' => 99, 'data_key' => 'test', - 'date_value' => 'TRUE2', + 'data_value' => 'TRUE2', ]); } @@ -76,7 +76,7 @@ class UserVariableModelTest extends CIDatabaseTestCase $this->hasInDatabase($this->config->dbTableUserVariables, [ 'user_id' => 99, 'data_key' => 'test', - 'date_value' => 'TRUE', + 'data_value' => 'TRUE', ]); $criteria = [ 'user_id' => 99, @@ -91,7 +91,7 @@ class UserVariableModelTest extends CIDatabaseTestCase $this->hasInDatabase($this->config->dbTableUserVariables, [ 'user_id' => 99, 'data_key' => 'test', - 'date_value' => 'TRUE', + 'data_value' => 'TRUE', ]); $userVariable = $this->model->asArray()->where(['data_key'=>'test', 'data_value'=>'TRUE'])->first(); $this->assertInternalType('array', $userVariable); @@ -102,7 +102,7 @@ class UserVariableModelTest extends CIDatabaseTestCase $this->hasInDatabase($this->config->dbTableUserVariables, [ 'user_id' => 99, 'data_key' => 'test', - 'date_value' => 'TRUE', + 'data_value' => 'TRUE', ]); $userVariable = $this->model->asObject()->where(['data_key'=>'test', 'data_value'=>'TRUE'])->first(); $this->assertInternalType('object', $userVariable); @@ -114,7 +114,7 @@ class UserVariableModelTest extends CIDatabaseTestCase $this->hasInDatabase($this->config->dbTableUserVariables, [ 'user_id' => 99, 'data_key' => 'test', - 'date_value' => 'TRUE', + 'data_value' => 'TRUE', ]); $userVariable = $this->model->asObject()->where(['data_key'=>'test', 'data_value'=>'TRUE'])->first(); $this->assertInternalType('object', $userVariable);