Fix most code standards errors in Case/TestSuite.

cakephp · Mar 18, 2012 · 7798914 · 7798914
1 parent fc234d8
commit 7798914
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 44 deletions.
diff --git a/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
@@ -256,7 +256,7 @@ public function testAssertTextEquals() {
 		$two = "\nOne\nTwo";
 		$this->assertTextEquals($one, $two);
 	}
-	
+
 /**
  * test assertTextStartsWith()
  *
@@ -265,7 +265,7 @@ public function testAssertTextEquals() {
 	public function testAssertTextStartsWith() {
 		$stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!";
 		$stringClean = "some\nstring\nwith\ndifferent\nline endings!";
-		
+
 		$this->assertStringStartsWith("some\nstring", $stringDirty);
 		$this->assertStringStartsNotWith("some\r\nstring\r\nwith", $stringDirty);
 		$this->assertStringStartsNotWith("some\nstring\nwith", $stringDirty);
@@ -282,19 +282,19 @@ public function testAssertTextStartsWith() {
 	public function testAssertTextStartsNotWith() {
 		$stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!";
 		$stringClean = "some\nstring\nwith\ndifferent\nline endings!";
-		
+
 		$this->assertTextStartsNotWith("some\nstring\nwithout", $stringDirty);
 	}
-		
+
 /**
  * test assertTextEndsWith()
  *
  * @return void
- */	
+ */
 	public function testAssertTextEndsWith() {
 		$stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!";
 		$stringClean = "some\nstring\nwith\ndifferent\nline endings!";
-		
+
 		$this->assertTextEndsWith("string\nwith\r\ndifferent\rline endings!", $stringDirty);
 		$this->assertTextEndsWith("string\r\nwith\ndifferent\nline endings!", $stringDirty);
 	}
@@ -303,39 +303,40 @@ public function testAssertTextEndsWith() {
  * test assertTextEndsNotWith()
  *
  * @return void
- */	
+ */
 	public function testAssertTextEndsNotWith() {
 		$stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!";
 		$stringClean = "some\nstring\nwith\ndifferent\nline endings!";
-		
+
 		$this->assertStringEndsNotWith("different\nline endings", $stringDirty);
 		$this->assertTextEndsNotWith("different\rline endings", $stringDirty);
 	}
-	
+
 /**
  * test assertTextContains()
  *
  * @return void
- */	
+ */
 	public function testAssertTextContains() {
 		$stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!";
 		$stringClean = "some\nstring\nwith\ndifferent\nline endings!";
-		
+
 		$this->assertContains("different", $stringDirty);
 		$this->assertNotContains("different\rline", $stringDirty);
-		
-		$this->assertTextContains("different\rline", $stringDirty);	
+
+		$this->assertTextContains("different\rline", $stringDirty);
 	}
-	
+
 /**
  * test assertTextNotContains()
  *
  * @return void
- */	
+ */
 	public function testAssertTextNotContains() {
 		$stringDirty = "some\nstring\r\nwith\rdifferent\nline endings!";
 		$stringClean = "some\nstring\nwith\ndifferent\nline endings!";
-		
-		$this->assertTextNotContains("different\rlines", $stringDirty);	
+
+		$this->assertTextNotContains("different\rlines", $stringDirty);
 	}
+
 }
diff --git a/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
@@ -155,15 +155,23 @@ class CakeTestFixtureDefaultImportFixture extends CakeTestFixture {
  * @package       Cake.Test.Case.TestSuite
  */
 class FixtureImportTestModel extends Model {
+
 	public $name = 'FixtureImport';
+
 	public $useTable = 'fixture_tests';
+
 	public $useDbConfig = 'test';
+
 }
 
 class FixturePrefixTest extends Model {
+
 	public $name = 'FixturePrefix';
+
 	public $useTable = '_tests';
+
 	public $tablePrefix = 'fixture';
+
 	public $useDbConfig = 'test';
 }
 
@@ -218,9 +226,9 @@ public function testInit() {
 		$this->assertEquals($Fixture->primaryKey, 'my_random_key');
 	}
 
-
 /**
- * test that init() correctly sets the fixture table when the connection or model have prefixes defined.
+ * test that init() correctly sets the fixture table when the connection 
+ * or model have prefixes defined.
  *
  * @return void
  */
@@ -359,7 +367,6 @@ public function testImportWithRecords() {
 		$Source->create($newTestSuiteDb);
 		$Source->insert($newTestSuiteDb);
 
-
 		$Fixture = new CakeTestFixtureDefaultImportFixture();
 		$Fixture->fields = $Fixture->records = null;
 		$Fixture->import = array(

diff --git a/lib/Cake/Test/Case/TestSuite/CakeTestSuiteTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestSuiteTest.php
@@ -20,24 +20,6 @@
  */
 class CakeTestSuiteTest extends CakeTestCase {
 
-/**
- * setUp
- *
- * @return void
- */
-	public function setUp() {
-		parent::setUp();
-	}
-
-/**
- * tearDown
- *
- * @return void
- */
-	public function tearDown() {
-		parent::tearDown();
-	}
-
 /**
  * testAddTestDirectory
  * 

diff --git a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
@@ -26,7 +26,6 @@
 
 require_once dirname(dirname(__FILE__)) . DS . 'Model' . DS . 'models.php';
 
-
 /**
  * AppController class
  *
@@ -36,30 +35,34 @@
 	/**
 	 * AppController class
 	 *
-		 * @package       Cake.Test.Case.TestSuite
+	 * @package       Cake.Test.Case.TestSuite
 	 */
 	class AppController extends Controller {
+
 	/**
 	 * helpers property
 	 *
 	 * @var array
 	 * @access public
 	 */
 		public $helpers = array('Html');
+
 	/**
 	 * uses property
 	 *
 	 * @var array
 	 * @access public
 	 */
 		public $uses = array('ControllerPost');
+
 	/**
 	 * components property
 	 *
 	 * @var array
 	 * @access public
 	 */
 		public $components = array('Cookie');
+
 	}
 } elseif (!defined('APP_CONTROLLER_EXISTS')) {
 	define('APP_CONTROLLER_EXISTS', true);
@@ -238,7 +241,6 @@ public function testGenerateWithPlugin() {
 			->will($this->returnValue(false));
 		$this->assertTrue($Tests->TestPluginComment->save(array()));
 		$this->assertFalse($Tests->TestPluginComment->save(array()));
-
 	}
 
 /**
@@ -496,7 +498,7 @@ public function testNoControllerReuse() {
 		$this->assertContains('This is the TestsAppsController index view', $result);
 		$this->assertContains('first call', $result);
 		$this->assertContains('</html>', $result);
-	
+
 		$result = $this->Case->testAction('/tests_apps/index', array(
 			'data' => array('var' => 'second call'),
 			'method' => 'get',

diff --git a/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php b/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
@@ -21,6 +21,7 @@
 App::uses('CakeBaseReporter', 'TestSuite/Reporter');
 
 class HtmlCoverageReportTest extends CakeTestCase {
+
 /**
  * setUp
  *
@@ -127,7 +128,6 @@ public function testGenerateDiff() {
 		}
 	}
 
-
 /**
  * Test that coverage works with phpunit 3.6 as the data formats from coverage are totally different.
  *
@@ -198,7 +198,6 @@ public function testCoveredLinesTitleAttributes() {
 			5 => -1
 		);
 
-
 		$result = $this->Coverage->generateDiff('myfile.php', $file, $coverage);
 
 		$this->assertTrue(