Fix tests.

diff --git a/framework/Text_Filter/lib/Horde/Text/Filter/Emails.php b/framework/Text_Filter/lib/Horde/Text/Filter/Emails.php
index 1996fae..615a359 100644 (file)
--- a/framework/Text_Filter/lib/Horde/Text/Filter/Emails.php
+++ b/framework/Text_Filter/lib/Horde/Text/Filter/Emails.php
@@ -77,7 +77,7 @@ EOR;
             $registry = Horde_Registry::singleton();
         }
 
-        if ($registry &&
+        if (isset($registry) &&
             $registry->hasMethod('mail/compose') &&
             !$this->_params['always_mailto']) {
             /* If we have a mail/compose registry method, use it. */

diff --git a/framework/Text_Filter/test/Horde/Text/Filter/emails.phpt b/framework/Text_Filter/test/Horde/Text/Filter/emails.phpt
index 4bdc2ae..16abeb6 100644 (file)
--- a/framework/Text_Filter/test/Horde/Text/Filter/emails.phpt
+++ b/framework/Text_Filter/test/Horde/Text/Filter/emails.phpt
@@ -3,8 +3,8 @@ Horde_Text_Filter_Email tests
 --FILE--
 <?php
 
-require dirname(__FILE__) . '/../../../lib/Horde/Text/Filter.php';
-require dirname(__FILE__) . '/../../../lib/Horde/Text/Filter/emails.php';
+require dirname(__FILE__) . '/../../../../lib/Horde/Text/Filter.php';
+require dirname(__FILE__) . '/../../../../lib/Horde/Text/Filter/Emails.php';
 
 $emails = <<<EOT
 Inline address test@example.com test.

diff --git a/framework/Text_Filter/test/Horde/Text/Filter/environment.phpt b/framework/Text_Filter/test/Horde/Text/Filter/environment.phpt
index f116153..8a4491a 100644 (file)
--- a/framework/Text_Filter/test/Horde/Text/Filter/environment.phpt
+++ b/framework/Text_Filter/test/Horde/Text/Filter/environment.phpt
@@ -3,8 +3,8 @@ Horde_Text_Filter_Environment tests
 --FILE--
 <?php
 
-require dirname(__FILE__) . '/../../../lib/Horde/Text/Filter.php';
-require dirname(__FILE__) . '/../../../lib/Horde/Text/Filter/Environment.php';
+require dirname(__FILE__) . '/../../../../lib/Horde/Text/Filter.php';
+require dirname(__FILE__) . '/../../../../lib/Horde/Text/Filter/Environment.php';
 
 $env = <<<EOT
 Simple line

diff --git a/framework/Text_Filter/test/Horde/Text/Filter/html2text.phpt b/framework/Text_Filter/test/Horde/Text/Filter/html2text.phpt
index 82abd87..c2696c7 100644 (file)
--- a/framework/Text_Filter/test/Horde/Text/Filter/html2text.phpt
+++ b/framework/Text_Filter/test/Horde/Text/Filter/html2text.phpt
@@ -3,8 +3,10 @@ Horde_Text_Filter_Html2text tests
 --FILE--
 <?php
 
-require dirname(__FILE__) . '/../../../lib/Horde/Text/Filter.php';
-require dirname(__FILE__) . '/../../../lib/Horde/Text/Filter/Html2text.php';
+require_once 'Horde/String.php';
+require_once 'Horde/Util.php';
+require dirname(__FILE__) . '/../../../../lib/Horde/Text/Filter.php';
+require dirname(__FILE__) . '/../../../../lib/Horde/Text/Filter/Html2text.php';
 $html = file_get_contents(dirname(__FILE__) . '/fixtures/html2text.html');
 echo Horde_Text_Filter::filter($html, 'html2text', array('charset' => 'UTF-8'));
 
@@ -133,10 +135,11 @@ Zitat von Jane Doe <jane.doe@example.com>:
 > >
 > >
 > > They aren't displayed by default, or do you mean you don't want
-> > them to appear in the top right calendar panel?
+> them
+> > to appear in the top right calendar panel?
 >
->  Yes I don't want them to appear in the top right calendar panel
-> but I want user can create their external_cal
+>  Yes I don't want them to appear in the top right calendar panel but
+> I want user can create their external_cal
 
 Jan.
 

diff --git a/framework/Text_Filter/test/Horde/Text/Filter/html2text2.phpt b/framework/Text_Filter/test/Horde/Text/Filter/html2text2.phpt
index 6934715..7a437fa 100644 (file)
--- a/framework/Text_Filter/test/Horde/Text/Filter/html2text2.phpt
+++ b/framework/Text_Filter/test/Horde/Text/Filter/html2text2.phpt
@@ -3,8 +3,10 @@ Horde_Text_Filter_Html2text lists test
 --FILE--
 <?php
 
-require dirname(__FILE__) . '/../../../lib/Horde/Text/Filter.php';
-require dirname(__FILE__) . '/../../../lib/Horde/Text/Filter/html2text.php';
+require_once 'Horde/String.php';
+require_once 'Horde/Util.php';
+require dirname(__FILE__) . '/../../../../lib/Horde/Text/Filter.php';
+require dirname(__FILE__) . '/../../../../lib/Horde/Text/Filter/Html2text.php';
 
 $html = <<<EOT
 <ul>
@@ -19,9 +21,9 @@ echo Horde_Text_Filter::filter($html, 'html2text', array('wrap' => false));
 ?>
 --EXPECT--
   * This is a short line.
-  * This is a long line. This is a long line.
-This is a long line. This is a long line. This is
-a long line. This is a long line. This is a long
+  * This is a long line. This is a long line. This
+is a long line. This is a long line. This is a
+long line. This is a long line. This is a long
 line. This is a long line. This is a long line.
 This is a long line. This is a long line. This is
 a long line.

diff --git a/framework/Text_Filter/test/Horde/Text/Filter/html2text3.phpt b/framework/Text_Filter/test/Horde/Text/Filter/html2text3.phpt
index f6c8186..89ce339 100644 (file)
--- a/framework/Text_Filter/test/Horde/Text/Filter/html2text3.phpt
+++ b/framework/Text_Filter/test/Horde/Text/Filter/html2text3.phpt
@@ -3,8 +3,10 @@ Horde_Text_Filter_Html2text quoting test
 --FILE--
 <?php
 
-require dirname(__FILE__) . '/../../../lib/Horde/Text/Filter.php';
-require dirname(__FILE__) . '/../../../lib/Horde/Text/Filter/Html2text.php';
+require_once 'Horde/String.php';
+require_once 'Horde/Util.php';
+require dirname(__FILE__) . '/../../../../lib/Horde/Text/Filter.php';
+require dirname(__FILE__) . '/../../../../lib/Horde/Text/Filter/Html2text.php';
 $html = <<<EOT
 <p>Zitat von Roberto Maurizzi &lt;roberto.maurizzi@gmail.com&gt;:</p>
   <blockquote type="cite">
@@ -36,13 +38,12 @@ echo Horde_Text_Filter::filter($html, 'html2text');
 --EXPECT--
 Zitat von Roberto Maurizzi <roberto.maurizzi@gmail.com>: 
 
-> > > > 4) In Turba, I can select a VFS driver to use. Currently it
-is
+> > > > 4) In Turba, I can select a VFS driver to use. Currently it is
 > > set
 > > > > to
 > > > > None and turba seems to be working fine. What does Turba use
