From 7ba4269c263a6e102e5efeefdce94909f9a59aab Mon Sep 17 00:00:00 2001 From: Thomas Mueller <thomas.mueller@tmit.eu> Date: Mon, 15 Jul 2013 10:28:14 +0200 Subject: [PATCH] <<<EOL seems not to use proper end of lines on windows --- tests/lib/config.php | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/tests/lib/config.php b/tests/lib/config.php index 87ee2807c2..c67a66c832 100644 --- a/tests/lib/config.php +++ b/tests/lib/config.php @@ -43,26 +43,15 @@ class Test_Config extends PHPUnit_Framework_TestCase { $this->config->setValue('foo', 'moo'); $this->assertAttributeEquals(array('foo' => 'moo'), 'cache', $this->config); $content = file_get_contents(self::CONFIG_FILE); - $this->assertEquals(<<<EOL -<?php -\$CONFIG = array ( - 'foo' => 'moo', -); -EOL - , $content); + $expected = "<?php\n\$CONFIG = array (\n 'foo' => 'moo',\n);\n"; + $this->assertEquals($expected, $content); $this->config->setValue('bar', 'red'); $this->assertAttributeEquals(array('foo' => 'moo', 'bar' => 'red'), 'cache', $this->config); $content = file_get_contents(self::CONFIG_FILE); - $this->assertEquals(<<<EOL -<?php -\$CONFIG = array ( - 'foo' => 'moo', - 'bar' => 'red', -); -EOL - , $content); + $expected = "<?php\n\$CONFIG = array (\n 'foo' => 'moo',\n 'bar' => 'red',\n);\n"; + $this->assertEquals($expected, $content); } public function testDeleteKey() { @@ -70,13 +59,9 @@ EOL $this->config->deleteKey('foo'); $this->assertAttributeEquals(array(), 'cache', $this->config); $content = file_get_contents(self::CONFIG_FILE); - $this->assertEquals(<<<EOL -<?php -\$CONFIG = array ( -); -EOL - , $content); + $expected = "<?php\n\$CONFIG = array (\n);\n"; + $this->assertEquals($expected, $content); } public function testSavingDebugMode() { @@ -85,14 +70,9 @@ EOL $this->assertAttributeEquals(array(), 'cache', $this->config); $this->assertAttributeEquals(true, 'debugMode', $this->config); $content = file_get_contents(self::CONFIG_FILE); - $this->assertEquals(<<<EOL -<?php -define('DEBUG',true); -\$CONFIG = array ( -); -EOL - , $content); + $expected = "<?php\ndefine('DEBUG',true);\n\$CONFIG = array (\n);\n"; + $this->assertEquals($expected, $content); } /** -- GitLab