diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-17 00:37:02 -0700 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-17 00:37:02 -0700 |
commit | a3ff77156789a4eaf0e205aa93b168d399e011ac (patch) | |
tree | 44861777717e92fa70f0f2742d0d7f5572283a23 | |
parent | 210006c4a6ed4e46100d9af12647e145c6b67553 (diff) | |
parent | 7ba4269c263a6e102e5efeefdce94909f9a59aab (diff) | |
download | nextcloud-server-a3ff77156789a4eaf0e205aa93b168d399e011ac.tar.gz nextcloud-server-a3ff77156789a4eaf0e205aa93b168d399e011ac.zip |
Merge pull request #4067 from owncloud/fixing-tests-win32-master
<<<EOL seems not to use proper end of lines on windows
-rw-r--r-- | tests/lib/config.php | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/tests/lib/config.php b/tests/lib/config.php index 87ee2807c2d..c67a66c832e 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); } /** |