From b83d191ef98db3510047698471c8136b5d1d13d5 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@afi-sa.fr>
Date: Sat, 31 May 2014 17:16:11 +0200
Subject: [PATCH] dev #13060 refactoring done while searching for failing tests
---
.../modules/AbstractControllerTestCase.php | 12 ++----------
.../controllers/AccueilControllerFormationsTest.php | 2 +-
tests/library/Class/MatiereTest.php | 11 +----------
.../ZendAfi/View/Helper/ViewHelperTestCase.php | 2 ++
4 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/tests/application/modules/AbstractControllerTestCase.php b/tests/application/modules/AbstractControllerTestCase.php
index 6be8dc4647f..85e0506479d 100644
--- a/tests/application/modules/AbstractControllerTestCase.php
+++ b/tests/application/modules/AbstractControllerTestCase.php
@@ -95,6 +95,8 @@ abstract class AbstractControllerTestCase extends Zend_Test_PHPUnit_ControllerTe
public function setUp() {
Storm_Model_Abstract::unsetLoaders();
$this->_registry_sql = Zend_Registry::get('sql');
+ if (!is_object($this->_registry_sql))
+ $this->fail('SQL in registry should be an object');
Class_ScriptLoader::resetInstance();
$this->_initMockProfil();
@@ -156,16 +158,6 @@ abstract class AbstractControllerTestCase extends Zend_Test_PHPUnit_ControllerTe
}
- public function getSqlMock() {
- $mock_sql = $this->getMockBuilder('Class_Systeme_Sql')
- ->disableOriginalConstructor()
- ->getMock();
-
- Zend_Registry::set('sql', $mock_sql);
- return $mock_sql;
- }
-
-
public function postDispatch($url, $data) {
$this->getRequest()
->setMethod('POST')
diff --git a/tests/application/modules/admin/controllers/AccueilControllerFormationsTest.php b/tests/application/modules/admin/controllers/AccueilControllerFormationsTest.php
index 730133446f8..0f0273eb690 100644
--- a/tests/application/modules/admin/controllers/AccueilControllerFormationsTest.php
+++ b/tests/application/modules/admin/controllers/AccueilControllerFormationsTest.php
@@ -31,7 +31,7 @@ class Admin_AccueilControllerFormationsTestWithDefaultSettings extends Admin_Abs
->updateModuleConfigAccueil(1, ['type_module' => 'FORMATIONS_WIDGET',
'division' => 1,
'id_module' => 1,
- 'selected_formations' => ''])
+ 'preferences' => ['selected_formations' => '']])
->beCurrentProfil();
$this->dispatch('admin/accueil/formations-widget?config=accueil&id_profil=1&id_module=1&type_module=FORMATIONS_WIDGET', true);
diff --git a/tests/library/Class/MatiereTest.php b/tests/library/Class/MatiereTest.php
index b8d160efc14..c5d44a29d73 100644
--- a/tests/library/Class/MatiereTest.php
+++ b/tests/library/Class/MatiereTest.php
@@ -19,16 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-class MatiereTest extends PHPUnit_Framework_TestCase {
- public function setUp() {
- $this->mock_sql = $this
- ->getMockBuilder('Class_Systeme_Sql')
- ->disableOriginalConstructor()
- ->getMock();
- Zend_Registry::set('sql', $this->mock_sql);
- }
-
-
+class MatiereTest extends Storm_Test_ModelTestCase {
/** @test */
function sqlQueriesShouldBeEscaped() {
Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Matiere')
diff --git a/tests/library/ZendAfi/View/Helper/ViewHelperTestCase.php b/tests/library/ZendAfi/View/Helper/ViewHelperTestCase.php
index e2a9e42243f..6a4436c04c7 100644
--- a/tests/library/ZendAfi/View/Helper/ViewHelperTestCase.php
+++ b/tests/library/ZendAfi/View/Helper/ViewHelperTestCase.php
@@ -118,6 +118,8 @@ abstract class ViewHelperTestCase extends PHPUnit_Framework_TestCase {
->setValeur(null);
Storm_Cache::setDefaultZendCache(null);
+
+ Zend_Registry::get('translate')->setLocale('fr');
}
--
GitLab