Merge pull request #1679 from dereuromark/master-cleanup-tests

Don't use comp. wrappers anymore.
This commit is contained in:
Renan Gonçalves 2013-09-27 04:10:39 -07:00
commit bd1c0b18ff
7 changed files with 12 additions and 12 deletions

View file

@ -703,7 +703,7 @@ class CakeSchemaTest extends CakeTestCase {
); );
$result = $this->Schema->generateTable('fields', $posts); $result = $this->Schema->generateTable('fields', $posts);
$this->assertRegExp('/public \$fields/', $result); $this->assertRegExp('/public \$fields/', $result);
$this->assertPattern('/\'type\' \=\> \'fulltext\'/', $result); $this->assertRegExp('/\'type\' \=\> \'fulltext\'/', $result);
} }
/** /**

View file

@ -147,7 +147,7 @@ class ModelCrossSchemaHabtmTest extends BaseModelTest {
)); ));
$results = $Player->saveAll($player, array('validate' => 'first')); $results = $Player->saveAll($player, array('validate' => 'first'));
$this->assertNotEqual(false, $results); $this->assertNotSame(false, $results);
$count = $Player->find('count'); $count = $Player->find('count');
$this->assertEquals(5, $count); $this->assertEquals(5, $count);

View file

@ -6754,7 +6754,7 @@ class FormHelperTest extends CakeTestCase {
$result = $matches[1]; $result = $matches[1];
$expected = range(date('Y') + 20, 1930); $expected = range(date('Y') + 20, 1930);
$this->assertEquals($result, $expected); $this->assertEquals($expected, $result);
$this->Form->request->data['Project']['release'] = '2050-10-10'; $this->Form->request->data['Project']['release'] = '2050-10-10';
$result = $this->Form->year('Project.release'); $result = $this->Form->year('Project.release');
@ -6762,7 +6762,7 @@ class FormHelperTest extends CakeTestCase {
$result = $matches[1]; $result = $matches[1];
$expected = range(2050, date('Y') - 20); $expected = range(2050, date('Y') - 20);
$this->assertEquals($result, $expected); $this->assertEquals($expected, $result);
$this->Form->request->data['Project']['release'] = '1881-10-10'; $this->Form->request->data['Project']['release'] = '1881-10-10';
$result = $this->Form->year('Project.release', 1890, 1900); $result = $this->Form->year('Project.release', 1890, 1900);
@ -6770,7 +6770,7 @@ class FormHelperTest extends CakeTestCase {
$result = $matches[1]; $result = $matches[1];
$expected = range(1900, 1881); $expected = range(1900, 1881);
$this->assertEquals($result, $expected); $this->assertEquals($expected, $result);
} }
/** /**
@ -9312,7 +9312,7 @@ class FormHelperTest extends CakeTestCase {
'div' => false, 'div' => false,
'label' => false, 'label' => false,
); );
$this->assertEqual($result, $expected); $this->assertEquals($expected, $result);
} }
} }

View file

@ -1844,13 +1844,13 @@ class HtmlHelperTest extends CakeTestCase {
$this->assertTags($result, array('div' => array('class' => 'class-name'), '<text>', '/div')); $this->assertTags($result, array('div' => array('class' => 'class-name'), '<text>', '/div'));
$result = $this->Html->tag(false, '<em>stuff</em>'); $result = $this->Html->tag(false, '<em>stuff</em>');
$this->assertEquals($result, '<em>stuff</em>'); $this->assertEquals('<em>stuff</em>', $result);
$result = $this->Html->tag(null, '<em>stuff</em>'); $result = $this->Html->tag(null, '<em>stuff</em>');
$this->assertEquals($result, '<em>stuff</em>'); $this->assertEquals('<em>stuff</em>', $result);
$result = $this->Html->tag('', '<em>stuff</em>'); $result = $this->Html->tag('', '<em>stuff</em>');
$this->assertEquals($result, '<em>stuff</em>'); $this->assertEquals('<em>stuff</em>', $result);
} }
/** /**

View file

@ -2233,7 +2233,7 @@ class PaginatorHelperTest extends CakeTestCase {
*/ */
public function testParam() { public function testParam() {
$result = $this->Paginator->param('count'); $result = $this->Paginator->param('count');
$this->assertIdentical(62, $result); $this->assertSame(62, $result);
$result = $this->Paginator->param('imaginary'); $result = $this->Paginator->param('imaginary');
$this->assertNull($result); $this->assertNull($result);

View file

@ -1388,7 +1388,7 @@ class ViewTest extends CakeTestCase {
public function testBlockSetDecimal() { public function testBlockSetDecimal() {
$this->View->assign('testWithDecimal', 1.23456789); $this->View->assign('testWithDecimal', 1.23456789);
$result = $this->View->fetch('testWithDecimal'); $result = $this->View->fetch('testWithDecimal');
$this->assertEqual('1.23456789', $result); $this->assertEquals('1.23456789', $result);
} }
/** /**

View file

@ -1,6 +1,6 @@
<?php <?php
/** /**
* This class helpes in indirectly testing the functionaliteies of CakeTestCase::assertTags * This class helpes in indirectly testing the functionalities of CakeTestCase::assertTags
* *
* @package Cake.Test.Fixture * @package Cake.Test.Fixture
*/ */