[~TASK] Extbase (Tests): fixed configuration manager tests that were broken in r1269
authorBastian Waidelich <bastian@typo3.org>
Wed, 16 Sep 2009 11:23:51 +0000 (11:23 +0000)
committerBastian Waidelich <bastian@typo3.org>
Wed, 16 Sep 2009 11:23:51 +0000 (11:23 +0000)
typo3/sysext/extbase/Tests/Configuration/AbstractConfigurationManager_testcase.php

index fdc9a60..3561d73 100644 (file)
@@ -76,8 +76,9 @@ class Tx_Extbase_Configuration_AbstractConfigurationManager_testcase extends Tx_
                );
                $pluginConfiguration = array();
 
-               $configurationManager = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Configuration_AbstractConfigurationManager'), array('loadTypoScriptSetup'), array(), '', FALSE);
+               $configurationManager = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Configuration_AbstractConfigurationManager'), array('loadTypoScriptSetup', 'getContextSpecificFrameworkConfiguration'), array(), '', FALSE);
                $configurationManager->expects($this->any())->method('loadTypoScriptSetup')->will($this->returnValue($typoScriptSetup));
+               $configurationManager->expects($this->any())->method('getContextSpecificFrameworkConfiguration')->will($this->returnValue(array()));
                $expectedResult = array(
                        'persistence' => array(
                                'storagePid' => 'newStoragePid',
@@ -114,9 +115,10 @@ class Tx_Extbase_Configuration_AbstractConfigurationManager_testcase extends Tx_
                $mockTypoScriptParser->expects($this->at(1))->method('getVal')->with('persistenceReference', $typoScriptSetup)->will($this->returnValue(array('', array('storagePid' => 'overwritten'))));
                $mockTypoScriptParser->expects($this->at(2))->method('getVal')->with('viewReference', $typoScriptSetup)->will($this->returnValue(array('', array('resolved' => 'viewReference'))));
 
-               $configurationManager = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Configuration_AbstractConfigurationManager'), array('loadTypoScriptSetup'), array(), '', FALSE);
+               $configurationManager = $this->getMock($this->buildAccessibleProxy('Tx_Extbase_Configuration_AbstractConfigurationManager'), array('loadTypoScriptSetup', 'getContextSpecificFrameworkConfiguration'), array(), '', FALSE);
                $configurationManager->_set('typoScriptParser', $mockTypoScriptParser);
                $configurationManager->expects($this->any())->method('loadTypoScriptSetup')->will($this->returnValue($typoScriptSetup));
+               $configurationManager->expects($this->any())->method('getContextSpecificFrameworkConfiguration')->will($this->returnValue(array()));
 
                $expectedResult = array(
                        'persistence' => array(