Move from main() to init() in the AllTests.php files.

diff --git a/framework/Auth/test/Horde/Auth/AllTests.php b/framework/Auth/test/Horde/Auth/AllTests.php
index a003df4..ce80541 100644 (file)
--- a/framework/Auth/test/Horde/Auth/AllTests.php
+++ b/framework/Auth/test/Horde/Auth/AllTests.php
@@ -32,6 +32,8 @@ class Horde_Auth_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Auth_AllTests::init('Horde_Auth', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Auth_AllTests::main') {
-    Horde_Auth_AllTests::main('Horde_Auth', __FILE__);
+    Horde_Auth_AllTests::main();
 }

diff --git a/framework/Constraint/test/Horde/Constraint/AllTests.php b/framework/Constraint/test/Horde/Constraint/AllTests.php
index 2c24a6b..4d9c1ba 100644 (file)
--- a/framework/Constraint/test/Horde/Constraint/AllTests.php
+++ b/framework/Constraint/test/Horde/Constraint/AllTests.php
@@ -25,6 +25,8 @@ class Horde_Constraint_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Constraint_AllTests::init('Horde_Constraint', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Constraint_AllTests::main') {
-    Horde_Constraint_AllTests::main('Horde_Constraint', __FILE__);
+    Horde_Constraint_AllTests::main();
 }

diff --git a/framework/Controller/test/Horde/Controller/AllTests.php b/framework/Controller/test/Horde/Controller/AllTests.php
index 2f28c89..4a8dbf0 100644 (file)
--- a/framework/Controller/test/Horde/Controller/AllTests.php
+++ b/framework/Controller/test/Horde/Controller/AllTests.php
@@ -32,6 +32,8 @@ class Horde_Controller_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Controller_AllTests::init('Horde_Controller', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Controller_AllTests::main') {
-    Horde_Controller_AllTests::main('Horde_Controller', __FILE__);
+    Horde_Controller_AllTests::main();
 }

diff --git a/framework/Date/test/Horde/Date/AllTests.php b/framework/Date/test/Horde/Date/AllTests.php
index 01e0bc9..035050a 100644 (file)
--- a/framework/Date/test/Horde/Date/AllTests.php
+++ b/framework/Date/test/Horde/Date/AllTests.php
@@ -27,6 +27,8 @@ class Horde_Date_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Date_AllTests::init('Horde_Date', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Date_AllTests::main') {
-    Horde_Date_AllTests::main('Horde_Date', __FILE__);
+    Horde_Date_AllTests::main();
 }

diff --git a/framework/Date_Parser/test/Horde/Date/Parser/AllTests.php b/framework/Date_Parser/test/Horde/Date/Parser/AllTests.php
index 9493307..8802c5a 100644 (file)
--- a/framework/Date_Parser/test/Horde/Date/Parser/AllTests.php
+++ b/framework/Date_Parser/test/Horde/Date/Parser/AllTests.php
@@ -27,6 +27,8 @@ class Horde_Date_Parser_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Date_Parser_AllTests::init('Horde_Date_Parser', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Date_Parser_AllTests::main') {
-    Horde_Date_Parser_AllTests::main('Horde_Date_Parser', __FILE__);
+    Horde_Date_Parser_AllTests::main();
 }

diff --git a/framework/Exception/test/Horde/Exception/AllTests.php b/framework/Exception/test/Horde/Exception/AllTests.php
index 8d995f0..c297c35 100644 (file)
--- a/framework/Exception/test/Horde/Exception/AllTests.php
+++ b/framework/Exception/test/Horde/Exception/AllTests.php
@@ -31,7 +31,7 @@ class Horde_Exception_AllTests extends Horde_Test_AllTests
 {
 }
 
