From: Anja Leichsenring <aleichsenring@ab-softlab.de>
Date: Wed, 20 Feb 2013 21:30:06 +0000 (+0100)
Subject: [BUGFIX] Fix tests throwing errors in MapperTest
X-Git-Tag: TYPO3_6-2-0alpha1~21^2~81
X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/88adb4e4186f23a577d3d47be84d8e89bfa3378f

[BUGFIX] Fix tests throwing errors in MapperTest

Due to incomplete mocking of dependencies the tests for class Mapper
throw Errors after merging #45622.

Fixes: #45682
Releases: 6.0, 6.1
Change-Id: Ibd285acda2c85fdc3e441866f6429ccb1e130809
Reviewed-on: https://review.typo3.org/18407
Reviewed-by: Daniel Hürtgen
Tested-by: Daniel Hürtgen
---

diff --git a/typo3/sysext/extbase/Tests/Unit/Property/MapperTest.php b/typo3/sysext/extbase/Tests/Unit/Property/MapperTest.php
index 18347ba3c31e..35dd8d112b39 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/MapperTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/MapperTest.php
@@ -44,22 +44,22 @@ class MapperTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	 */
 	public function setUp() {
 		/** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
-		$objectManager = new \TYPO3\CMS\Extbase\Object\ObjectManager();
+		$objectManager = $this->getMock('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');
 
 		/** @var \TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager $persistenceManager */
-		$persistenceManager = new \TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager();
+		$persistenceManager = $this->getMock('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\PersistenceManager');
 
 		/** @var \TYPO3\CMS\Extbase\Persistence\Generic\QueryFactory $queryFactory */
-		$queryFactory = new \TYPO3\CMS\Extbase\Persistence\Generic\QueryFactory();
+		$queryFactory = $this->getMock('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\QueryFactory');
 
 		/** @var \TYPO3\CMS\Extbase\Reflection\ReflectionService $reflectionService */
-		$reflectionService = new \TYPO3\CMS\Extbase\Reflection\ReflectionService();
+		$reflectionService = $this->getMock('TYPO3\\CMS\\Extbase\\Reflection\\ReflectionService');
 		$reflectionService->injectObjectManager($objectManager);
 
 		/** @var \TYPO3\CMS\Extbase\Validation\ValidatorResolver $validatorResolver */
-		$validatorResolver = new \TYPO3\CMS\Extbase\Validation\ValidatorResolver();
+		$validatorResolver = $this->getMock('TYPO3\\CMS\\Extbase\\Validation\\ValidatorResolver');
 
-		$this->fixture = new \TYPO3\CMS\Extbase\Property\Mapper();
+		$this->fixture = $this->getAccessibleMock('TYPO3\\CMS\\Extbase\\Property\\Mapper', array('dummy'));
 		$this->fixture->injectObjectManager($objectManager);
 		$this->fixture->injectPersistenceManager($persistenceManager);
 		$this->fixture->injectQueryFactory($queryFactory);
@@ -84,7 +84,7 @@ class MapperTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 		$expectedObject->setProperty1($source['property1']);
 		$expectedObject->setProperty2($source['property2']);
 
-		$this->assertEquals($expectedObject, $this->fixture->map(array('property1', 'property2'), $source, 'TYPO3\\CMS\\Extbase\\Tests\\Fixture\\ClassWithGettersAndSetters'));
+		$this->assertTrue($this->fixture->map(array('property1', 'property2'), $source, $expectedObject));
 	}
 
 	/**
@@ -100,7 +100,7 @@ class MapperTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 		$expectedObject->setProperty1($source['property1']);
 		$expectedObject->setProperty2($source['property2']);
 
-		$this->assertEquals($expectedObject, $this->fixture->map(array('property1', 'property2'), $source, 'Tx_Extbase_Tests_Fixture_TxClassWithGettersAndSetters'));
+		$this->assertTrue($this->fixture->map(array('property1', 'property2'), $source, $expectedObject));
 	}
 }