From d5710e4431cf1811947e68b2fbec47a0aa3f3c02 Mon Sep 17 00:00:00 2001 From: euromark Date: Fri, 11 Jul 2014 15:57:24 +0200 Subject: [PATCH] Fix tests in Win --- .../Controller/Component/RequestHandlerComponentTest.php | 2 +- tests/TestCase/Controller/ControllerTest.php | 2 +- tests/TestCase/Database/Schema/SqliteSchemaTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/TestCase/Controller/Component/RequestHandlerComponentTest.php b/tests/TestCase/Controller/Component/RequestHandlerComponentTest.php index fc62a661aae..4121226025e 100644 --- a/tests/TestCase/Controller/Component/RequestHandlerComponentTest.php +++ b/tests/TestCase/Controller/Component/RequestHandlerComponentTest.php @@ -413,7 +413,7 @@ public function testNoViewClassExtension() { $event = new Event('Controller.startup', $this->Controller); $this->RequestHandler->initialize($event); $this->RequestHandler->startup($event); - $this->assertEquals('RequestHandlerTest/csv', $this->Controller->viewPath); + $this->assertEquals('RequestHandlerTest' . DS . 'csv', $this->Controller->viewPath); $this->assertEquals('csv', $this->Controller->layoutPath); } diff --git a/tests/TestCase/Controller/ControllerTest.php b/tests/TestCase/Controller/ControllerTest.php index 093915fdb86..78d30246c04 100644 --- a/tests/TestCase/Controller/ControllerTest.php +++ b/tests/TestCase/Controller/ControllerTest.php @@ -831,7 +831,7 @@ public function testViewPathConventions() { )); $response = $this->getMock('Cake\Network\Response'); $Controller = new \TestApp\Controller\Admin\PostsController($request, $response); - $this->assertEquals('Admin/Posts', $Controller->viewPath); + $this->assertEquals('Admin' . DS . 'Posts', $Controller->viewPath); $request = new Request('pages/home'); $Controller = new \TestApp\Controller\PagesController($request, $response); diff --git a/tests/TestCase/Database/Schema/SqliteSchemaTest.php b/tests/TestCase/Database/Schema/SqliteSchemaTest.php index e05e36f1759..bafab811db1 100644 --- a/tests/TestCase/Database/Schema/SqliteSchemaTest.php +++ b/tests/TestCase/Database/Schema/SqliteSchemaTest.php @@ -712,7 +712,7 @@ public function testCreateSql() { SQL; $result = $table->createSql($connection); $this->assertCount(2, $result); - $this->assertEquals($expected, $result[0]); + $this->assertTextEquals($expected, $result[0]); $this->assertEquals( 'CREATE INDEX "title_idx" ON "articles" ("title")', $result[1]