From 65ee48a57f42826189844ad1039c37a8a675dbab Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sun, 1 Jul 2012 11:38:02 +0200
Subject: [PATCH] Made multiline test cases work on windows too
---
_test/tests/inc/common_cleanText.test.php | 6 +-----
_test/tests/lib/exe/js_js_compress.test.php | 6 ++----
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/_test/tests/inc/common_cleanText.test.php b/_test/tests/inc/common_cleanText.test.php
index 00e70d4c7..9d4494332 100644
--- a/_test/tests/inc/common_cleanText.test.php
+++ b/_test/tests/inc/common_cleanText.test.php
@@ -3,11 +3,7 @@
class common_cleanText_test extends DokuWikiTest {
function test_unix(){
- $unix = 'one
- two
-
- three';
-
+ $unix = "one\n two\n\n three";
$this->assertEquals($unix,cleanText($unix));
}
diff --git a/_test/tests/lib/exe/js_js_compress.test.php b/_test/tests/lib/exe/js_js_compress.test.php
index aa8d82933..49f93cc54 100644
--- a/_test/tests/lib/exe/js_js_compress.test.php
+++ b/_test/tests/lib/exe/js_js_compress.test.php
@@ -111,12 +111,10 @@ class js_js_compress_test extends DokuWikiTest {
}
function test_multilinestring(){
- $text = 'var foo = "this is a \\
-multiline string";';
+ $text = 'var foo = "this is a \\'."\n".'multiline string";';
$this->assertEquals('var foo="this is a multiline string";',js_compress($text));
- $text = "var foo = 'this is a \\
-multiline string';";
+ $text = "var foo = 'this is a \\\nmultiline string';";
$this->assertEquals("var foo='this is a multiline string';",js_compress($text));
}
--
GitLab