Skip to content

Commit 8f828bd

Browse files
committed
Split mega test method up into smaller parts.
1 parent 2345370 commit 8f828bd

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

Test/Case/View/Helper/HtmlToolbarHelperTest.php

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @link http://cakephp.org CakePHP(tm) Project
1515
* @since DebugKit 0.1
1616
* @license http://www.opensource.org/licenses/mit-license.php MIT License
17-
**/
17+
*/
1818

1919
App::uses('View', 'View');
2020
App::uses('Controller', 'Controller');
@@ -56,7 +56,7 @@ public static function tearDownAfterClass() {
5656
* Setup
5757
*
5858
* @return void
59-
**/
59+
*/
6060
public function setUp() {
6161
parent::setUp();
6262

@@ -84,11 +84,11 @@ public function tearDown() {
8484
}
8585

8686
/**
87-
* Test Neat Array formatting
87+
* Test makeNeatArray with basic types.
8888
*
8989
* @return void
90-
**/
91-
public function testMakeNeatArray() {
90+
*/
91+
public function testMakeNeatArrayBasic() {
9292
$in = false;
9393
$result = $this->Toolbar->makeNeatArray($in);
9494
$expected = array(
@@ -124,7 +124,14 @@ public function testMakeNeatArray() {
124124
'/ul'
125125
);
126126
$this->assertTags($result, $expected);
127+
}
127128

129+
/**
130+
* Test Neat Array formatting
131+
*
132+
* @return void
133+
*/
134+
public function testMakeNeatArray() {
128135
$in = array('key' => 'value');
129136
$result = $this->Toolbar->makeNeatArray($in);
130137
$expected = array(
@@ -271,7 +278,7 @@ public function testMakeNeatArrayObjects() {
271278
* Test injection of toolbar
272279
*
273280
* @return void
274-
**/
281+
*/
275282
public function testInjectToolbar() {
276283
$this->Controller->viewPath = 'Posts';
277284
$request = new CakeRequest('/posts/index');
@@ -298,7 +305,7 @@ public function testInjectToolbar() {
298305
* test injection of javascript
299306
*
300307
* @return void
301-
**/
308+
*/
302309
public function testJavascriptInjection() {
303310
$this->Controller->viewPath = 'Posts';
304311
$this->Controller->uses = null;
@@ -367,7 +374,7 @@ public function testTable() {
367374
* test starting a panel
368375
*
369376
* @return void
370-
**/
377+
*/
371378
public function testStartPanel() {
372379
$result = $this->Toolbar->panelStart('My Panel', 'my_panel');
373380
$expected = array(
@@ -382,7 +389,7 @@ public function testStartPanel() {
382389
* test ending a panel
383390
*
384391
* @return void
385-
**/
392+
*/
386393
public function testPanelEnd() {
387394
$result = $this->Toolbar->panelEnd();
388395
$this->assertNull($result);

0 commit comments

Comments
 (0)