Skip to content

Commit

Permalink
Remove copy + paste tests.
Browse files Browse the repository at this point in the history
These tests are redundant as there are tests for the trait now.
  • Loading branch information
markstory committed Feb 25, 2013
1 parent 9665db5 commit 955889c
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 96 deletions.
23 changes: 0 additions & 23 deletions lib/Cake/Test/TestCase/Console/Command/Task/TemplateTaskTest.php
Expand Up @@ -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
*
Expand Down
42 changes: 0 additions & 42 deletions lib/Cake/Test/TestCase/Controller/ControllerTest.php
Expand Up @@ -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
*
Expand Down
31 changes: 0 additions & 31 deletions lib/Cake/Test/TestCase/View/ViewTest.php
Expand Up @@ -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
*
Expand Down

0 comments on commit 955889c

Please sign in to comment.