Просмотр исходного кода

Backport r24340 to trunk

Fix failing Navigation resource test

- Moved restting of default page type prior to resetting of autoloaders
  to ensure class can be found.

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24341 44c647ce-9c0f-0410-b52a-842ac1e357ba
matthew 14 лет назад
Родитель
Сommit
be19ff8d81
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      tests/Zend/Application/Resource/NavigationTest.php

+ 2 - 2
tests/Zend/Application/Resource/NavigationTest.php

@@ -67,6 +67,8 @@ class Zend_Application_Resource_NavigationTest extends PHPUnit_Framework_TestCas
 
     public function tearDown()
     {
+        Zend_Navigation_Page::setDefaultPageType();
+
         // Restore original autoloaders
         $loaders = spl_autoload_functions();
         foreach ($loaders as $loader) {
@@ -79,8 +81,6 @@ class Zend_Application_Resource_NavigationTest extends PHPUnit_Framework_TestCas
 
         // Reset autoloader instance so it doesn't affect other tests
         Zend_Loader_Autoloader::resetInstance();
-
-        Zend_Navigation_Page::setDefaultPageType();
     }
 
     public function testInitializationInitializesNavigationObject()