### Eclipse Workspace Patch 1.0 #P moodle2 test Index: mod/wiki/simpletest/testwikiparser.php =================================================================== RCS file: /cvsroot/moodle/moodle/mod/wiki/simpletest/testwikiparser.php,v retrieving revision 1.1 diff -u -r1.1 testwikiparser.php --- mod/wiki/simpletest/testwikiparser.php 2 May 2010 11:28:22 -0000 1.1 +++ mod/wiki/simpletest/testwikiparser.php 1 Nov 2010 17:12:03 -0000 @@ -62,11 +62,14 @@ if(!file_exists($this->test_directory."input/$markup/$num") || !file_exists($this->test_directory."output/$markup/$num")) { return false; } - $input = file_get_contents($this->test_directory."input/$markup/$num"); $output = file_get_contents($this->test_directory."output/$markup/$num"); $result = wiki_parser_proxy::parse($input, $markup, array('pretty_print' => true)); + + //removes line breaks to avoid line break encoding causing tests to fail. + $result['parsed_text'] = ereg_replace("[\r\n]", '', $result['parsed_text']); + $output = ereg_replace("[\r\n]", '', $output); $this->assertEqual($result['parsed_text'], $output); return true;