-> > the
-> > > > VFS
+> the
+> > > VFS
 > > > > for?
 > >
 > > You can attach files to contacts with that.
@@ -52,9 +53,9 @@ is
 > Anything similar for Kronolith, maybe in the new version?
 > I've googled a little and only found a discussion in 2004 about
 > having attachment (or links) from VFS in Kronolith.
-> I'd really like to be able to attach all my taxes forms to the day
-> I have to pay them ;-) and more in general all the extra
-> documentation regarding an appointment.
+> I'd really like to be able to attach all my taxes forms to the day I
+> have to pay them ;-) and more in general all the extra documentation
+> regarding an appointment.
 >
 > Ciao,
 >   Roberto

diff --git a/framework/Text_Filter/test/Horde/Text/Filter/space2html.phpt b/framework/Text_Filter/test/Horde/Text/Filter/space2html.phpt
index 27d54a3..2682e90 100644 (file)
--- a/framework/Text_Filter/test/Horde/Text/Filter/space2html.phpt
+++ b/framework/Text_Filter/test/Horde/Text/Filter/space2html.phpt
@@ -3,8 +3,8 @@ Horde_Text_Filter_Space2html tests
 --FILE--
 <?php
 
-require dirname(__FILE__) . '/../../../lib/Horde/Text/Filter.php';
-require dirname(__FILE__) . '/../../../lib/Horde/Text/Filter/space2html.php';
+require dirname(__FILE__) . '/../../../../lib/Horde/Text/Filter.php';
+require dirname(__FILE__) . '/../../../../lib/Horde/Text/Filter/Space2html.php';
 
 $spaces = array('x x', 'x  x', 'x   x', 'x     x', 'x          x');
 foreach ($spaces as $space) {

diff --git a/framework/Text_Filter/test/Horde/Text/Filter/text2html.phpt b/framework/Text_Filter/test/Horde/Text/Filter/text2html.phpt
index 7fb4aff..1d73ccd 100644 (file)
--- a/framework/Text_Filter/test/Horde/Text/Filter/text2html.phpt
+++ b/framework/Text_Filter/test/Horde/Text/Filter/text2html.phpt
@@ -3,8 +3,10 @@ Horde_Text_Filter_Text2html tests
 --FILE--
 <?php
 
-require dirname(__FILE__) . '/../../../lib/Horde/Text/Filter.php';
-require dirname(__FILE__) . '/../../../lib/Horde/Text/Filter/Text2html.php';
+require_once 'Horde/String.php';
+require_once 'Horde/Util.php';
+require dirname(__FILE__) . '/../../../../lib/Horde/Text/Filter.php';
+require dirname(__FILE__) . '/../../../../lib/Horde/Text/Filter/Text2html.php';
 
 $_COOKIE[session_name()] = true;
 $text = file_get_contents(dirname(__FILE__) . '/fixtures/text2html.txt');