Skip to content

Loading…

Fix missing and invalid assertions in tests #481

Merged
merged 1 commit into from

2 participants

@majna

Remove unused variables and dead code.

@majna majna Fix missing and invalid assertions in tests.
Remove unused variables and dead code.
d41e562
@lorenzo
CakePHP member

Thanks!

@lorenzo lorenzo merged commit 4271102 into cakephp:2.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 16, 2012
  1. @majna

    Fix missing and invalid assertions in tests.

    majna committed
    Remove unused variables and dead code.
View
1 lib/Cake/Test/Case/Console/AllConsoleLibsTest.php
@@ -34,7 +34,6 @@ class AllConsoleLibsTest extends PHPUnit_Framework_TestSuite {
public static function suite() {
$suite = new CakeTestSuite('All console lib classes');
- $path = CORE_TEST_CASES . DS . 'Console';
foreach (new DirectoryIterator(dirname(__FILE__)) as $file) {
if (!$file->isFile() || strpos($file, 'All') === 0) {
continue;
View
4 lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
@@ -253,7 +253,6 @@ public function testConfirmController() {
$scaffold = false;
$helpers = array('Ajax', 'Time');
$components = array('Acl', 'Auth');
- $uses = array('Comment', 'User');
$this->Task->expects($this->at(4))->method('out')->with("Controller Name:\n\t$controller");
$this->Task->expects($this->at(5))->method('out')->with("Helpers:\n\tAjax, Time");
@@ -302,9 +301,6 @@ public function testBake() {
*/
public function testBakeWithPlugin() {
$this->Task->plugin = 'ControllerTest';
- $helpers = array('Ajax', 'Time');
- $components = array('Acl', 'Auth');
- $uses = array('Comment', 'User');
//fake plugin path
CakePlugin::load('ControllerTest', array('path' => APP . 'Plugin' . DS . 'ControllerTest' . DS));
View
16 lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
@@ -283,21 +283,27 @@ public function testFieldValidationGuessing() {
$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
$expected = array('notempty' => 'notempty');
+ $this->assertEquals($expected, $result);
$result = $this->Task->fieldValidation('text', array('type' => 'date', 'length' => 10, 'null' => false));
$expected = array('date' => 'date');
+ $this->assertEquals($expected, $result);
$result = $this->Task->fieldValidation('text', array('type' => 'time', 'length' => 10, 'null' => false));
$expected = array('time' => 'time');
+ $this->assertEquals($expected, $result);
$result = $this->Task->fieldValidation('email', array('type' => 'string', 'length' => 10, 'null' => false));
$expected = array('email' => 'email');
+ $this->assertEquals($expected, $result);
$result = $this->Task->fieldValidation('test', array('type' => 'integer', 'length' => 10, 'null' => false));
$expected = array('numeric' => 'numeric');
+ $this->assertEquals($expected, $result);
$result = $this->Task->fieldValidation('test', array('type' => 'boolean', 'length' => 10, 'null' => false));
- $expected = array('numeric' => 'numeric');
+ $expected = array('boolean' => 'boolean');
+ $this->assertEquals($expected, $result);
}
/**
@@ -589,6 +595,13 @@ public function testDoAssociationsNonInteractive() {
$model = new Model(array('ds' => 'test', 'name' => 'BakeArticle'));
$result = $this->Task->doAssociations($model);
$expected = array(
+ 'belongsTo' => array(
+ array(
+ 'alias' => 'BakeUser',
+ 'className' => 'BakeUser',
+ 'foreignKey' => 'bake_user_id',
+ ),
+ ),
'hasMany' => array(
array(
'alias' => 'BakeComment',
@@ -606,6 +619,7 @@ public function testDoAssociationsNonInteractive() {
),
),
);
+ $this->assertEquals($result, $expected);
}
/**
View
1 lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
@@ -428,7 +428,6 @@ public function testRespondAs() {
$this->RequestHandler->response->expects($this->at(1))->method('type')
->with('text/xml');
- $RequestHandler = $this->getMock('RequestHandlerComponent', array('_header'), array(&$this->Controller->Components));
$result = $this->RequestHandler->respondAs('json');
$this->assertTrue($result);
$result = $this->RequestHandler->respondAs('text/xml');
View
1 lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php
@@ -480,7 +480,6 @@ public function testValidatePostNoSession() {
public function testValidatePostFormHacking() {
$this->Controller->Security->startup($this->Controller);
$key = $this->Controller->params['_Token']['key'];
- $fields = 'a5475372b40f6e3ccbf9f8af191f20e1642fd877%3AModel.valid';
$unlocked = '';
$this->Controller->request->data = array(
View
3 lib/Cake/Test/Case/Controller/ControllerTest.php
@@ -490,7 +490,6 @@ public function testLoadModelInPlugins() {
*/
public function testConstructClasses() {
$request = new CakeRequest('controller_posts/index');
- $Controller = new Controller($request);
$Controller = new Controller($request);
$Controller->uses = array('ControllerPost', 'ControllerComment');
@@ -511,8 +510,6 @@ public function testConstructClasses() {
$this->assertTrue(isset($Controller->TestPluginPost));
$this->assertTrue(is_a($Controller->TestPluginPost, 'TestPluginPost'));
-
- unset($Controller);
}
/**
View
3 lib/Cake/Test/Case/I18n/I18nTest.php
@@ -57,13 +57,12 @@ public function tearDown() {
*/
public function testTranslationCaching() {
Configure::write('Config.language', 'cache_test_po');
- $i18n = I18n::getInstance();
// reset internally stored entries
I18n::clear();
Cache::clear(false, '_cake_core_');
- $lang = Configure::read('Config.language');#$i18n->l10n->locale;
+ $lang = Configure::read('Config.language');
Cache::config('_cake_core_', Cache::config('default'));
View
2 lib/Cake/Test/Case/I18n/MultibyteTest.php
@@ -8800,7 +8800,6 @@ public function testUsingMbSubstr() {
$this->assertEquals($expected, $result);
$string = 'ĀĂĄĆĈĊČĎĐĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿŁŃŅŇŊŌŎŐŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
- $find = 'Ċ';
$result = mb_substr($string, 4, 7);
$expected = 'ĈĊČĎĐĒĔ';
$this->assertEquals($expected, $result);
@@ -8958,7 +8957,6 @@ public function testMultibyteSubstr() {
$this->assertEquals($expected, $result);
$string = 'ĀĂĄĆĈĊČĎĐĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿŁŃŅŇŊŌŎŐŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
- $find = 'Ċ';
$result = Multibyte::substr($string, 4, 7);
$expected = 'ĈĊČĎĐĒĔ';
$this->assertEquals($expected, $result);
View
1 lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
@@ -1142,7 +1142,6 @@ public function testGenerateAssociationQuerySelfJoinWithConditionsInHasOneBindin
$null = null;
$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
- $_queryData = $queryData;
$result = $this->Dbo->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
$this->assertTrue($result);
View
2 lib/Cake/Test/Case/Model/ModelDeleteTest.php
@@ -636,7 +636,7 @@ public function testDeleteDependent() {
$this->assertEquals(4, $result);
$result = $Article->delete(1, true);
- $this->assertIdentical(true, true);
+ $this->assertSame($result, true);
$result = $Article->Comment->find('count', array(
'conditions' => array('Comment.article_id' => 1)
View
2 lib/Cake/Test/Case/Model/ModelReadTest.php
@@ -76,7 +76,6 @@ public function testFetchingNonUniqueFKJoinTableRecords() {
* @return void
*/
public function testGroupBy() {
- $db = ConnectionManager::getDataSource('test');
$isStrictGroupBy = $this->db instanceof Postgres || $this->db instanceof Sqlite || $this->db instanceof Oracle || $this->db instanceof Sqlserver;
$message = 'Postgres, Oracle, SQLite and SQL Server have strict GROUP BY and are incompatible with this test.';
@@ -6769,6 +6768,7 @@ public function testFindCount() {
$this->db->fullDebug = true;
$TestModel->order = 'User.id';
$result = $TestModel->find('count');
+ $this->db->fullDebug = $fullDebug;
$this->assertEquals($result, 4);
$log = $this->db->getLog();
View
1 lib/Cake/Test/Case/Network/CakeSocketTest.php
@@ -181,6 +181,7 @@ public function testTimeOutConnection() {
$this->assertTrue($this->Socket->connect());
$config = array('host' => '127.0.0.1', 'timeout' => 0.00001);
+ $this->Socket = new CakeSocket($config);
$this->assertFalse($this->Socket->read(1024 * 1024));
$this->assertEquals($this->Socket->lastError(), '2: ' . __d('cake_dev', 'Connection timed out'));
}
View
3 lib/Cake/Test/Case/Routing/RouterTest.php
@@ -969,7 +969,8 @@ public function testUrlParsing() {
Router::reload();
Router::connect('/page/*', array('controller' => 'test'));
$result = Router::parse('/page/my-page');
- $expected = array('pass' => array('my-page'), 'plugin' => null, 'controller' => 'test', 'action' => 'index');
+ $expected = array('pass' => array('my-page'), 'plugin' => null, 'controller' => 'test', 'action' => 'index', 'named' => array());
+ $this->assertEquals($expected, $result);
Router::reload();
Router::connect('/:language/contact', array('language' => 'eng', 'plugin' => 'contact', 'controller' => 'contact', 'action' => 'index'), array('language' => '[a-z]{3}'));
View
2 lib/Cake/Test/Case/TestSuite/CakeTestSuiteTest.php
@@ -60,7 +60,7 @@ public function testAddTestDirectory() {
*
* @return void
*/
- public function testAddTestDirectoryRecursive() {return;
+ public function testAddTestDirectoryRecursive() {
$testFolder = CORE_TEST_CASES . DS . 'Cache';
$count = count(glob($testFolder . DS . '*Test.php'));
$count += count(glob($testFolder . DS . 'Engine' . DS . '*Test.php'));
View
3 lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php
@@ -2140,8 +2140,9 @@ public function testWithPlugin() {
$this->Paginator->options(array('url' => array('plugin' => null)));
$result = $this->Paginator->link('Page 3', array('page' => 3));
$expected = array(
- 'a' => array('/magazines/index/page:3'), 'Page 3', '/a'
+ 'a' => array('href' => '/magazines/index/page:3'), 'Page 3', '/a'
);
+ $this->assertTags($result, $expected);
$this->Paginator->options(array('url' => array('plugin' => null, 'controller' => 'issues')));
$result = $this->Paginator->link('Page 3', array('page' => 3));
View
1 lib/Cake/Test/Case/View/Helper/SessionHelperTest.php
@@ -168,6 +168,7 @@ public function testFlashElementInAttrs() {
'params' => array('title' => 'Notice!', 'name' => 'Alert!')
));
$expected = "<div id=\"notificationLayout\">\n\t<h1>Alert!</h1>\n\t<h3>Notice!</h3>\n\t<p>This is a calling</p>\n</div>";
+ $this->assertEquals($expected, $result);
}
/**
View
1 lib/Cake/Test/Case/View/MediaViewTest.php
@@ -35,7 +35,6 @@ class MediaViewTest extends CakeTestCase {
*/
public function setUp() {
parent::setUp();
- $controller = new Controller();
$this->MediaView = $this->getMock('MediaView', array('_isActive', '_clearBuffer', '_flushBuffer'));
$this->MediaView->response = $this->getMock('CakeResponse');
}
View
1 lib/Cake/Test/Case/View/ViewTest.php
@@ -1082,7 +1082,6 @@ public function testRenderCache() {
$View->renderCache($path, '+1 second');
$result = ob_get_clean();
- $expected = 'some cacheText';
$this->assertRegExp('/^some cacheText/', $result);
@unlink($path);
Something went wrong with that request. Please try again.