From ccc3e1fba54bbf2227b48a4cabafb14443bff74c Mon Sep 17 00:00:00 2001
From: Markus Klein <klein.t3@mfc-linz.at>
Date: Thu, 19 Jun 2014 20:10:15 +0200
Subject: [PATCH] [BUGFIX] Get unit tests working again
Changed serialize behaviour in PHP triggers funny phpunit issues in
some tests. Switching to phpunit master for now and skipping some
tests makes travis-ci green again and gives us time for detail fixes.
Change-Id: I1c694c0c5dba98b31b9ef7c826fa6614ffa512df
Resolves: #59685
Releases: 6.3, 6.2
Reviewed-on: https://review.typo3.org/30889
Reviewed-by: Christian Mueller
Reviewed-by: Oliver Klee
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
---
composer.json | 3 ++-
.../Tests/Unit/Mvc/Controller/AbstractControllerTest.php | 1 +
.../Tests/Unit/Mvc/Controller/ActionControllerTest.php | 4 ++++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index 4e07cb4c8816..e2426a7567f2 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,8 @@
},
"require-dev": {
"mikey179/vfsStream": "1.3.*@dev",
- "phpunit/phpunit": "4.1.*"
+ "phpunit/phpunit": "4.*@dev",
+ "phpunit/phpunit-mock-objects": "2.*@dev"
},
"suggest": {
"ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images",
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php
index c5c5fd33a66d..345ab1e29679 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php
@@ -111,6 +111,7 @@ class AbstractControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
* @dataProvider addFlashMessageDataProvider
*/
public function addFlashMessageAddsFlashMessageObjectToFlashMessageQueue($expectedMessage, $messageBody, $messageTitle = '', $severity = \TYPO3\CMS\Core\Messaging\FlashMessage::OK, $storeInSession = TRUE) {
+ $this->markTestSkipped('Triggers "UnexpectedValueException: Serialized string cannot be empty", with phpunit since PHP in 5.4.29 and 5.5.13, needs investigation, see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/178');
$flashMessageQueue = $this->getMock(
'TYPO3\\CMS\\Core\\Messaging\\FlashMessageQueue',
array('enqueue'),
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
index f55d9be15428..8c054ec15243 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
@@ -320,6 +320,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
* @author Robert Lemke <robert@typo3.org>
*/
public function initializeActionMethodArgumentsRegistersArgumentsFoundInTheSignatureOfTheCurrentActionMethod() {
+ $this->markTestSkipped('Triggers "UnexpectedValueException: Serialized string cannot be empty", with phpunit since PHP in 5.4.29 and 5.5.13, needs investigation, see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/178');
$mockRequest = $this->getMock('TYPO3\\CMS\\Extbase\\Mvc\\Request', array(), array(), '', FALSE);
$mockArguments = $this->getMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\Arguments', array('addNewArgument', 'removeAll'), array(), '', FALSE);
$mockArguments->expects($this->at(0))->method('addNewArgument')->with('stringArgument', 'string', TRUE);
@@ -440,6 +441,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
* @author Sebastian Kurfürst <sbastian@typo3.org>
*/
public function initializeActionMethodValidatorsCorrectlyRegistersValidatorsBasedOnDataType() {
+ $this->markTestSkipped('Triggers "UnexpectedValueException: Serialized string cannot be empty", with phpunit since PHP in 5.4.29 and 5.5.13, needs investigation, see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/178');
$mockController = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ActionController', array('fooAction'), array(), '', FALSE);
$this->enableDeprecatedPropertyMapperInController($mockController);
$argument = $this->getMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\Argument', array('getName'), array(), '', FALSE);
@@ -466,6 +468,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
* @author Sebastian Kurfürst <sbastian@typo3.org>
*/
public function initializeActionMethodValidatorsRegistersModelBasedValidators() {
+ $this->markTestSkipped('Triggers "UnexpectedValueException: Serialized string cannot be empty", with phpunit since PHP in 5.4.29 and 5.5.13, needs investigation, see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/178');
$mockController = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ActionController', array('fooAction'), array(), '', FALSE);
$this->enableDeprecatedPropertyMapperInController($mockController);
$argument = $this->getMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\Argument', array('getName', 'getDataType'), array(), '', FALSE);
@@ -496,6 +499,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
* @author Sebastian Kurfürst <sbastian@typo3.org>
*/
public function initializeActionMethodValidatorsDoesNotRegisterModelBasedValidatorsIfDontValidateAnnotationIsSet() {
+ $this->markTestSkipped('Triggers "UnexpectedValueException: Serialized string cannot be empty", with phpunit since PHP in 5.4.29 and 5.5.13, needs investigation, see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/178');
$mockController = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\ActionController', array('fooAction'), array(), '', FALSE);
$this->enableDeprecatedPropertyMapperInController($mockController);
$argument = $this->getMock('TYPO3\\CMS\\Extbase\\Mvc\\Controller\\Argument', array('getName', 'getDataType'), array(), '', FALSE);
--
GitLab