Skip to content

Unitテストのため、Key生成処理を見直し #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 17, 2016
Merged

Unitテストのため、Key生成処理を見直し #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dca82ef
UserImportテストでエラーになったため改修
s-nakajima Nov 16, 2016
38349fc
下記のコミットにより、全体的にUnitテストでエラーになるため修正
s-nakajima Nov 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Model/Behavior/OriginalKeyBehavior.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ class OriginalKeyBehavior extends ModelBehavior {
'priority' => 8
);

/**
* PHPUnitで使用するキー配列
*
* @var mixed
*/
public static $isUnitRandomKey = false;

/**
* beforeSave is called before a model is saved. Returning false from a beforeSave callback
* will abort the save operation.
Expand Down Expand Up @@ -87,7 +94,7 @@ public function afterSave(Model $model, $created, $options = array()) {
* @return string Hash key
*/
public static function generateKey($plugin, $dataSource) {
if ($dataSource !== 'test') {
if ($dataSource !== 'test' || self::$isUnitRandomKey) {
return Security::hash($plugin . mt_rand() . microtime(), 'md5');
} else {
return Security::hash($plugin, 'md5');
Expand Down
3 changes: 3 additions & 0 deletions TestSuite/NetCommonsCakeTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
App::uses('Current', 'NetCommons.Utility');
App::uses('NetCommonsTestSuite', 'NetCommons.TestSuite');
App::uses('SiteSettingUtil', 'SiteManager.Utility');
App::uses('OriginalKeyBehavior', 'NetCommons.Model/Behavior');

/**
* NetCommonsCakeTestCase class
Expand Down Expand Up @@ -151,6 +152,8 @@ public function tearDown() {
Current::$current = array();
Current::$permission = array();

OriginalKeyBehavior::$isUnitRandomKey = false;

parent::tearDown();
}

Expand Down
3 changes: 3 additions & 0 deletions TestSuite/NetCommonsControllerBaseTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
App::uses('NetCommonsCakeTestCase', 'NetCommons.TestSuite');
App::uses('Role', 'Roles.Model');
App::uses('SiteSettingUtil', 'SiteManager.Utility');
App::uses('OriginalKeyBehavior', 'NetCommons.Model/Behavior');

/**
* NetCommonsControllerTestCase
Expand Down Expand Up @@ -160,6 +161,8 @@ public function tearDown() {
Current::$current = array();
Current::$permission = array();

OriginalKeyBehavior::$isUnitRandomKey = false;

SiteSettingUtil::reset();
parent::tearDown();
}
Expand Down