From 48e7805a1b00807967a62b56367c1f439791e753 Mon Sep 17 00:00:00 2001 From: Bill Schaller Date: Wed, 8 Apr 2015 10:18:42 -0400 Subject: [PATCH] Fix test failures on windows due to differing newlines --- tests/Doctrine/Tests/DBAL/ConnectionTest.php | 4 +--- tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php | 8 +------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/tests/Doctrine/Tests/DBAL/ConnectionTest.php b/tests/Doctrine/Tests/DBAL/ConnectionTest.php index ae5a439646a..aa9f8e8b780 100644 --- a/tests/Doctrine/Tests/DBAL/ConnectionTest.php +++ b/tests/Doctrine/Tests/DBAL/ConnectionTest.php @@ -131,9 +131,7 @@ public function testEventManagerPassedToPlatform() */ public function testDriverExceptionIsWrapped($method) { - $this->setExpectedException('Doctrine\DBAL\DBALException', "An exception occurred while executing 'MUUHAAAAHAAAA': - -SQLSTATE[HY000]: General error: 1 near \"MUUHAAAAHAAAA\""); + $this->setExpectedException('Doctrine\DBAL\DBALException', "An exception occurred while executing 'MUUHAAAAHAAAA':\n\nSQLSTATE[HY000]: General error: 1 near \"MUUHAAAAHAAAA\""); $con = \Doctrine\DBAL\DriverManager::getConnection(array( 'driver' => 'pdo_sqlite', diff --git a/tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php b/tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php index d3b9fe73b47..05e71454928 100644 --- a/tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php +++ b/tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php @@ -38,13 +38,7 @@ public function dataGetPlaceholderPositions() array('SELECT "Doctrine\DBAL?" FROM foo WHERE bar = ?', true, array(45)), // Ticket DBAL-558 array('SELECT `Doctrine\DBAL?` FROM foo WHERE bar = ?', true, array(45)), // Ticket DBAL-558 array('SELECT [Doctrine\DBAL?] FROM foo WHERE bar = ?', true, array(45)), // Ticket DBAL-558 - array( -<<<'SQLDATA' -SELECT * FROM foo WHERE bar = 'it\'s a trap? \\' OR bar = ? -AND baz = "\"quote\" me on it? \\" OR baz = ? -SQLDATA - , true, array(58, 104) - ), + array("SELECT * FROM FOO WHERE bar = 'it\\'s a trap? \\\\' OR bar = ?\nAND baz = \"\\\"quote\\\" me on it? \\\\\" OR baz = ?", true, array(58, 104)), array('SELECT * FROM foo WHERE foo = ? AND bar = ?', true, array(1 => 42, 0 => 30)), // explicit keys // named