-//Horde_Exception_AllTests::init('Horde_Exception', __FILE__);
+Horde_Exception_AllTests::init('Horde_Exception', __FILE__);
 
 if (PHPUnit_MAIN_METHOD == 'Horde_Exception_AllTests::main') {
     Horde_Exception_AllTests::main();

diff --git a/framework/Feed/test/Horde/Feed/AllTests.php b/framework/Feed/test/Horde/Feed/AllTests.php
index 3e85d67..f671b1d 100644 (file)
--- a/framework/Feed/test/Horde/Feed/AllTests.php
+++ b/framework/Feed/test/Horde/Feed/AllTests.php
@@ -24,6 +24,8 @@ class Horde_Feed_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Feed_AllTests::init('Horde_Feed', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Feed_AllTests::main') {
-    Horde_Feed_AllTests::main('Horde_Feed', __FILE__);
+    Horde_Feed_AllTests::main();
 }

diff --git a/framework/History/test/Horde/History/AllTests.php b/framework/History/test/Horde/History/AllTests.php
index a2cdc94..da502ec 100644 (file)
--- a/framework/History/test/Horde/History/AllTests.php
+++ b/framework/History/test/Horde/History/AllTests.php
@@ -31,6 +31,8 @@ class Horde_History_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_History_AllTests::init('Horde_History', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_History_AllTests::main') {
-    Horde_History_AllTests::main('Horde_History', __FILE__);
+    Horde_History_AllTests::main();
 }

diff --git a/framework/Http/test/Horde/Http/AllTests.php b/framework/Http/test/Horde/Http/AllTests.php
index 3593eda..96f4ba6 100644 (file)
--- a/framework/Http/test/Horde/Http/AllTests.php
+++ b/framework/Http/test/Horde/Http/AllTests.php
@@ -27,6 +27,8 @@ class Horde_Http_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Http_AllTests::init('Horde_Http', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Http_AllTests::main') {
-    Horde_Http_AllTests::main('Horde_Http', __FILE__);
+    Horde_Http_AllTests::main();
 }

diff --git a/framework/Injector/test/Horde/Injector/AllTests.php b/framework/Injector/test/Horde/Injector/AllTests.php
index cc2e838..d997d5e 100644 (file)
--- a/framework/Injector/test/Horde/Injector/AllTests.php
+++ b/framework/Injector/test/Horde/Injector/AllTests.php
@@ -24,6 +24,8 @@ class Horde_Injector_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Injector_AllTests::init('Horde_Injector', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Injector_AllTests::main') {
-    Horde_Injector_AllTests::main('Horde_Injector', __FILE__);
+    Horde_Injector_AllTests::main();
 }

diff --git a/framework/Kolab_Format/test/Horde/Kolab/Format/AllTests.php b/framework/Kolab_Format/test/Horde/Kolab/Format/AllTests.php
index ab10ab1..8dba17f 100644 (file)
--- a/framework/Kolab_Format/test/Horde/Kolab/Format/AllTests.php
+++ b/framework/Kolab_Format/test/Horde/Kolab/Format/AllTests.php
@@ -31,6 +31,8 @@ class Horde_Kolab_Format_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Kolab_Format_AllTests::init('Horde_Kolab_Format', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Kolab_Format_AllTests::main') {
-    Horde_Kolab_Format_AllTests::main('Horde_Kolab_Format', __FILE__);
+    Horde_Kolab_Format_AllTests::main();
 }

diff --git a/framework/Kolab_FreeBusy/test/Horde/Kolab/FreeBusy/AllTests.php b/framework/Kolab_FreeBusy/test/Horde/Kolab/FreeBusy/AllTests.php
index c158bd1..add5815 100644 (file)
--- a/framework/Kolab_FreeBusy/test/Horde/Kolab/FreeBusy/AllTests.php
+++ b/framework/Kolab_FreeBusy/test/Horde/Kolab/FreeBusy/AllTests.php
@@ -30,8 +30,15 @@ require_once 'Horde/Test/AllTests.php';
  */
 class Horde_Kolab_FreeBusy_AllTests extends Horde_Test_AllTests
 {
+    public static function suite()
+    {
+        // Return empty for now
+        return new PHPUnit_Framework_TestSuite();
+    }
 }
 
+Horde_Kolab_FreeBusy_AllTests::init('Horde_Kolab_FreeBusy', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Kolab_FreeBusy_AllTests::main') {
-    Horde_Kolab_FreeBusy_AllTests::main('Horde_Kolab_FreeBusy', __FILE__);
+    Horde_Kolab_FreeBusy_AllTests::main();
 }

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php b/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php
index bdde2d1..80f8a8f 100644 (file)
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/AllTests.php
@@ -31,6 +31,8 @@ class Horde_Kolab_Server_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Kolab_Server_AllTests::init('Horde_Kolab_Server', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Kolab_Server_AllTests::main') {
-    Horde_Kolab_Server_AllTests::main('Horde_Kolab_Server', __FILE__);
+    Horde_Kolab_Server_AllTests::main();
 }

diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/AllTests.php b/framework/Kolab_Session/test/Horde/Kolab/Session/AllTests.php
index 5c9dfd8..0e58c14 100644 (file)
--- a/framework/Kolab_Session/test/Horde/Kolab/Session/AllTests.php
+++ b/framework/Kolab_Session/test/Horde/Kolab/Session/AllTests.php
@@ -43,7 +43,7 @@ class Horde_Kolab_Session_AllTests extends Horde_Test_AllTests
 {
 }
 
-//Horde_Kolab_Session_AllTests::init('Horde_Kolab_Session', __FILE__);
+Horde_Kolab_Session_AllTests::init('Horde_Kolab_Session', __FILE__);
 
 if (PHPUnit_MAIN_METHOD == 'Horde_Kolab_Session_AllTests::main') {
     Horde_Kolab_Session_AllTests::main();

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/AllTests.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/AllTests.php
index fd1a12c..e5c8ca7 100644 (file)
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/AllTests.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/AllTests.php
@@ -32,6 +32,8 @@ class Horde_Kolab_Storage_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Kolab_Storage_AllTests::init('Horde_Kolab_Storage', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Kolab_Storage_AllTests::main') {
-    Horde_Kolab_Storage_AllTests::main('Horde_Kolab_Storage', __FILE__);
+    Horde_Kolab_Storage_AllTests::main();
 }

diff --git a/framework/Log/test/Horde/Log/AllTests.php b/framework/Log/test/Horde/Log/AllTests.php
index 7615f60..86aeb24 100644 (file)
--- a/framework/Log/test/Horde/Log/AllTests.php
+++ b/framework/Log/test/Horde/Log/AllTests.php
@@ -34,6 +34,8 @@ class Horde_Log_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Log_AllTests::init('Horde_Log', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Log_AllTests::main') {
-    Horde_Log_AllTests::main('Horde_Log', __FILE__);
+    Horde_Log_AllTests::main();
 }

diff --git a/framework/Mime/test/Horde/Mime/AllTests.php b/framework/Mime/test/Horde/Mime/AllTests.php
index b42aea1..db6b91d 100644 (file)
--- a/framework/Mime/test/Horde/Mime/AllTests.php
+++ b/framework/Mime/test/Horde/Mime/AllTests.php
@@ -29,6 +29,8 @@ class Horde_Mime_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Mime_AllTests::init('Horde_Mime', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Mime_AllTests::main') {
-    Horde_Mime_AllTests::main('Horde_Mime', __FILE__);
+    Horde_Mime_AllTests::main();
 }

diff --git a/framework/Notification/test/Horde/Notification/AllTests.php b/framework/Notification/test/Horde/Notification/AllTests.php
index 6124537..71e41c6 100644 (file)
--- a/framework/Notification/test/Horde/Notification/AllTests.php
+++ b/framework/Notification/test/Horde/Notification/AllTests.php
@@ -29,6 +29,8 @@ class Horde_Notification_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Notification_AllTests::init('Horde_Notification', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Notification_AllTests::main') {
-    Horde_Notification_AllTests::main('Horde_Notification', __FILE__);
+    Horde_Notification_AllTests::main();
 }

diff --git a/framework/Pdf/test/Horde/Pdf/AllTests.php b/framework/Pdf/test/Horde/Pdf/AllTests.php
index 30c183e..47c6810 100644 (file)
--- a/framework/Pdf/test/Horde/Pdf/AllTests.php
+++ b/framework/Pdf/test/Horde/Pdf/AllTests.php
@@ -28,6 +28,8 @@ class Horde_Pdf_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Pdf_AllTests::init('Horde_Pdf', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Pdf_AllTests::main') {
-    Horde_Pdf_AllTests::main('Horde_Pdf', __FILE__);
+    Horde_Pdf_AllTests::main();
 }

diff --git a/framework/Rdo/test/Horde/Rdo/AllTests.php b/framework/Rdo/test/Horde/Rdo/AllTests.php
index db00103..f8ebdf4 100644 (file)
--- a/framework/Rdo/test/Horde/Rdo/AllTests.php
+++ b/framework/Rdo/test/Horde/Rdo/AllTests.php
@@ -24,6 +24,8 @@ class Horde_Rdo_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Rdo_AllTests::init('Horde_Rdo', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Rdo_AllTests::main') {
-    Horde_Rdo_AllTests::main('Horde_Rdo', __FILE__);
+    Horde_Rdo_AllTests::main();
 }

diff --git a/framework/Routes/test/Horde/Routes/AllTests.php b/framework/Routes/test/Horde/Routes/AllTests.php
index d70e494..dc92f88 100644 (file)
--- a/framework/Routes/test/Horde/Routes/AllTests.php
+++ b/framework/Routes/test/Horde/Routes/AllTests.php
@@ -32,6 +32,8 @@ class Horde_Routes_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Routes_AllTests::init('Horde_Routes', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Routes_AllTests::main') {
-    Horde_Routes_AllTests::main('Horde_Routes', __FILE__);
+    Horde_Routes_AllTests::main();
 }

diff --git a/framework/Share/tests/Horde/Share/AllTests.php b/framework/Share/tests/Horde/Share/AllTests.php
index 096ab2a..d4a6904 100644 (file)
--- a/framework/Share/tests/Horde/Share/AllTests.php
+++ b/framework/Share/tests/Horde/Share/AllTests.php
@@ -32,7 +32,7 @@ class Horde_Share_AllTests extends Horde_Test_AllTests
 {
 }
 
-//Horde_Share_AllTests::init('Horde_Share', __FILE__);
+Horde_Share_AllTests::init('Horde_Share', __FILE__);
 
 if (PHPUnit_MAIN_METHOD == 'Horde_Share_AllTests::main') {
     Horde_Share_AllTests::main();

diff --git a/framework/Stream_Filter/test/Horde/Stream/Filter/AllTests.php b/framework/Stream_Filter/test/Horde/Stream/Filter/AllTests.php
index d72924f..6716c7e 100644 (file)
--- a/framework/Stream_Filter/test/Horde/Stream/Filter/AllTests.php
+++ b/framework/Stream_Filter/test/Horde/Stream/Filter/AllTests.php
@@ -27,6 +27,8 @@ class Horde_Stream_Filter_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Stream_Filter_AllTests::init('Horde_Stream_Filter', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Stream_Filter_AllTests::main') {
-    Horde_Stream_Filter_AllTests::main('Horde_Stream_Filter', __FILE__);
+    Horde_Stream_Filter_AllTests::main();
 }

diff --git a/framework/Text_Textile/test/Horde/Text/Textile/AllTests.php b/framework/Text_Textile/test/Horde/Text/Textile/AllTests.php
index b9ea31c..ca4f38d 100755 (executable)
--- a/framework/Text_Textile/test/Horde/Text/Textile/AllTests.php
+++ b/framework/Text_Textile/test/Horde/Text/Textile/AllTests.php
@@ -25,6 +25,8 @@ class Horde_Text_Textile_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Text_Textile_AllTests::init('Horde_Text_Textile', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Text_Textile_AllTests::main') {
-    Horde_Text_Textile_AllTests::main('Horde_Text_Textile', __FILE__);
+    Horde_Text_Textile_AllTests::main();
 }

diff --git a/framework/Url/test/Horde/Url/AllTests.php b/framework/Url/test/Horde/Url/AllTests.php
index 3a34b34..1d0c918 100644 (file)
--- a/framework/Url/test/Horde/Url/AllTests.php
+++ b/framework/Url/test/Horde/Url/AllTests.php
@@ -29,6 +29,8 @@ class Horde_Url_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Url_AllTests::init('Horde_Url', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Url_AllTests::main') {
-    Horde_Url_AllTests::main('Horde_Url', __FILE__);
+    Horde_Url_AllTests::main();
 }

diff --git a/framework/VFS/test/VFS/AllTests.php b/framework/VFS/test/VFS/AllTests.php
index ad450e4..c10ad57 100644 (file)
--- a/framework/VFS/test/VFS/AllTests.php
+++ b/framework/VFS/test/VFS/AllTests.php
@@ -32,7 +32,7 @@ class VFS_AllTests extends Horde_Test_AllTests
 {
 }
 
-//VFS_AllTests::init('VFS', __FILE__);
+VFS_AllTests::init('VFS', __FILE__);
 
 if (PHPUnit_MAIN_METHOD == 'VFS_AllTests::main') {
     VFS_AllTests::main();

diff --git a/framework/View/test/Horde/View/AllTests.php b/framework/View/test/Horde/View/AllTests.php
index f15aee4..76f90cc 100644 (file)
--- a/framework/View/test/Horde/View/AllTests.php
+++ b/framework/View/test/Horde/View/AllTests.php
@@ -31,6 +31,8 @@ class Horde_View_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_View_AllTests::init('Horde_View', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_View_AllTests::main') {
-    Horde_View_AllTests::main('Horde_View', __FILE__);
+    Horde_View_AllTests::main();
 }

diff --git a/framework/Xml_Element/test/Horde/Xml/Element/AllTests.php b/framework/Xml_Element/test/Horde/Xml/Element/AllTests.php
index 7c5946c..bd53d73 100644 (file)
--- a/framework/Xml_Element/test/Horde/Xml/Element/AllTests.php
+++ b/framework/Xml_Element/test/Horde/Xml/Element/AllTests.php
@@ -21,6 +21,8 @@ class Horde_Xml_Element_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Xml_Element_AllTests::init('Horde_Xml_Element', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Xml_Element_AllTests::main') {
-    Horde_Xml_Element_AllTests::main('Horde_Xml_Element', __FILE__);
+    Horde_Xml_Element_AllTests::main();
 }

diff --git a/framework/Yaml/test/Horde/Yaml/AllTests.php b/framework/Yaml/test/Horde/Yaml/AllTests.php
index 98bd4a2..258574b 100644 (file)
--- a/framework/Yaml/test/Horde/Yaml/AllTests.php
+++ b/framework/Yaml/test/Horde/Yaml/AllTests.php
@@ -30,6 +30,8 @@ class Horde_Yaml_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Yaml_AllTests::init('Horde_Yaml', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Yaml_AllTests::main') {
-    Horde_Yaml_AllTests::main('Horde_Yaml', __FILE__);
+    Horde_Yaml_AllTests::main();
 }