Fix tests.

dereuromark · May 12, 2019 · 31fc1f7 · 31fc1f7
1 parent 7449cbe
commit 31fc1f7
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 27 deletions.
diff --git a/tests/TestCase/Controller/Component/CommonComponentTest.php b/tests/TestCase/Controller/Component/CommonComponentTest.php
@@ -31,7 +31,7 @@ public function setUp(): void {
 
 		Configure::write('App.fullBaseUrl', 'http://localhost');
 
-		$this->request = new ServerRequest('/my_controller/foo');
+		$this->request = new ServerRequest(['url' => '/my_controller/foo']);
 		$this->request = $this->request->withParam('controller', 'MyController')
 			->withParam('action', 'foo');
 		$this->Controller = new CommonComponentTestController($this->request);

diff --git a/tests/TestCase/Mailer/EmailTest.php b/tests/TestCase/Mailer/EmailTest.php
@@ -86,10 +86,11 @@ public function testFrom() {
 	}
 
 	/**
-	 * @expectedException \InvalidArgumentException
 	 * @return void
 	 */
 	public function testFromExecption() {
+		$this->expectException(\InvalidArgumentException::class);
+
 		$this->Email->setFrom(['cake@cakephp.org' => 'CakePHP', 'fail@cakephp.org' => 'From can only be one address']);
 	}
 

diff --git a/tests/TestCase/Utility/NumberTest.php b/tests/TestCase/Utility/NumberTest.php
@@ -169,7 +169,7 @@ public function testRoundTo() {
 		];
 		foreach ($values as $was => $expected) {
 			$is = Number::roundTo($was, 10);
-			$this->assertSame($expected, $is, null, $was);
+			$this->assertSame($expected, $is, $was);
 		}
 		//increment = 0.1
 		$values2 = [
@@ -182,7 +182,7 @@ public function testRoundTo() {
 		];
 		foreach ($values2 as $was => $expected) {
 			$is = Number::roundTo($was, 0.1);
-			$this->assertSame($expected, $is, null, $was);
+			$this->assertSame($expected, $is, $was);
 		}
 	}
 
@@ -201,7 +201,7 @@ public function testRoundUpTo() {
 		];
 		foreach ($values as $was => $expected) {
 			$is = Number::roundUpTo($was, 10);
-			$this->assertSame($expected, $is, null, $was);
+			$this->assertSame($expected, $is, $was);
 		}
 		//increment = 5
 		$values = [
@@ -214,7 +214,7 @@ public function testRoundUpTo() {
 		];
 		foreach ($values as $was => $expected) {
 			$is = Number::roundUpTo($was, 5);
-			$this->assertSame($expected, $is, null, $was);
+			$this->assertSame($expected, $is, $was);
 		}
 	}
 
@@ -233,7 +233,7 @@ public function testRoundDownTo() {
 		];
 		foreach ($values as $was => $expected) {
 			$is = Number::roundDownTo($was, 10);
-			$this->assertSame($expected, $is, null, $was);
+			$this->assertSame($expected, $is, $was);
 		}
 		//increment = 3
 		$values = [
@@ -246,7 +246,7 @@ public function testRoundDownTo() {
 		];
 		foreach ($values as $was => $expected) {
 			$is = Number::roundDownTo($was, 3);
-			$this->assertSame($expected, $is, null, $was);
+			$this->assertSame($expected, $is, $was);
 		}
 	}
 
@@ -263,8 +263,8 @@ public function testGetDecimalPlaces() {
 			'0.001' => 3
 		];
 		foreach ($values as $was => $expected) {
-			$is = Number::getDecimalPlaces($was, 10);
-			$this->assertSame($expected, $is); //, null, $was
+			$is = Number::getDecimalPlaces($was);
+			$this->assertSame($expected, $is);
 		}
 	}
 

diff --git a/tests/TestCase/Utility/UtilityTest.php b/tests/TestCase/Utility/UtilityTest.php
@@ -458,14 +458,16 @@ public function testExpandList() {
 	}
 
 	/**
-	 * @expectedException \RuntimeException
 	 * @return void
 	 */
 	public function testExpandListWithKeyLessListInvalid() {
 		$is = [
 			'Some',
 			'ValueOnly',
 		];
+
+		$this->expectException(\RuntimeException::class);
+
 		Utility::expandList($is);
 	}
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -6,7 +6,7 @@
 	define('DS', DIRECTORY_SEPARATOR);
 }
 if (!defined('WINDOWS')) {
-	if (DS == '\\' || substr(PHP_OS, 0, 3) === 'WIN') {
+	if (DS === '\\' || substr(PHP_OS, 0, 3) === 'WIN') {
 		define('WINDOWS', true);
 	} else {
 		define('WINDOWS', false);

diff --git a/tests/test_app/Application.php b/tests/test_app/Application.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App;
+
+use Cake\Http\BaseApplication;
+use Cake\Http\MiddlewareQueue;
+use Cake\Routing\Middleware\RoutingMiddleware;
+
+class Application extends BaseApplication {
+
+	/**
+	 * @param \Cake\Http\MiddlewareQueue $middlewareQueue The middleware queue to set in your App Class
+	 * @return \Cake\Http\MiddlewareQueue
+	 */
+	public function middleware(MiddlewareQueue $middlewareQueue): MiddlewareQueue {
+		$middlewareQueue->add(new RoutingMiddleware($this));
+
+		return $middlewareQueue;
+	}
+
+}
diff --git a/tests/test_app/Controller/CommonComponentTestController.php b/tests/test_app/Controller/CommonComponentTestController.php
@@ -10,14 +10,15 @@
  */
 class CommonComponentTestController extends Controller {
 
-	/**
-	 * @var array
-	 */
-	public $components = ['Tools.Common'];
-
 	/**
 	 * @var array
 	 */
 	public $autoRedirectActions = ['allowed'];
 
+	public function initialize(): void {
+		parent::initialize();
+
+		$this->loadComponent('Tools.Common');
+	}
+
 }
diff --git a/tests/test_app/Controller/MobileComponentTestController.php b/tests/test_app/Controller/MobileComponentTestController.php
@@ -8,11 +8,11 @@
  */
 class MobileComponentTestController extends Controller {
 
-	/**
-	 * Components property
-	 *
-	 * @var array
-	 */
-	public $components = ['RequestHandler', 'Tools.Mobile'];
+	public function initialize(): void {
+		parent::initialize();
+
+		$this->loadComponent('RequestHandler');
+		$this->loadComponent('Tools.Mobile');
+	}
 
 }
diff --git a/tests/test_app/Controller/UrlComponentTestController.php b/tests/test_app/Controller/UrlComponentTestController.php
@@ -10,9 +10,10 @@
  */
 class UrlComponentTestController extends Controller {
 
-	/**
-	 * @var array
-	 */
-	public $components = ['Tools.Url'];
+	public function initialize(): void {
+		parent::initialize();
+
+		$this->loadComponent('Tools.Url');
+	}
 
 }