Skip to content

Unitテスト用の共通メソッド_mockForReturn()の修正 #352

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 1 commit into from
Sep 5, 2016
Merged

Unitテスト用の共通メソッド_mockForReturn()の修正 #352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions TestSuite/NetCommonsControllerTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ protected function _testActionOnValidationError($method, $data, $urlOptions, $va
*
* @param string $mockModel Mockのモデル
* @param string $mockMethod Mockのメソッド
* @param int $count Mockの呼び出し回数
* @param int|string $count Mockの呼び出し回数
* @return void
*/
protected function _mockForReturnFalse($mockModel, $mockMethod, $count = 1) {
Expand All @@ -226,7 +226,7 @@ protected function _mockForReturnFalse($mockModel, $mockMethod, $count = 1) {
*
* @param string $mockModel Mockのモデル
* @param string $mockMethod Mockのメソッド
* @param int $count Mockの呼び出し回数
* @param int|string $count Mockの呼び出し回数
* @return void
*/
protected function _mockForReturnTrue($mockModel, $mockMethod, $count = 1) {
Expand All @@ -239,18 +239,22 @@ protected function _mockForReturnTrue($mockModel, $mockMethod, $count = 1) {
* @param string $mockModel Mockのモデル
* @param string $mockMethod Mockのメソッド
* @param bool $return 戻り値
* @param int $count Mockの呼び出し回数
* @param int|string $count Mockの呼び出し回数
* @return void
*/
protected function _mockForReturn($mockModel, $mockMethod, $return, $count = 1) {
list($mockPlugin, $mockModel) = pluginSplit($mockModel);

if (substr(get_class($this->controller->$mockModel), 0, strlen('Mock_')) !== 'Mock_') {
$this->controller->$mockModel = $this->getMockForModel(
$mockPlugin . '.' . $mockModel, array($mockMethod)
$mockPlugin . '.' . $mockModel,
array($mockMethod),
array('plugin' => Inflector::underscore($mockPlugin))
);
}
if ($count === 1) {
if ($count === 'any') {
$funcCount = $this->any();
} elseif ($count === 1) {
$funcCount = $this->once();
} else {
$funcCount = $this->exactly($count);
Expand Down