Fix tests.

diff --git a/framework/Argv/test/Horde/Argv/AllTests.php b/framework/Argv/test/Horde/Argv/AllTests.php
index eac19cf..e211765 100644 (file)
--- a/framework/Argv/test/Horde/Argv/AllTests.php
+++ b/framework/Argv/test/Horde/Argv/AllTests.php
@@ -27,7 +27,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  * Prepare the test setup.
  */
 require_once 'Horde/Test/AllTests.php';
-set_include_path(dirname(__FILE__) . '/../../' . PATH_SEPARATOR . get_include_path());
 
 /**
  * @package    Horde_Argv
@@ -37,6 +36,8 @@ class Horde_Argv_AllTests extends Horde_Test_AllTests
 {
 }
 
+Horde_Argv_AllTests::init('Horde_Argv', __FILE__);
+
 if (PHPUnit_MAIN_METHOD == 'Horde_Argv_AllTests::main') {
     Horde_Argv_AllTests::main('Horde_Argv', __FILE__);
 }

diff --git a/framework/Argv/test/Horde/Argv/BoolTest.php b/framework/Argv/test/Horde/Argv/BoolTest.php
index 4520784..a0b6d17 100644 (file)
--- a/framework/Argv/test/Horde/Argv/BoolTest.php
+++ b/framework/Argv/test/Horde/Argv/BoolTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/CallbackCheckAbbrevTest.php b/framework/Argv/test/Horde/Argv/CallbackCheckAbbrevTest.php
index 755dfd1..f9d3714 100644 (file)
--- a/framework/Argv/test/Horde/Argv/CallbackCheckAbbrevTest.php
+++ b/framework/Argv/test/Horde/Argv/CallbackCheckAbbrevTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/CallbackExtraArgsTest.php b/framework/Argv/test/Horde/Argv/CallbackExtraArgsTest.php
index c670ec7..f098874 100644 (file)
--- a/framework/Argv/test/Horde/Argv/CallbackExtraArgsTest.php
+++ b/framework/Argv/test/Horde/Argv/CallbackExtraArgsTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/CallbackManyArgsTest.php b/framework/Argv/test/Horde/Argv/CallbackManyArgsTest.php
index d4eb3d5..4a4869d 100644 (file)
--- a/framework/Argv/test/Horde/Argv/CallbackManyArgsTest.php
+++ b/framework/Argv/test/Horde/Argv/CallbackManyArgsTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/CallbackMeddleArgsTest.php b/framework/Argv/test/Horde/Argv/CallbackMeddleArgsTest.php
index 2328af3..2187d66 100644 (file)
--- a/framework/Argv/test/Horde/Argv/CallbackMeddleArgsTest.php
+++ b/framework/Argv/test/Horde/Argv/CallbackMeddleArgsTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/CallbackTest.php b/framework/Argv/test/Horde/Argv/CallbackTest.php
index 256cbfa..d046071 100644 (file)
--- a/framework/Argv/test/Horde/Argv/CallbackTest.php
+++ b/framework/Argv/test/Horde/Argv/CallbackTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/CallbackVarArgsTest.php b/framework/Argv/test/Horde/Argv/CallbackVarArgsTest.php
index 6b50fd9..d14996e 100644 (file)
--- a/framework/Argv/test/Horde/Argv/CallbackVarArgsTest.php
+++ b/framework/Argv/test/Horde/Argv/CallbackVarArgsTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/ChoiceTest.php b/framework/Argv/test/Horde/Argv/ChoiceTest.php
index 261cf1f..bc7f39a 100644 (file)
--- a/framework/Argv/test/Horde/Argv/ChoiceTest.php
+++ b/framework/Argv/test/Horde/Argv/ChoiceTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/ConflictOverrideTest.php b/framework/Argv/test/Horde/Argv/ConflictOverrideTest.php
index 04206ed..085807b 100644 (file)
--- a/framework/Argv/test/Horde/Argv/ConflictOverrideTest.php
+++ b/framework/Argv/test/Horde/Argv/ConflictOverrideTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/ConflictResolveTest.php b/framework/Argv/test/Horde/Argv/ConflictResolveTest.php
index bb3c439..94a1e64 100644 (file)
--- a/framework/Argv/test/Horde/Argv/ConflictResolveTest.php
+++ b/framework/Argv/test/Horde/Argv/ConflictResolveTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/ConflictTestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/ConflictTest.php b/framework/Argv/test/Horde/Argv/ConflictTest.php
index b5f7a76..292d588 100644 (file)
--- a/framework/Argv/test/Horde/Argv/ConflictTest.php
+++ b/framework/Argv/test/Horde/Argv/ConflictTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/ConflictingDefaultsTest.php b/framework/Argv/test/Horde/Argv/ConflictingDefaultsTest.php
index dbc430b..2255c7e 100644 (file)
--- a/framework/Argv/test/Horde/Argv/ConflictingDefaultsTest.php
+++ b/framework/Argv/test/Horde/Argv/ConflictingDefaultsTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/CountTest.php b/framework/Argv/test/Horde/Argv/CountTest.php
index 8e21beb..176e83a 100644 (file)
--- a/framework/Argv/test/Horde/Argv/CountTest.php
+++ b/framework/Argv/test/Horde/Argv/CountTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/DefaultValuesTest.php b/framework/Argv/test/Horde/Argv/DefaultValuesTest.php
index 282506c..ca6a1d9 100644 (file)
--- a/framework/Argv/test/Horde/Argv/DefaultValuesTest.php
+++ b/framework/Argv/test/Horde/Argv/DefaultValuesTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/ExpandDefaultsTest.php b/framework/Argv/test/Horde/Argv/ExpandDefaultsTest.php
index 374ef3e..47becc6 100644 (file)
--- a/framework/Argv/test/Horde/Argv/ExpandDefaultsTest.php
+++ b/framework/Argv/test/Horde/Argv/ExpandDefaultsTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/ExtendAddActionsTest.php b/framework/Argv/test/Horde/Argv/ExtendAddActionsTest.php
index 68d26e8..ee8869d 100644 (file)
--- a/framework/Argv/test/Horde/Argv/ExtendAddActionsTest.php
+++ b/framework/Argv/test/Horde/Argv/ExtendAddActionsTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/ExtendAddTypesTest.php b/framework/Argv/test/Horde/Argv/ExtendAddTypesTest.php
index 8ab9c55..c8ed830 100644 (file)
--- a/framework/Argv/test/Horde/Argv/ExtendAddTypesTest.php
+++ b/framework/Argv/test/Horde/Argv/ExtendAddTypesTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/HelpTest.php b/framework/Argv/test/Horde/Argv/HelpTest.php
index 7db6cec..5f6298a 100644 (file)
--- a/framework/Argv/test/Horde/Argv/HelpTest.php
+++ b/framework/Argv/test/Horde/Argv/HelpTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/MatchAbbrevTest.php b/framework/Argv/test/Horde/Argv/MatchAbbrevTest.php
index 46ac62e..a298e52 100644 (file)
--- a/framework/Argv/test/Horde/Argv/MatchAbbrevTest.php
+++ b/framework/Argv/test/Horde/Argv/MatchAbbrevTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/MultipleArgsAppendTest.php b/framework/Argv/test/Horde/Argv/MultipleArgsAppendTest.php
index 8b9ae2b..d2bd540 100644 (file)
--- a/framework/Argv/test/Horde/Argv/MultipleArgsAppendTest.php
+++ b/framework/Argv/test/Horde/Argv/MultipleArgsAppendTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/MultipleArgsTest.php b/framework/Argv/test/Horde/Argv/MultipleArgsTest.php
index 3d14736..1023714 100644 (file)
--- a/framework/Argv/test/Horde/Argv/MultipleArgsTest.php
+++ b/framework/Argv/test/Horde/Argv/MultipleArgsTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/OptionChecksTest.php b/framework/Argv/test/Horde/Argv/OptionChecksTest.php
index d701286..45bbce5 100644 (file)
--- a/framework/Argv/test/Horde/Argv/OptionChecksTest.php
+++ b/framework/Argv/test/Horde/Argv/OptionChecksTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/OptionGroupTest.php b/framework/Argv/test/Horde/Argv/OptionGroupTest.php
index 73129f9..790b57f 100644 (file)
--- a/framework/Argv/test/Horde/Argv/OptionGroupTest.php
+++ b/framework/Argv/test/Horde/Argv/OptionGroupTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/OptionValuesTest.php b/framework/Argv/test/Horde/Argv/OptionValuesTest.php
index c847b40..893582c 100644 (file)
--- a/framework/Argv/test/Horde/Argv/OptionValuesTest.php
+++ b/framework/Argv/test/Horde/Argv/OptionValuesTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/ParseNumTest.php b/framework/Argv/test/Horde/Argv/ParseNumTest.php
index 53da9cc..6a255f4 100644 (file)
--- a/framework/Argv/test/Horde/Argv/ParseNumTest.php
+++ b/framework/Argv/test/Horde/Argv/ParseNumTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/ParserTest.php b/framework/Argv/test/Horde/Argv/ParserTest.php
index 11ca3b4..55f8d8d 100644 (file)
--- a/framework/Argv/test/Horde/Argv/ParserTest.php
+++ b/framework/Argv/test/Horde/Argv/ParserTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/ProgNameTest.php b/framework/Argv/test/Horde/Argv/ProgNameTest.php
index b6c36eb..92f5488 100644 (file)
--- a/framework/Argv/test/Horde/Argv/ProgNameTest.php
+++ b/framework/Argv/test/Horde/Argv/ProgNameTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/StandardTest.php b/framework/Argv/test/Horde/Argv/StandardTest.php
index 2db9154..37819cf 100644 (file)
--- a/framework/Argv/test/Horde/Argv/StandardTest.php
+++ b/framework/Argv/test/Horde/Argv/StandardTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/TypeAliasesTest.php b/framework/Argv/test/Horde/Argv/TypeAliasesTest.php
index 0d0cb54..c464214 100644 (file)
--- a/framework/Argv/test/Horde/Argv/TypeAliasesTest.php
+++ b/framework/Argv/test/Horde/Argv/TypeAliasesTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>

diff --git a/framework/Argv/test/Horde/Argv/VersionTest.php b/framework/Argv/test/Horde/Argv/VersionTest.php
index a390f35..bd479e9 100644 (file)
--- a/framework/Argv/test/Horde/Argv/VersionTest.php
+++ b/framework/Argv/test/Horde/Argv/VersionTest.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once dirname(__FILE__) . '/TestCase.php';
+
 /**
  * @author     Chuck Hagenbuch <chuck@horde.org>
  * @author     Mike Naberezny <mike@maintainable.com>