summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-09-23 22:44:13 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-09-23 22:44:13 +0200
commit0c144b98a417d50b9c073ae3931fdad47390f1f7 (patch)
treee1a94ada7e5e06fc7c21de13dbb3f86f88634ec7 /tests
parent8f098e8dead85b6512ac72b2d805314baec72a2f (diff)
parente695162ef76054050e4181e4d28f28cf1981386b (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'tests')
-rw-r--r--tests/Framework/Html.php5
-rw-r--r--tests/phpunit.xml2
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/Framework/Html.php b/tests/Framework/Html.php
index 8a27baca8..60284deef 100644
--- a/tests/Framework/Html.php
+++ b/tests/Framework/Html.php
@@ -31,7 +31,6 @@ class Framework_Html extends PHPUnit_Framework_TestCase
array('>', '&gt;'),
array('&', '&amp;'),
array('&amp;', '&amp;amp;'),
- array('&amp;', '&amp;', true),
);
}
@@ -39,8 +38,8 @@ class Framework_Html extends PHPUnit_Framework_TestCase
* Test for quote()
* @dataProvider data_quote
*/
- function test_quote($str, $result, $validate = false)
+ function test_quote($str, $result)
{
- $this->assertEquals(html::quote($str, $validate), $result);
+ $this->assertEquals(html::quote($str), $result);
}
}
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 8b3883223..43c3b767d 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -29,7 +29,7 @@
<file>HtmlToText.php</file>
<file>MailFunc.php</file>
</testsuite>
- <testsuite name="managesieve">
+ <testsuite name="Managesieve Tests">
<file>./../plugins/managesieve/tests/Parser.php</file>
<file>./../plugins/managesieve/tests/Tokenizer.php</file>
</testsuite>