Fixes for Session tests

- Moved test autoload setup to tests/_autoload.php - Modified Session\ContainerTest and Session\SessionManagerTest to include _autoload.php if no autoloader is detected (happens when global state is destroyed).
bnkr · Aug 20, 2010 · ea69331 · ea69331
1 parent 458136a
commit ea69331
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 53 deletions.
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
@@ -49,59 +49,7 @@
 /**
  * Setup autoloading
  */
-function ZendTest_Autoloader($class) 
-{
-    $class = ltrim($class, '\\');
-
-    if (!preg_match('#^(Zend(Test)?|PHPUnit)(\\\\|_)#', $class)) {
-        return false;
-    }
-
-    // $segments = explode('\\', $class); // preg_split('#\\\\|_#', $class);//
-    $segments = preg_split('#[\\\\_]#', $class); // preg_split('#\\\\|_#', $class);//
-    $ns       = array_shift($segments);
-
-    switch ($ns) {
-        case 'Zend':
-            $file = dirname(__DIR__) . '/library/Zend/';
-            break;
-        case 'ZendTest':
-            // temporary fix for ZendTest namespace until we can migrate files 
-            // into ZendTest dir
-            $file = __DIR__ . '/Zend/';
-            break;
-        default:
-            $file = false;
-            break;
-    }
-
-    if ($file) {
-        $file .= implode('/', $segments) . '.php';
-        if (file_exists($file)) {
-            return include_once $file;
-        }
-    }
-
-    $segments = explode('_', $class);
-    $ns       = array_shift($segments);
-
-    switch ($ns) {
-        case 'PHPUnit':
-            return include_once str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
-        case 'Zend':
-            $file = dirname(__DIR__) . '/library/Zend/';
-            break;
-        default:
-            return false;
-    }
-    $file .= implode('/', $segments) . '.php';
-    if (file_exists($file)) {
-        return include_once $file;
-    }
-
-    return false;
-}
-spl_autoload_register('ZendTest_Autoloader', true, true);
+include __DIR__ . '/_autoload.php';
 
 /*
  * Load the user-defined test configuration file, if it exists; otherwise, load

diff --git a/tests/Zend/Session/ContainerTest.php b/tests/Zend/Session/ContainerTest.php
@@ -10,6 +10,7 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
+        $this->forceAutoloader();
         $_SESSION = array();
         Container::setDefaultManager(null);
         $this->manager = $manager = new TestAsset\TestManager(array(
@@ -25,6 +26,14 @@ public function tearDown()
         Container::setDefaultManager(null);
     }
 
+    protected function forceAutoloader()
+    {
+        $splAutoloadFunctions = spl_autoload_functions();
+        if (!$splAutoloadFunctions || !in_array('ZendTest_Autoloader', $splAutoloadFunctions)) {
+            include __DIR__ . '/../../_autoload.php';
+        }
+    }
+
     /**
      * Hack to allow running tests in separate processes
      *

diff --git a/tests/Zend/Session/SessionManagerTest.php b/tests/Zend/Session/SessionManagerTest.php
@@ -14,11 +14,20 @@ class SessionManagerTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
+        $this->forceAutoloader();
         $this->error   = false;
         $this->manager = new SessionManager();
         Registry::_unsetInstance();
     }
 
+    protected function forceAutoloader()
+    {
+        $splAutoloadFunctions = spl_autoload_functions();
+        if (!$splAutoloadFunctions || !in_array('ZendTest_Autoloader', $splAutoloadFunctions)) {
+            include __DIR__ . '/../../_autoload.php';
+        }
+    }
+
     /**
      * Hack to allow running tests in separate processes
      *

diff --git a/tests/_autoload.php b/tests/_autoload.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Setup autoloading
+ */
+function ZendTest_Autoloader($class) 
+{
+    $class = ltrim($class, '\\');
+
+    if (!preg_match('#^(Zend(Test)?|PHPUnit)(\\\\|_)#', $class)) {
+        return false;
+    }
+
+    // $segments = explode('\\', $class); // preg_split('#\\\\|_#', $class);//
+    $segments = preg_split('#[\\\\_]#', $class); // preg_split('#\\\\|_#', $class);//
+    $ns       = array_shift($segments);
+
+    switch ($ns) {
+        case 'Zend':
+            $file = dirname(__DIR__) . '/library/Zend/';
+            break;
+        case 'ZendTest':
+            // temporary fix for ZendTest namespace until we can migrate files 
+            // into ZendTest dir
+            $file = __DIR__ . '/Zend/';
+            break;
+        default:
+            $file = false;
+            break;
+    }
+
+    if ($file) {
+        $file .= implode('/', $segments) . '.php';
+        if (file_exists($file)) {
+            return include_once $file;
+        }
+    }
+
+    $segments = explode('_', $class);
+    $ns       = array_shift($segments);
+
+    switch ($ns) {
+        case 'PHPUnit':
+            return include_once str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+        case 'Zend':
+            $file = dirname(__DIR__) . '/library/Zend/';
+            break;
+        default:
+            return false;
+    }
+    $file .= implode('/', $segments) . '.php';
+    if (file_exists($file)) {
+        return include_once $file;
+    }
+
+    return false;
+}
+spl_autoload_register('ZendTest_Autoloader', true, true);
+