diff --git a/lib/Cake/Test/TestCase/Console/Command/Task/TemplateTaskTest.php b/lib/Cake/Test/TestCase/Console/Command/Task/TemplateTaskTest.php index c5dead24075..3bf04ede987 100644 --- a/lib/Cake/Test/TestCase/Console/Command/Task/TemplateTaskTest.php +++ b/lib/Cake/Test/TestCase/Console/Command/Task/TemplateTaskTest.php @@ -58,29 +58,6 @@ public function tearDown() { unset($this->Task); } -/** - * test that set sets variables - * - * @return void - */ - public function testSet() { - $this->Task->set('one', 'two'); - $this->assertTrue(isset($this->Task->viewVars['one'])); - $this->assertEquals('two', $this->Task->viewVars['one']); - - $this->Task->set(array('one' => 'three', 'four' => 'five')); - $this->assertTrue(isset($this->Task->viewVars['one'])); - $this->assertEquals('three', $this->Task->viewVars['one']); - $this->assertTrue(isset($this->Task->viewVars['four'])); - $this->assertEquals('five', $this->Task->viewVars['four']); - - $this->Task->viewVars = array(); - $this->Task->set(array(3 => 'three', 4 => 'four')); - $this->Task->set(array(1 => 'one', 2 => 'two')); - $expected = array(3 => 'three', 4 => 'four', 1 => 'one', 2 => 'two'); - $this->assertEquals($expected, $this->Task->viewVars); - } - /** * test finding themes installed in * diff --git a/lib/Cake/Test/TestCase/Controller/ControllerTest.php b/lib/Cake/Test/TestCase/Controller/ControllerTest.php index 90b4eaa189a..81b0b045ffe 100644 --- a/lib/Cake/Test/TestCase/Controller/ControllerTest.php +++ b/lib/Cake/Test/TestCase/Controller/ControllerTest.php @@ -319,48 +319,6 @@ public function testFlash() { App::build(); } -/** - * testControllerSet method - * - * @return void - */ - public function testControllerSet() { - $request = new Request('controller_posts/index'); - $Controller = new Controller($request); - - $Controller->set('variable_with_underscores', null); - $this->assertTrue(array_key_exists('variable_with_underscores', $Controller->viewVars)); - - $Controller->viewVars = array(); - $viewVars = array('ModelName' => array('id' => 1, 'name' => 'value')); - $Controller->set($viewVars); - $this->assertTrue(array_key_exists('ModelName', $Controller->viewVars)); - - $Controller->viewVars = array(); - $Controller->set('variable_with_underscores', 'value'); - $this->assertTrue(array_key_exists('variable_with_underscores', $Controller->viewVars)); - - $Controller->viewVars = array(); - $viewVars = array('ModelName' => 'name'); - $Controller->set($viewVars); - $this->assertTrue(array_key_exists('ModelName', $Controller->viewVars)); - - $Controller->set('title', 'someTitle'); - $this->assertSame($Controller->viewVars['title'], 'someTitle'); - $this->assertTrue(empty($Controller->pageTitle)); - - $Controller->viewVars = array(); - $expected = array('ModelName' => 'name', 'ModelName2' => 'name2'); - $Controller->set(array('ModelName', 'ModelName2'), array('name', 'name2')); - $this->assertSame($expected, $Controller->viewVars); - - $Controller->viewVars = array(); - $Controller->set(array(3 => 'three', 4 => 'four')); - $Controller->set(array(1 => 'one', 2 => 'two')); - $expected = array(3 => 'three', 4 => 'four', 1 => 'one', 2 => 'two'); - $this->assertEquals($expected, $Controller->viewVars); - } - /** * testRender method * diff --git a/lib/Cake/Test/TestCase/View/ViewTest.php b/lib/Cake/Test/TestCase/View/ViewTest.php index 494af2b8ae9..312feac9331 100644 --- a/lib/Cake/Test/TestCase/View/ViewTest.php +++ b/lib/Cake/Test/TestCase/View/ViewTest.php @@ -1186,37 +1186,6 @@ public function testRenderStrippingNoCacheTagsOnlyCacheCheck() { $this->assertNotRegExp('/cake:nocache/', $result); } -/** - * testSet method - * - * @return void - */ - public function testSet() { - $View = new TestView($this->PostsController); - $View->viewVars = array(); - $View->set('somekey', 'someValue'); - $this->assertSame($View->viewVars, array('somekey' => 'someValue')); - $this->assertSame($View->getVars(), array('somekey')); - - $View->viewVars = array(); - $keys = array('key1', 'key2'); - $values = array('value1', 'value2'); - $View->set($keys, $values); - $this->assertSame($View->viewVars, array('key1' => 'value1', 'key2' => 'value2')); - $this->assertSame($View->getVars(), array('key1', 'key2')); - $this->assertSame($View->getVar('key1'), 'value1'); - $this->assertNull($View->getVar('key3')); - - $View->set(array('key3' => 'value3')); - $this->assertSame($View->getVar('key3'), 'value3'); - - $View->viewVars = array(); - $View->set(array(3 => 'three', 4 => 'four')); - $View->set(array(1 => 'one', 2 => 'two')); - $expected = array(3 => 'three', 4 => 'four', 1 => 'one', 2 => 'two'); - $this->assertEquals($expected, $View->viewVars); - } - /** * testBadExt method *