Skip to content

バグフィックス #377

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 4 commits into from
Nov 21, 2016
Merged

バグフィックス #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e07d453
CurrentFrame::setFrame()のテスト
s-nakajima Nov 17, 2016
e3265e3
Merge origin/master
s-nakajima Nov 17, 2016
5dc2f74
CurrentFrame::setFrame()のテスト
s-nakajima Nov 18, 2016
ec42334
CurrentFrame::setBlock()のテスト
s-nakajima Nov 18, 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
226 changes: 226 additions & 0 deletions Test/Case/Utility/CurrentFrame/SetBlockTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
<?php
/**
* CurrentFrame::setBlock()のテスト
*
* @author Noriko Arai <arai@nii.ac.jp>
* @author Shohei Nakajima <nakajimashouhei@gmail.com>
* @link http://www.netcommons.org NetCommons Project
* @license http://www.netcommons.org/license.txt NetCommons License
* @copyright Copyright 2014, NetCommons Project
*/

App::uses('NetCommonsCurrentUtilityBase', 'NetCommons.TestSuite');
App::uses('CurrentFrame', 'NetCommons.Utility');

/**
* CurrentFrame::setBlock()のテスト
*
* @author Shohei Nakajima <nakajimashouhei@gmail.com>
* @package NetCommons\NetCommons\Test\Case\Utility\CurrentFrame
*/
class NetCommonsUtilityCurrentFrameSetBlockTest extends NetCommonsCurrentUtilityBase {

/**
* Plugin name
*
* @var string
*/
public $plugin = 'net_commons';

/**
* setUp method
*
* @return void
*/
public function setUp() {
parent::setUp();

$this->CurrentFrame = new CurrentFrame();
}

/**
* POSTリクエストのテスト
*
* @return void
*/
public function testPost() {
//データ生成
Current::$request->data['Block']['id'] = '2';

//テスト実施
$this->CurrentFrame->setBlock();

//チェック
$this->__assertBlockHeader();
}

/**
* 引数$blockIdがある場合のテスト
*
* @return void
*/
public function testWithFrameId() {
//データ生成
$blockId = '2';

//テスト実施
$this->CurrentFrame->setBlock($blockId);

//チェック
$this->__assertBlockHeader();
}

/**
* Current::$current['Frame']がある場合のテスト
*
* @return void
*/
public function testWithFrame() {
//データ生成
$blockId = '2';
Current::$current['Frame'] = array(
'id' => '9999',
'key' => 'frame_9999',
);

//テスト実施
$this->CurrentFrame->setBlock($blockId);

//チェック
$expected = array(
'Frame' => array(
'id' => '9999',
'key' => 'frame_9999',
),
'Room' => array(
'id' => '2',
'space_id' => '2',
'page_id_top' => '1',
'root_id' => null,
'parent_id' => '1',
'lft' => '2',
'rght' => '7',
'active' => true,
'in_draft' => false,
'default_role_key' => 'visitor',
'need_approval' => true,
'default_participation' => true,
'page_layout_permitted' => true,
'theme' => null,
),
);
$this->__assertBlockHeader($expected, array('Frame', 'Box', 'Space', 'Plugin'));
}

/**
* block_id=2の評価
*
* @param array $mergeExpected $expectedにマージするデータ
* @param array $removeKeys $expectedから削除するデータ
* @return void
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
private function __assertBlockHeader($mergeExpected = array(), $removeKeys = array()) {
Current::$current = Hash::remove(Current::$current, '{s}.created_user');
Current::$current = Hash::remove(Current::$current, '{s}.created');
Current::$current = Hash::remove(Current::$current, '{s}.modified_user');
Current::$current = Hash::remove(Current::$current, '{s}.modified');

$default = array(
'Block' => array(
'id' => '2',
'language_id' => '2',
'room_id' => '2',
'plugin_key' => 'test_frames',
'key' => 'block_1',
'name' => 'Block name 1',
'public_type' => '1',
'publish_start' => null,
'publish_end' => null,
'content_count' => '0',
),
'Language' => array(
'id' => '2',
'code' => 'ja',
'weight' => '2',
'is_active' => true,
),
'Room' => array(
'id' => '1',
'space_id' => '1',
'page_id_top' => null,
'root_id' => null,
'parent_id' => null,
'lft' => '1',
'rght' => '12',
'active' => true,
'in_draft' => false,
'default_role_key' => 'visitor',
'need_approval' => true,
'default_participation' => true,
'page_layout_permitted' => false,
'theme' => null,
),
'Frame' => array(
'id' => '2',
'language_id' => '2',
'room_id' => '1',
'box_id' => '1',
'plugin_key' => 'test_frames',
'block_id' => '2',
'key' => 'frame_header',
'name' => 'Test frame header',
'header_type' => 'default',
'weight' => '1',
'is_deleted' => false,
'default_action' => '',
),
'Box' => array(
'id' => '1',
'container_id' => null,
'type' => '1',
'space_id' => '1',
'room_id' => '1',
'page_id' => null,
'container_type' => '1',
'weight' => null,
),
'Plugin' => array(
'id' => '2',
'language_id' => '2',
'key' => 'test_frames',
'name' => 'Lorem ipsum dolor sit amet',
'namespace' => 'Lorem ipsum dolor sit amet',
'weight' => '1',
'type' => '1',
'version' => null,
'commit_version' => null,
'commited' => null,
'default_action' => '',
'default_setting_action' => '',
'frame_add_action' => null,
'display_topics' => false,
'display_search' => false,
'serialize_data' => null,
),
'Space' => array(
'id' => '1',
'parent_id' => null,
'lft' => '1',
'rght' => '8',
'type' => '1',
'plugin_key' => null,
'default_setting_action' => null,
),
);

foreach ($removeKeys as $keyPath) {
$default = Hash::remove($default, $keyPath);
}

$expected = Hash::merge($default, $mergeExpected);

$this->assertEquals(Current::$current, $expected);
}

}
Loading