Upgrade PHPUnit require statements (for PEAR QA Team).

git-svn-id: http://svn.php.net/repository/pear/packages/Crypt_DiffieHellman/trunk@321595 c90b9560-bf6c-de11-be94-00142212c4b1
pear · Dec 31, 2011 · 6b68424 · 6b68424
1 parent a73d5a1
commit 6b68424
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/tests/AllTests.php b/tests/AllTests.php
@@ -4,10 +4,17 @@
     define('PHPUnit_MAIN_METHOD', 'Crypt_DiffieHellman_AllTests::main');
 }
 
-require_once 'PHPUnit/TextUI/TestRunner.php';
+if ($fp = @fopen('PHPUnit/Autoload.php', 'r', true)) {
+    require_once 'PHPUnit/Autoload.php';
+} elseif ($fp = @fopen('PHPUnit/Framework.php', 'r', true)) {
+    require_once 'PHPUnit/Framework.php';
+    require_once 'PHPUnit/TextUI/TestRunner.php';
+} else {
+    die('skip could not find PHPUnit');
+}
+fclose($fp);
 
-require_once 'TestHelper.php';
-require_once 'DiffieHellmanTest.php';
+require_once dirname(__FILE__) . '/DiffieHellmanTest.php';
 
 class Crypt_DiffieHellman_AllTests
 {

diff --git a/tests/DiffieHellmanTest.php b/tests/DiffieHellmanTest.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once dirname(__FILE__) . '/TestHelper.php';
 require_once 'Crypt/DiffieHellman.php';
 require_once 'PHPUnit/Framework/TestCase.php';
 
@@ -69,4 +70,4 @@ public function testDiffieWithBinaryFormsAndLargeIntegers()
         $this->assertEquals($expectedSharedSecret, $bobSecretKey);
     }
 
-}
+}