diff options
| author | Paweł Słowik <pawel.slowik@iq.pl> | 2012-09-03 15:10:26 +0200 |
|---|---|---|
| committer | Paweł Słowik <pawel.slowik@iq.pl> | 2012-09-03 15:10:26 +0200 |
| commit | 197a3e6faf9258c3cc78810081f3368325045d57 (patch) | |
| tree | a51ad6b2b2701e7746b53f4507fded64821a0ba5 /tests | |
| parent | ffb160147a324f4b8744d13c97e1ca4177a8167a (diff) | |
| parent | 4bb0bffefe3d0772f10bfd4acc3e8ccb1193211d (diff) | |
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/HtmlToText.php | 4 | ||||
| -rw-r--r-- | tests/MailFunc.php | 2 | ||||
| -rw-r--r-- | tests/phpunit.xml | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/tests/HtmlToText.php b/tests/HtmlToText.php index 34e2d1a63..b90c61adf 100644 --- a/tests/HtmlToText.php +++ b/tests/HtmlToText.php @@ -8,7 +8,7 @@ class HtmlToText extends PHPUnit_Framework_TestCase { - function data() + function data_html2text() { return array( 0 => array( @@ -45,7 +45,7 @@ class HtmlToText extends PHPUnit_Framework_TestCase } /** - * @dataProvider data + * @dataProvider data_html2text */ function test_html2text($title, $in, $out) { diff --git a/tests/MailFunc.php b/tests/MailFunc.php index 57a6b9d10..967277c2a 100644 --- a/tests/MailFunc.php +++ b/tests/MailFunc.php @@ -8,7 +8,7 @@ class MailFunc extends PHPUnit_Framework_TestCase { - function __construct() + function setUp() { // simulate environment to successfully include func.inc $GLOBALS['RCMAIL'] = $RCMAIL = rcmail::get_instance(); diff --git a/tests/phpunit.xml b/tests/phpunit.xml index 28f7e7420..8b3883223 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -29,5 +29,9 @@ <file>HtmlToText.php</file> <file>MailFunc.php</file> </testsuite> + <testsuite name="managesieve"> + <file>./../plugins/managesieve/tests/Parser.php</file> + <file>./../plugins/managesieve/tests/Tokenizer.php</file> + </testsuite> </testsuites> </phpunit> |