[TASK] Change $fixture to $subject in unit-tests 15/36615/4
authorWouter Wolters <typo3@wouterwolters.nl>
Mon, 2 Feb 2015 20:56:46 +0000 (21:56 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Mon, 2 Feb 2015 21:41:35 +0000 (22:41 +0100)
Subject is the "system under test, the
subject you're operating on"

Resolves: #64771
Releases: master
Change-Id: I7a70d5f44e721b958d86aea741534ace2f53b2a8
Reviewed-on: http://review.typo3.org/36615
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
52 files changed:
typo3/sysext/backend/Tests/Unit/Form/ElementConditionMatcherTest.php
typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php
typo3/sysext/beuser/Tests/Unit/Domain/Model/BackendUserTest.php
typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php
typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
typo3/sysext/core/Tests/Unit/Charset/CharsetConverterTest.php
typo3/sysext/core/Tests/Unit/Collection/RecordCollectionRepositoryTest.php
typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php
typo3/sysext/core/Tests/Unit/Database/SqlParserTest.php
typo3/sysext/core/Tests/Unit/Encoder/JavaScriptEncoderTest.php
typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php
typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php
typo3/sysext/core/Tests/Unit/FormProtection/InstallToolFormProtectionTest.php
typo3/sysext/core/Tests/Unit/Html/HtmlParserTest.php
typo3/sysext/core/Tests/Unit/Html/RteHtmlParserTest.php
typo3/sysext/core/Tests/Unit/Imaging/GraphicalFunctionsTest.php
typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegistryTest.php
typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/TreeDataProviderFactoryTest.php
typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentFormatTest.php
typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentTest.php
typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentTranslationTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserGroupTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/FileMountTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserGroupTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserTest.php
typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
typo3/sysext/form/Tests/Unit/Filter/AlphabeticFilterTest.php
typo3/sysext/form/Tests/Unit/Filter/AlphanumericFilterTest.php
typo3/sysext/form/Tests/Unit/Filter/CurrencyFilterTest.php
typo3/sysext/form/Tests/Unit/Filter/DigitFilterTest.php
typo3/sysext/form/Tests/Unit/Filter/IntegerFilterTest.php
typo3/sysext/form/Tests/Unit/Filter/LowerCaseFilterTest.php
typo3/sysext/form/Tests/Unit/Filter/RegExpFilterTest.php
typo3/sysext/form/Tests/Unit/Filter/RemoveXssFilterTest.php
typo3/sysext/form/Tests/Unit/Filter/StripNewLinesFilterTest.php
typo3/sysext/form/Tests/Unit/Filter/TitleCaseFilterTest.php
typo3/sysext/form/Tests/Unit/Filter/TrimFilterTest.php
typo3/sysext/form/Tests/Unit/Filter/UpperCaseFilterTest.php
typo3/sysext/form/Tests/Unit/PostProcess/PostProcessorTest.php
typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
typo3/sysext/frontend/Tests/Unit/MediaWizard/MediaWizardProviderTest.php
typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
typo3/sysext/lang/Tests/Unit/Domain/Model/ExtensionTest.php
typo3/sysext/lang/Tests/Unit/Domain/Model/LanguageTest.php
typo3/sysext/lowlevel/Tests/Unit/Utility/ArrayBrowserTest.php

index b669514..4f5f676 100644 (file)
@@ -22,13 +22,13 @@ class ElementConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Backend\Form\ElementConditionMatcher
         */
-       protected $fixture;
+       protected $subject;
 
        /**
         * Sets up this test case.
         */
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Backend\Form\ElementConditionMatcher();
+               $this->subject = new \TYPO3\CMS\Backend\Form\ElementConditionMatcher();
        }
 
        /**
@@ -331,7 +331,7 @@ class ElementConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function matchConditionStrings($condition, array $record, $flexformValueKey, $expectedResult) {
-               $this->assertEquals($expectedResult, $this->fixture->match($condition, $record, $flexformValueKey));
+               $this->assertEquals($expectedResult, $this->subject->match($condition, $record, $flexformValueKey));
        }
 
        /**
@@ -345,7 +345,7 @@ class ElementConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        ->method('isAdmin')
                        ->will($this->returnValue(TRUE));
                $GLOBALS['BE_USER'] = $backendUserMock;
-               $this->assertTrue($this->fixture->match('HIDE_FOR_NON_ADMINS'));
+               $this->assertTrue($this->subject->match('HIDE_FOR_NON_ADMINS'));
        }
 
        /**
@@ -359,7 +359,7 @@ class ElementConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        ->method('isAdmin')
                        ->will($this->returnValue(FALSE));
                $GLOBALS['BE_USER'] = $backendUserMock;
-               $this->assertFalse($this->fixture->match('HIDE_FOR_NON_ADMINS'));
+               $this->assertFalse($this->subject->match('HIDE_FOR_NON_ADMINS'));
        }
 
        /**
@@ -373,7 +373,7 @@ class ElementConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        ->method('isAdmin')
                        ->will($this->returnValue(TRUE));
                $GLOBALS['BE_USER'] = $backendUserMock;
-               $this->assertTrue($this->fixture->match('HIDE_L10N_SIBLINGS:except_admin'), array(), 'vEN');
+               $this->assertTrue($this->subject->match('HIDE_L10N_SIBLINGS:except_admin'), array(), 'vEN');
        }
 
        /**
@@ -387,7 +387,7 @@ class ElementConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        ->method('isAdmin')
                        ->will($this->returnValue(FALSE));
                $GLOBALS['BE_USER'] = $backendUserMock;
-               $this->assertFalse($this->fixture->match('HIDE_L10N_SIBLINGS:except_admin'), array(), 'vEN');
+               $this->assertFalse($this->subject->match('HIDE_L10N_SIBLINGS:except_admin'), array(), 'vEN');
        }
 
 }
index e68e25d..108548a 100644 (file)
@@ -23,33 +23,33 @@ class LogEntryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Belog\Domain\Model\LogEntry
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Belog\Domain\Model\LogEntry();
+               $this->subject = new \TYPO3\CMS\Belog\Domain\Model\LogEntry();
        }
 
        /**
         * @test
         */
        public function getLogDataInitiallyReturnsEmptyArray() {
-               $this->assertSame(array(), $this->fixture->getLogData());
+               $this->assertSame(array(), $this->subject->getLogData());
        }
 
        /**
         * @test
         */
        public function getLogDataForEmptyStringLogDataReturnsEmptyArray() {
-               $this->fixture->setLogData('');
-               $this->assertSame(array(), $this->fixture->getLogData());
+               $this->subject->setLogData('');
+               $this->assertSame(array(), $this->subject->getLogData());
        }
 
        /**
         * @test
         */
        public function getLogDataForGarbageStringLogDataReturnsEmptyArray() {
-               $this->fixture->setLogData('foo bar');
-               $this->assertSame(array(), $this->fixture->getLogData());
+               $this->subject->setLogData('foo bar');
+               $this->assertSame(array(), $this->subject->getLogData());
        }
 
        /**
@@ -57,16 +57,16 @@ class LogEntryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getLogDataForSerializedArrayReturnsThatArray() {
                $logData = array('foo', 'bar');
-               $this->fixture->setLogData(serialize($logData));
-               $this->assertSame($logData, $this->fixture->getLogData());
+               $this->subject->setLogData(serialize($logData));
+               $this->assertSame($logData, $this->subject->getLogData());
        }
 
        /**
         * @test
         */
        public function getLogDataForSerializedObjectReturnsEmptyArray() {
-               $this->fixture->setLogData(new \stdClass());
-               $this->assertSame(array(), $this->fixture->getLogData());
+               $this->subject->setLogData(new \stdClass());
+               $this->assertSame(array(), $this->subject->getLogData());
        }
 
 }
index d9ecb40..429b040 100644 (file)
@@ -22,24 +22,24 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Beuser\Domain\Model\BackendUser
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Beuser\Domain\Model\BackendUser();
+               $this->subject = new \TYPO3\CMS\Beuser\Domain\Model\BackendUser();
        }
 
        /**
         * @test
         */
        public function getUidReturnsInitialValueForInt() {
-               $this->assertTrue($this->fixture->getUid() === NULL, 'Not uid set after initialization.');
+               $this->assertTrue($this->subject->getUid() === NULL, 'Not uid set after initialization.');
        }
 
        /**
         * @test
         */
        public function getUserNameReturnsInitialValueForString() {
-               $this->assertTrue($this->fixture->getUserName() === '', 'Username not empty');
+               $this->assertTrue($this->subject->getUserName() === '', 'Username not empty');
        }
 
        /**
@@ -47,15 +47,15 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setUserNameForStringSetsUserName() {
                $newUserName = 'DonJuan';
-               $this->fixture->setUserName($newUserName);
-               $this->assertSame($this->fixture->getUserName(), $newUserName);
+               $this->subject->setUserName($newUserName);
+               $this->assertSame($this->subject->getUserName(), $newUserName);
        }
 
        /**
         * @test
         */
        public function getRealNameReturnInitialValueForString() {
-               $this->assertTrue($this->fixture->getRealName() === '', 'Real name not empty');
+               $this->assertTrue($this->subject->getRealName() === '', 'Real name not empty');
        }
 
        /**
@@ -63,31 +63,31 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setRealNameForStringSetsName() {
                $realName = 'Conceived at T3CON2018';
-               $this->fixture->setRealName($realName);
-               $this->assertSame($this->fixture->getRealName(), $realName);
+               $this->subject->setRealName($realName);
+               $this->assertSame($this->subject->getRealName(), $realName);
        }
 
        /**
         * @test
         */
        public function getAdminReturnInitialValueForBoolean() {
-               $this->assertTrue($this->fixture->getIsAdministrator() === FALSE, 'Admin status is correct.');
+               $this->assertTrue($this->subject->getIsAdministrator() === FALSE, 'Admin status is correct.');
        }
 
        /**
         * @test
         */
        public function setAdminToTrueSetsAdmin() {
-               $this->fixture->setIsAdministrator(TRUE);
-               $this->assertTrue($this->fixture->getIsAdministrator(), 'Admin status is not true, after setting to true.');
+               $this->subject->setIsAdministrator(TRUE);
+               $this->assertTrue($this->subject->getIsAdministrator(), 'Admin status is not true, after setting to true.');
        }
 
        /**
         * @test
         */
        public function setAdminToFalseSetsAdmin() {
-               $this->fixture->setIsAdministrator(FALSE);
-               $this->assertFalse($this->fixture->getIsAdministrator(), 'Admin status is not false, after setting to false.');
+               $this->subject->setIsAdministrator(FALSE);
+               $this->assertFalse($this->subject->getIsAdministrator(), 'Admin status is not false, after setting to false.');
        }
 
 }
index 3c4c9e6..f92fd8d 100644 (file)
@@ -22,10 +22,10 @@ class DemandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Beuser\Domain\Model\Demand
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Beuser\Domain\Model\Demand();
+               $this->subject = new \TYPO3\CMS\Beuser\Domain\Model\Demand();
        }
 
        /**
@@ -33,8 +33,8 @@ class DemandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setUserTypeAllExpectedValueForInt() {
                $userType = \TYPO3\CMS\Beuser\Domain\Model\Demand::ALL;
-               $this->fixture->setUserType($userType);
-               $this->assertSame($this->fixture->getUserType(), $userType);
+               $this->subject->setUserType($userType);
+               $this->assertSame($this->subject->getUserType(), $userType);
        }
 
        /**
@@ -42,8 +42,8 @@ class DemandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setUserTypeAdminOnlyExpectedValueForInt() {
                $userType = \TYPO3\CMS\Beuser\Domain\Model\Demand::USERTYPE_ADMINONLY;
-               $this->fixture->setUserType($userType);
-               $this->assertSame($this->fixture->getUserType(), $userType);
+               $this->subject->setUserType($userType);
+               $this->assertSame($this->subject->getUserType(), $userType);
        }
 
        /**
@@ -51,8 +51,8 @@ class DemandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setUserTypeUserOnlyExpectedValueForInt() {
                $userType = \TYPO3\CMS\Beuser\Domain\Model\Demand::USERTYPE_USERONLY;
-               $this->fixture->setUserType($userType);
-               $this->assertSame($this->fixture->getUserType(), $userType);
+               $this->subject->setUserType($userType);
+               $this->assertSame($this->subject->getUserType(), $userType);
        }
 
        /**
@@ -60,8 +60,8 @@ class DemandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setStatusAllExpectedValueForInt() {
                $status = \TYPO3\CMS\Beuser\Domain\Model\Demand::ALL;
-               $this->fixture->setStatus($status);
-               $this->assertSame($this->fixture->getStatus(), $status);
+               $this->subject->setStatus($status);
+               $this->assertSame($this->subject->getStatus(), $status);
        }
 
        /**
@@ -69,8 +69,8 @@ class DemandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setStatusActiveExpectedValueForInt() {
                $status = \TYPO3\CMS\Beuser\Domain\Model\Demand::STATUS_ACTIVE;
-               $this->fixture->setStatus($status);
-               $this->assertSame($this->fixture->getStatus(), $status);
+               $this->subject->setStatus($status);
+               $this->assertSame($this->subject->getStatus(), $status);
        }
 
        /**
@@ -78,8 +78,8 @@ class DemandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setStatusInactiveExpectedValueForInt() {
                $status = \TYPO3\CMS\Beuser\Domain\Model\Demand::STATUS_INACTIVE;
-               $this->fixture->setStatus($status);
-               $this->assertSame($this->fixture->getStatus(), $status);
+               $this->subject->setStatus($status);
+               $this->assertSame($this->subject->getStatus(), $status);
        }
 
        /**
@@ -87,8 +87,8 @@ class DemandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setLoginAllExpectedValueForInt() {
                $login = \TYPO3\CMS\Beuser\Domain\Model\Demand::ALL;
-               $this->fixture->setLogins($login);
-               $this->assertSame($this->fixture->getLogins(), $login);
+               $this->subject->setLogins($login);
+               $this->assertSame($this->subject->getLogins(), $login);
        }
 
        /**
@@ -96,8 +96,8 @@ class DemandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setLoginNoneExpectedValueForInt() {
                $login = \TYPO3\CMS\Beuser\Domain\Model\Demand::LOGIN_NONE;
-               $this->fixture->setLogins($login);
-               $this->assertSame($this->fixture->getLogins(), $login);
+               $this->subject->setLogins($login);
+               $this->assertSame($this->subject->getLogins(), $login);
        }
 
        /**
@@ -105,15 +105,15 @@ class DemandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setLoginxSameExpectedValueForInt() {
                $login = \TYPO3\CMS\Beuser\Domain\Model\Demand::LOGIN_SOME;
-               $this->fixture->setLogins($login);
-               $this->assertSame($this->fixture->getLogins(), $login);
+               $this->subject->setLogins($login);
+               $this->assertSame($this->subject->getLogins(), $login);
        }
 
        /**
         * @test
         */
        public function getUserNameInitialValueForString() {
-               $this->assertSame($this->fixture->getUserName(), '', 'UserName must be empty string.');
+               $this->assertSame($this->subject->getUserName(), '', 'UserName must be empty string.');
        }
 
        /**
@@ -121,8 +121,8 @@ class DemandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setUserNameReturnExpectedValueForString() {
                $newUserName = 'User#ää*%^name';
-               $this->fixture->setUserName($newUserName);
-               $this->assertSame($this->fixture->getUserName(), $newUserName, 'UserName is not as set before.');
+               $this->subject->setUserName($newUserName);
+               $this->assertSame($this->subject->getUserName(), $newUserName, 'UserName is not as set before.');
        }
 
 }
index efa5959..115d94a 100644 (file)
@@ -26,7 +26,7 @@ class CategoryCollectionTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
        /**
         * @var \TYPO3\CMS\Core\Category\Collection\CategoryCollection
         */
-       private $fixture;
+       private $subject;
 
        /**
         * @var string
@@ -66,7 +66,7 @@ class CategoryCollectionTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
        protected function setUp() {
                parent::setUp();
                $this->database = $this->getDatabaseConnection();
-               $this->fixture = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Category\Collection\CategoryCollection::class, $this->tableName);
+               $this->subject = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Category\Collection\CategoryCollection::class, $this->tableName);
                $this->collectionRecord = array(
                        'uid' => 0,
                        'title' => $this->getUniqueId('title'),
@@ -87,12 +87,12 @@ class CategoryCollectionTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
         * @return void
         */
        public function checkIfFromArrayMethodSetCorrectProperties() {
-               $this->fixture->fromArray($this->collectionRecord);
-               $this->assertEquals($this->collectionRecord['uid'], $this->fixture->getIdentifier());
-               $this->assertEquals($this->collectionRecord['uid'], $this->fixture->getUid());
-               $this->assertEquals($this->collectionRecord['title'], $this->fixture->getTitle());
-               $this->assertEquals($this->collectionRecord['description'], $this->fixture->getDescription());
-               $this->assertEquals($this->collectionRecord['table_name'], $this->fixture->getItemTableName());
+               $this->subject->fromArray($this->collectionRecord);
+               $this->assertEquals($this->collectionRecord['uid'], $this->subject->getIdentifier());
+               $this->assertEquals($this->collectionRecord['uid'], $this->subject->getUid());
+               $this->assertEquals($this->collectionRecord['title'], $this->subject->getTitle());
+               $this->assertEquals($this->collectionRecord['description'], $this->subject->getDescription());
+               $this->assertEquals($this->collectionRecord['table_name'], $this->subject->getItemTableName());
        }
 
        /**
@@ -123,7 +123,7 @@ class CategoryCollectionTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
        public function getCollectedRecordsReturnsEmptyRecordSet() {
                $method = new \ReflectionMethod(\TYPO3\CMS\Core\Category\Collection\CategoryCollection::class, 'getCollectedRecords');
                $method->setAccessible(TRUE);
-               $records = $method->invoke($this->fixture);
+               $records = $method->invoke($this->subject);
                $this->assertInternalType('array', $records);
                $this->assertEmpty($records);
        }
index 97d5189..4ff38aa 100644 (file)
@@ -24,10 +24,10 @@ class CharsetConverterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Core\Charset\CharsetConverter
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Core\Charset\CharsetConverter();
+               $this->subject = new \TYPO3\CMS\Core\Charset\CharsetConverter();
        }
 
        ////////////////////////////
@@ -38,7 +38,7 @@ class CharsetConverterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @see http://forge.typo3.org/issues/22334
         */
        public function substrForEmptyStringAndNonZeroLengthReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->substr('utf-8', '', 0, 42));
+               $this->assertSame('', $this->subject->substr('utf-8', '', 0, 42));
        }
 
        /////////////////////////////////
@@ -48,7 +48,7 @@ class CharsetConverterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function utf8_strlenForNonEmptyAsciiOnlyStringReturnsNumberOfCharacters() {
-               $this->assertEquals(10, $this->fixture->utf8_strlen('good omens'));
+               $this->assertEquals(10, $this->subject->utf8_strlen('good omens'));
        }
 
 }
index 917cba1..a0fbbcd 100644 (file)
@@ -24,7 +24,7 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
        /**
         * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Collection\RecordCollectionRepository
         */
-       protected $fixture;
+       protected $subject;
 
        /**
         * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Database\DatabaseConnection
@@ -54,8 +54,8 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                        \TYPO3\CMS\Core\Database\DatabaseConnection::class,
                        array('exec_UPDATEquery', 'exec_SELECTgetSingleRow', 'exec_SELECTgetRows', 'fullQuoteStr')
                );
-               $this->fixture = $this->getMock(\TYPO3\CMS\Core\Collection\RecordCollectionRepository::class, array('getDatabaseConnection'));
-               $this->fixture->expects($this->any())->method('getDatabaseConnection')->will($this->returnValue($this->databaseMock));
+               $this->subject = $this->getMock(\TYPO3\CMS\Core\Collection\RecordCollectionRepository::class, array('getDatabaseConnection'));
+               $this->subject->expects($this->any())->method('getDatabaseConnection')->will($this->returnValue($this->databaseMock));
                $this->testTableName = $this->getUniqueId('tx_testtable');
        }
 
@@ -66,7 +66,7 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                $testUid = rand(1, 1000);
                $this->databaseMock->expects($this->once())->method('exec_SELECTgetSingleRow')->will($this->returnCallback(array($this, 'getSingleRowCallback')));
                $this->getSingleRowCallbackReturnValue = NULL;
-               $object = $this->fixture->findByUid($testUid);
+               $object = $this->subject->findByUid($testUid);
                $this->assertNull($object);
        }
 
@@ -81,7 +81,7 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                        'type' => \TYPO3\CMS\Core\Collection\RecordCollectionRepository::TYPE_Static,
                        'table_name' => $this->testTableName
                );
-               $object = $this->fixture->findByUid($testUid);
+               $object = $this->subject->findByUid($testUid);
                $this->assertInstanceOf(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class, $object);
        }
 
@@ -96,7 +96,7 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                        'uid' => $testUid,
                        'type' => $this->getUniqueId('unknown')
                );
-               $object = $this->fixture->findByUid($testUid);
+               $object = $this->subject->findByUid($testUid);
        }
 
        /**
@@ -106,7 +106,7 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                $type = \TYPO3\CMS\Core\Collection\RecordCollectionRepository::TYPE_Static;
                $this->databaseMock->expects($this->once())->method('exec_SELECTgetRows')->will($this->returnCallback(array($this, 'getRowsCallback')));
                $this->getRowsCallbackReturnValue = NULL;
-               $objects = $this->fixture->findByType($type);
+               $objects = $this->subject->findByType($type);
                $this->assertNull($objects);
        }
 
@@ -121,7 +121,7 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                        array('uid' => $testUid, 'type' => $type, 'table_name' => $this->testTableName),
                        array('uid' => $testUid, 'type' => $type, 'table_name' => $this->testTableName)
                );
-               $objects = $this->fixture->findByType($type);
+               $objects = $this->subject->findByType($type);
                $this->assertEquals(2, count($objects));
                $this->assertInstanceOf(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class, $objects[0]);
                $this->assertInstanceOf(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class, $objects[1]);
@@ -134,7 +134,7 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                $testTable = $this->getUniqueId('sys_collection_');
                $this->databaseMock->expects($this->once())->method('exec_SELECTgetRows')->will($this->returnCallback(array($this, 'getRowsCallback')));
                $this->getRowsCallbackReturnValue = NULL;
-               $objects = $this->fixture->findByTableName($testTable);
+               $objects = $this->subject->findByTableName($testTable);
                $this->assertNull($objects);
        }
 
@@ -150,7 +150,7 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                        array('uid' => $testUid, 'type' => $type, 'table_name' => $this->testTableName),
                        array('uid' => $testUid, 'type' => $type, 'table_name' => $this->testTableName)
                );
-               $objects = $this->fixture->findByTableName($testTable);
+               $objects = $this->subject->findByTableName($testTable);
                $this->assertEquals(2, count($objects));
                $this->assertInstanceOf(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class, $objects[0]);
                $this->assertInstanceOf(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class, $objects[1]);
@@ -164,7 +164,7 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                $type = \TYPO3\CMS\Core\Collection\RecordCollectionRepository::TYPE_Static;
                $this->databaseMock->expects($this->once())->method('exec_SELECTgetRows')->will($this->returnCallback(array($this, 'getRowsCallback')));
                $this->getRowsCallbackReturnValue = NULL;
-               $objects = $this->fixture->findByTypeAndTableName($type, $testTable);
+               $objects = $this->subject->findByTypeAndTableName($type, $testTable);
                $this->assertNull($objects);
        }
 
@@ -180,7 +180,7 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                        array('uid' => $testUid, 'type' => $type, 'table_name' => $this->testTableName),
                        array('uid' => $testUid, 'type' => $type, 'table_name' => $this->testTableName)
                );
-               $objects = $this->fixture->findByTypeAndTableName($type, $testTable);
+               $objects = $this->subject->findByTypeAndTableName($type, $testTable);
                $this->assertEquals(2, count($objects));
                $this->assertInstanceOf(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class, $objects[0]);
                $this->assertInstanceOf(\TYPO3\CMS\Core\Collection\StaticRecordCollection::class, $objects[1]);
index 755edfa..041d229 100644 (file)
@@ -24,10 +24,10 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->createFixtureWithMockedMethods(
+               $this->createSubjectWithMockedMethods(
                        array(
                                'getDefaultConfigurationFileLocation',
                                'getLocalConfigurationFileLocation',
@@ -38,8 +38,8 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @param array $methods
         */
-       protected function createFixtureWithMockedMethods(array $methods) {
-               $this->fixture = $this->getMock(
+       protected function createSubjectWithMockedMethods(array $methods) {
+               $this->subject = $this->getMock(
                        \TYPO3\CMS\Core\Configuration\ConfigurationManager::class,
                        $methods
                );
@@ -57,11 +57,11 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                );
                $this->testFilesToDelete[] = $defaultConfigurationFile;
 
-               $this->fixture
+               $this->subject
                        ->expects($this->once())
                        ->method('getDefaultConfigurationFileLocation')
                        ->will($this->returnValue($defaultConfigurationFile));
-               $this->fixture->getDefaultConfiguration();
+               $this->subject->getDefaultConfiguration();
        }
 
        /**
@@ -76,11 +76,11 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                );
                $this->testFilesToDelete[] = $configurationFile;
 
-               $this->fixture
+               $this->subject
                        ->expects($this->once())
                        ->method('getLocalConfigurationFileLocation')
                        ->will($this->returnValue($configurationFile));
-               $this->fixture->getLocalConfiguration();
+               $this->subject->getLocalConfiguration();
        }
 
        /**
@@ -101,98 +101,98 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        'new' => 'new',
                );
 
-               $this->createFixtureWithMockedMethods(
+               $this->createsubjectWithMockedMethods(
                        array(
                                'getLocalConfiguration',
                                'writeLocalConfiguration',
                        )
                );
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                                ->method('getLocalConfiguration')
                                ->will($this->returnValue($currentLocalConfiguration));
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                                ->method('writeLocalConfiguration')
                                ->with($expectedConfiguration);
 
-               $this->fixture->updateLocalConfiguration($overrideConfiguration);
+               $this->subject->updateLocalConfiguration($overrideConfiguration);
        }
 
        /**
         * @test
         */
        public function getDefaultConfigurationValueByPathReturnsCorrectValue() {
-               $this->createFixtureWithMockedMethods(
+               $this->createsubjectWithMockedMethods(
                        array(
                                'getDefaultConfiguration',
                        )
                );
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                                ->method('getDefaultConfiguration')
                                ->will($this->returnValue(array(
                                        'path' => 'value',
                                )
                        ));
 
-               $this->assertSame('value', $this->fixture->getDefaultConfigurationValueByPath('path'));
+               $this->assertSame('value', $this->subject->getDefaultConfigurationValueByPath('path'));
        }
 
        /**
         * @test
         */
        public function getLocalConfigurationValueByPathReturnsCorrectValue() {
-               $this->createFixtureWithMockedMethods(
+               $this->createsubjectWithMockedMethods(
                        array(
                                'getLocalConfiguration',
                        )
                );
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                                ->method('getLocalConfiguration')
                                ->will($this->returnValue(array(
                                        'path' => 'value',
                                )
                        ));
 
-               $this->assertSame('value', $this->fixture->getLocalConfigurationValueByPath('path'));
+               $this->assertSame('value', $this->subject->getLocalConfigurationValueByPath('path'));
        }
 
        /**
         * @test
         */
        public function getConfigurationValueByPathReturnsCorrectValue() {
-               $this->createFixtureWithMockedMethods(
+               $this->createsubjectWithMockedMethods(
                        array(
                                'getDefaultConfiguration',
                                'getLocalConfiguration',
                        )
                );
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                                ->method('getDefaultConfiguration')
                                ->will($this->returnValue(array(
                                        'path' => 'value',
                                )
                        ));
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                                ->method('getLocalConfiguration')
                                ->will($this->returnValue(array(
                                        'path' => 'valueOverride',
                                )
                        ));
 
-               $this->assertSame('valueOverride', $this->fixture->getConfigurationValueByPath('path'));
+               $this->assertSame('valueOverride', $this->subject->getConfigurationValueByPath('path'));
        }
 
        /**
         * @test
         */
        public function setLocalConfigurationValueByPathReturnFalseIfPathIsNotValid() {
-               $this->createFixtureWithMockedMethods(array(
+               $this->createsubjectWithMockedMethods(array(
                                'isValidLocalConfigurationPath',
                        ));
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                                ->method('isValidLocalConfigurationPath')
                                ->will($this->returnValue(FALSE));
 
-               $this->assertFalse($this->fixture->setLocalConfigurationValueByPath('path', 'value'));
+               $this->assertFalse($this->subject->setLocalConfigurationValueByPath('path', 'value'));
        }
 
        /**
@@ -208,24 +208,24 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        'toUpdate' => 'updated',
                );
 
-               $this->createFixtureWithMockedMethods(
+               $this->createsubjectWithMockedMethods(
                        array(
                                'isValidLocalConfigurationPath',
                                'getLocalConfiguration',
                                'writeLocalConfiguration',
                        )
                );
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                                ->method('isValidLocalConfigurationPath')
                                ->will($this->returnValue(TRUE));
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                                ->method('getLocalConfiguration')
                                ->will($this->returnValue($currentLocalConfiguration));
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                                ->method('writeLocalConfiguration')
                                ->with($expectedConfiguration);
 
-               $this->fixture->setLocalConfigurationValueByPath('toUpdate', 'updated');
+               $this->subject->setLocalConfigurationValueByPath('toUpdate', 'updated');
        }
 
        /**
@@ -242,20 +242,20 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        'new' => 'new',
                );
 
-               $this->createFixtureWithMockedMethods(
+               $this->createsubjectWithMockedMethods(
                        array(
                                'isValidLocalConfigurationPath',
                                'getLocalConfiguration',
                                'writeLocalConfiguration',
                        )
                );
-               $this->fixture->expects($this->any())
+               $this->subject->expects($this->any())
                                ->method('isValidLocalConfigurationPath')
                                ->will($this->returnValue(TRUE));
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                                ->method('getLocalConfiguration')
                                ->will($this->returnValue($currentLocalConfiguration));
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                                ->method('writeLocalConfiguration')
                                ->with($expectedConfiguration);
 
@@ -263,7 +263,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        'toUpdate' => 'updated',
                        'new' => 'new'
                );
-               $this->fixture->setLocalConfigurationValuesByPathValuePairs($pairs);
+               $this->subject->setLocalConfigurationValuesByPathValuePairs($pairs);
        }
 
        /**
@@ -279,16 +279,16 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        'notChanged' => 23,
                );
 
-               $this->createFixtureWithMockedMethods(
+               $this->createsubjectWithMockedMethods(
                        array(
                                'getLocalConfiguration',
                                'writeLocalConfiguration',
                        )
                );
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                        ->method('getLocalConfiguration')
                        ->will($this->returnValue($currentLocalConfiguration));
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                        ->method('writeLocalConfiguration')
                        ->with($expectedConfiguration);
 
@@ -296,7 +296,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        'toRemove1',
                        'toRemove2',
                );
-               $this->assertTrue($this->fixture->removeLocalConfigurationKeysByPath($removePaths));
+               $this->assertTrue($this->subject->removeLocalConfigurationKeysByPath($removePaths));
        }
 
        /**
@@ -306,20 +306,20 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $currentLocalConfiguration = array(
                        'notChanged' => 23,
                );
-               $this->createFixtureWithMockedMethods(
+               $this->createsubjectWithMockedMethods(
                        array(
                                'getLocalConfiguration',
                                'writeLocalConfiguration',
                        )
                );
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                        ->method('getLocalConfiguration')
                        ->will($this->returnValue($currentLocalConfiguration));
-               $this->fixture->expects($this->never())
+               $this->subject->expects($this->never())
                        ->method('writeLocalConfiguration');
 
                $removeNothing = array();
-               $this->assertFalse($this->fixture->removeLocalConfigurationKeysByPath($removeNothing));
+               $this->assertFalse($this->subject->removeLocalConfigurationKeysByPath($removeNothing));
        }
 
        /**
@@ -329,20 +329,20 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $currentLocalConfiguration = array(
                        'notChanged' => 23,
                );
-               $this->createFixtureWithMockedMethods(
+               $this->createsubjectWithMockedMethods(
                        array(
                                'getLocalConfiguration',
                                'writeLocalConfiguration',
                        )
                );
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                        ->method('getLocalConfiguration')
                        ->will($this->returnValue($currentLocalConfiguration));
-               $this->fixture->expects($this->never())
+               $this->subject->expects($this->never())
                        ->method('writeLocalConfiguration');
 
                $removeNonExisting = array('notPresent');
-               $this->assertFalse($this->fixture->removeLocalConfigurationKeysByPath($removeNonExisting));
+               $this->assertFalse($this->subject->removeLocalConfigurationKeysByPath($removeNonExisting));
        }
 
        /**
@@ -354,8 +354,8 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                } elseif (TYPO3_OS == 'WIN') {
                        $this->markTestSkipped('Not available on Windows');
                }
-               /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
+               /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
+               $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
 
                $directory = 'typo3temp/' . $this->getUniqueId('test_');
                $absoluteDirectory = PATH_site . $directory;
@@ -363,9 +363,9 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                chmod($absoluteDirectory, 0544);
                clearstatcache();
 
-               $fixture->_set('pathTypo3Conf', $directory);
+               $subject->_set('pathTypo3Conf', $directory);
 
-               $result = $fixture->canWriteConfiguration();
+               $result = $subject->canWriteConfiguration();
 
                chmod($absoluteDirectory, 0755);
                rmdir($absoluteDirectory);
@@ -382,8 +382,8 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                } elseif (TYPO3_OS == 'WIN') {
                        $this->markTestSkipped('Not available on Windows');
                }
-               /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
+               /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
+               $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
 
                $file = 'typo3temp/' . $this->getUniqueId('test_');
                $absoluteFile = PATH_site . $file;
@@ -392,9 +392,9 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                chmod($absoluteFile, 0444);
                clearstatcache();
 
-               $fixture->_set('localConfigurationFile', $file);
+               $subject->_set('localConfigurationFile', $file);
 
-               $result = $fixture->canWriteConfiguration();
+               $result = $subject->canWriteConfiguration();
 
                chmod($absoluteFile, 0644);
 
@@ -405,29 +405,29 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function canWriteConfigurationReturnsTrueIfDirectoryAndFilesAreWritable() {
-               /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
+               /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
+               $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
 
                $directory = 'typo3temp/' . $this->getUniqueId('test_');
                $absoluteDirectory = PATH_site . $directory;
                mkdir($absoluteDirectory);
-               $fixture->_set('pathTypo3Conf', $absoluteDirectory);
+               $subject->_set('pathTypo3Conf', $absoluteDirectory);
 
                $file1 = 'typo3temp/' . $this->getUniqueId('test_');
                $absoluteFile1 = PATH_site . $file1;
                touch($absoluteFile1);
                $this->testFilesToDelete[] = $absoluteFile1;
-               $fixture->_set('localConfigurationFile', $absoluteFile1);
+               $subject->_set('localConfigurationFile', $absoluteFile1);
 
                $file2 = 'typo3temp/' . $this->getUniqueId('test_');
                $absoluteFile2 = PATH_site . $file2;
                touch($absoluteFile2);
                $this->testFilesToDelete[] = $absoluteFile2;
-               $fixture->_set('localconfFile', $absoluteFile2);
+               $subject->_set('localconfFile', $absoluteFile2);
 
                clearstatcache();
 
-               $result = $fixture->canWriteConfiguration();
+               $result = $subject->canWriteConfiguration();
 
                $this->assertTrue($result);
                $this->testFilesToDelete[] = $absoluteDirectory;
@@ -450,7 +450,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                }
                $this->testFilesToDelete[] = $configurationFile;
 
-               $this->fixture
+               $this->subject
                        ->expects($this->any())
                        ->method('getLocalConfigurationFileLocation')
                        ->will($this->returnValue($configurationFile));
@@ -467,7 +467,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                ');' . LF .
                        '?>';
 
-               $this->fixture->writeLocalConfiguration($pairs);
+               $this->subject->writeLocalConfiguration($pairs);
                $this->assertSame($expectedContent, file_get_contents($configurationFile));
        }
 
@@ -476,25 +476,25 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \RuntimeException
         */
        public function createLocalConfigurationFromFactoryConfigurationThrowsExceptionIfFileExists() {
-               /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
+               /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
+               $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
 
                $file = 'typo3temp/' . $this->getUniqueId('test_');
                $absoluteFile = PATH_site . $file;
                touch($absoluteFile);
                $this->testFilesToDelete[] = $absoluteFile;
-               $fixture->_set('localConfigurationFile', $file);
+               $subject->_set('localConfigurationFile', $file);
 
-               $fixture->createLocalConfigurationFromFactoryConfiguration();
+               $subject->createLocalConfigurationFromFactoryConfiguration();
        }
 
        /**
         * @test
         */
        public function createLocalConfigurationFromFactoryConfigurationWritesContentFromFactoryFile() {
-               /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('writeLocalConfiguration'));
-               $fixture->_set('localConfigurationFile', 'typo3temp/' . $this->getUniqueId('dummy_'));
+               /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
+               $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('writeLocalConfiguration'));
+               $subject->_set('localConfigurationFile', 'typo3temp/' . $this->getUniqueId('dummy_'));
 
                $factoryConfigurationFile = 'typo3temp/' . $this->getUniqueId('test_') . '.php';
                $factoryConfigurationAbsoluteFile = PATH_site . $factoryConfigurationFile;
@@ -511,22 +511,22 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                );
                $this->testFilesToDelete[] = $factoryConfigurationAbsoluteFile;
 
-               $fixture->_set('factoryConfigurationFile', $factoryConfigurationFile);
+               $subject->_set('factoryConfigurationFile', $factoryConfigurationFile);
 
-               $fixture
+               $subject
                        ->expects($this->once())
                        ->method('writeLocalConfiguration')
                        ->with($this->arrayHasKey($uniqueContentString));
-               $fixture->createLocalConfigurationFromFactoryConfiguration();
+               $subject->createLocalConfigurationFromFactoryConfiguration();
        }
 
        /**
         * @test
         */
        public function createLocalConfigurationFromFactoryConfigurationMergesConfigurationWithAdditionalFactoryFile() {
-               /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('writeLocalConfiguration'));
-               $fixture->_set('localConfigurationFile', 'typo3temp/' . $this->getUniqueId('dummy_'));
+               /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
+               $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('writeLocalConfiguration'));
+               $subject->_set('localConfigurationFile', 'typo3temp/' . $this->getUniqueId('dummy_'));
 
                $factoryConfigurationFile = 'typo3temp/' . $this->getUniqueId('test_') . '.php';
                $factoryConfigurationAbsoluteFile = PATH_site . $factoryConfigurationFile;
@@ -539,7 +539,7 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $validFactoryConfigurationFileContent
                );
                $this->testFilesToDelete[] = $factoryConfigurationAbsoluteFile;
-               $fixture->_set('factoryConfigurationFile', $factoryConfigurationFile);
+               $subject->_set('factoryConfigurationFile', $factoryConfigurationFile);
 
                $additionalFactoryConfigurationFile = 'typo3temp/' . $this->getUniqueId('test_') . '.php';
                $additionalFactoryConfigurationAbsoluteFile = PATH_site . $additionalFactoryConfigurationFile;
@@ -555,33 +555,33 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        $validAdditionalFactoryConfigurationFileContent
                );
                $this->testFilesToDelete[] = $additionalFactoryConfigurationAbsoluteFile;
-               $fixture->_set('additionalFactoryConfigurationFile', $additionalFactoryConfigurationFile);
+               $subject->_set('additionalFactoryConfigurationFile', $additionalFactoryConfigurationFile);
 
-               $fixture
+               $subject
                        ->expects($this->once())
                        ->method('writeLocalConfiguration')
                        ->with($this->arrayHasKey($uniqueContentString));
-               $fixture->createLocalConfigurationFromFactoryConfiguration();
+               $subject->createLocalConfigurationFromFactoryConfiguration();
        }
 
        /**
         * @test
         */
        public function isValidLocalConfigurationPathAcceptsWhitelistedPath() {
-               /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
-               $fixture->_set('whiteListedLocalConfigurationPaths', array('foo/bar'));
-               $this->assertTrue($fixture->_call('isValidLocalConfigurationPath', 'foo/bar/baz'));
+               /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
+               $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
+               $subject->_set('whiteListedLocalConfigurationPaths', array('foo/bar'));
+               $this->assertTrue($subject->_call('isValidLocalConfigurationPath', 'foo/bar/baz'));
        }
 
        /**
         * @test
         */
        public function isValidLocalConfigurationPathDeniesNotWhitelistedPath() {
-               /** @var $fixture \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
-               $fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
-               $fixture->_set('whiteListedLocalConfigurationPaths', array('foo/bar'));
-               $this->assertFalse($fixture->_call('isValidLocalConfigurationPath', 'bar/baz'));
+               /** @var $subject \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
+               $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class, array('dummy'));
+               $subject->_set('whiteListedLocalConfigurationPaths', array('foo/bar'));
+               $this->assertFalse($subject->_call('isValidLocalConfigurationPath', 'bar/baz'));
        }
 
 }
index 7739bfd..0636d74 100644 (file)
@@ -24,7 +24,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        /**
         * Set up testcase
@@ -32,7 +32,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @return void
         */
        protected function setUp() {
-               $this->fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::class, array('dummy'));
+               $this->subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::class, array('dummy'));
        }
 
        /**
@@ -68,7 +68,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getPathThisScriptCliReadsLocalPartFromArgv() {
                $fakedLocalPart = $this->getUniqueId('Test');
                $GLOBALS['_SERVER']['argv'][0] = $fakedLocalPart;
-               $this->assertStringEndsWith($fakedLocalPart, $this->fixture->_call('getPathThisScriptCli'));
+               $this->assertStringEndsWith($fakedLocalPart, $this->subject->_call('getPathThisScriptCli'));
        }
 
        /**
@@ -78,7 +78,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $fakedLocalPart = $this->getUniqueId('Test');
                unset($GLOBALS['_SERVER']['argv']);
                $GLOBALS['_ENV']['_'] = $fakedLocalPart;
-               $this->assertStringEndsWith($fakedLocalPart, $this->fixture->_call('getPathThisScriptCli'));
+               $this->assertStringEndsWith($fakedLocalPart, $this->subject->_call('getPathThisScriptCli'));
        }
 
        /**
@@ -89,7 +89,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                unset($GLOBALS['_SERVER']['argv']);
                unset($GLOBALS['_ENV']['_']);
                $GLOBALS['_SERVER']['_'] = $fakedLocalPart;
-               $this->assertStringEndsWith($fakedLocalPart, $this->fixture->_call('getPathThisScriptCli'));
+               $this->assertStringEndsWith($fakedLocalPart, $this->subject->_call('getPathThisScriptCli'));
        }
 
        /**
@@ -102,7 +102,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $GLOBALS['_SERVER']['argv'][0] = 'foo';
                $fakedAbsolutePart = '/' . $this->getUniqueId('Absolute') . '/';
                $_SERVER['PWD'] = $fakedAbsolutePart;
-               $this->assertStringStartsWith($fakedAbsolutePart, $this->fixture->_call('getPathThisScriptCli'));
+               $this->assertStringStartsWith($fakedAbsolutePart, $this->subject->_call('getPathThisScriptCli'));
        }
 
        /**
@@ -114,7 +114,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                }
                $input = '/foo/bar/test.php';
                $expected = '/foo/bar/';
-               $actual = $this->fixture->_call('getUnifiedDirectoryNameWithTrailingSlash', $input);
+               $actual = $this->subject->_call('getUnifiedDirectoryNameWithTrailingSlash', $input);
                $this->assertEquals($expected, $actual);
        }
 
@@ -123,7 +123,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function addCorePearPathToIncludePathAddsTypo3ContribPearToPathAsFirstEntry() {
                $backupPath = get_include_path();
-               $this->fixture->_call('addCorePearPathToIncludePath');
+               $this->subject->_call('addCorePearPathToIncludePath');
                $actualValue = get_include_path();
                set_include_path($backupPath);
                $this->assertStringStartsWith(PATH_typo3 . 'contrib/pear/' . PATH_SEPARATOR, $actualValue);
@@ -134,7 +134,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function initializeGlobalVariablesUnsetsGlobalErrorArray() {
                $GLOBALS['error'] = 'foo';
-               $this->fixture->_call('initializeGlobalVariables');
+               $this->subject->_call('initializeGlobalVariables');
                $this->assertFalse(isset($GLOBALS['error']));
        }
 
@@ -143,7 +143,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function initializeGlobalVariablesSetsGlobalClientArray() {
                unset($GLOBALS['CLIENT']);
-               $this->fixture->_call('initializeGlobalVariables');
+               $this->subject->_call('initializeGlobalVariables');
                $this->assertArrayHasKey('CLIENT', $GLOBALS);
        }
 
@@ -152,7 +152,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function initializeGlobalVariablesSetsGlobalTypo3MiscArray() {
                unset($GLOBALS['TYPO3_MISC']);
-               $this->fixture->_call('initializeGlobalVariables');
+               $this->subject->_call('initializeGlobalVariables');
                $this->assertInternalType('array', $GLOBALS['TYPO3_MISC']);
        }
 
@@ -161,7 +161,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function initializeGlobalVariablesSetsGlobalT3VarArray() {
                unset($GLOBALS['T3_VAR']);
-               $this->fixture->_call('initializeGlobalVariables');
+               $this->subject->_call('initializeGlobalVariables');
                $this->assertInternalType('array', $GLOBALS['T3_VAR']);
        }
 
@@ -170,7 +170,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function initializeGlobalVariablesSetsGlobalT3ServicesArray() {
                unset($GLOBALS['T3_SERVICES']);
-               $this->fixture->_call('initializeGlobalVariables');
+               $this->subject->_call('initializeGlobalVariables');
                $this->assertInternalType('array', $GLOBALS['T3_SERVICES']);
        }
 
@@ -196,7 +196,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function initializeGlobalTimeTrackingVariablesSetsGlobalVariables($variable) {
                unset($GLOBALS[$variable]);
-               $this->fixture->_call('initializeGlobalTimeTrackingVariables');
+               $this->subject->_call('initializeGlobalTimeTrackingVariables');
                $this->assertTrue(isset($GLOBALS[$variable]));
        }
 
@@ -205,7 +205,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function initializeGlobalTimeTrackingVariablesSetsGlobalTypo3MiscMicrotimeStart() {
                unset($GLOBALS['TYPO3_MISC']['microtime_start']);
-               $this->fixture->_call('initializeGlobalTimeTrackingVariables');
+               $this->subject->_call('initializeGlobalTimeTrackingVariables');
                $this->assertTrue(isset($GLOBALS['TYPO3_MISC']['microtime_start']));
        }
 
@@ -213,7 +213,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function initializeGlobalTimeTrackingVariablesRoundsAccessTimeToSixtySeconds() {
-               $this->fixture->_call('initializeGlobalTimeTrackingVariables');
+               $this->subject->_call('initializeGlobalTimeTrackingVariables');
                $this->assertEquals(0, $GLOBALS['ACCESS_TIME'] % 60);
        }
 
@@ -221,7 +221,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function initializeGlobalTimeTrackingVariablesRoundsSimAccessTimeToSixtySeconds() {
-               $this->fixture->_call('initializeGlobalTimeTrackingVariables');
+               $this->subject->_call('initializeGlobalTimeTrackingVariables');
                $this->assertEquals(0, $GLOBALS['SIM_ACCESS_TIME'] % 60);
        }
 
@@ -230,7 +230,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function initializeBasicErrorReportingExcludesStrict() {
                $backupReporting = error_reporting();
-               $this->fixture->_call('initializeBasicErrorReporting');
+               $this->subject->_call('initializeBasicErrorReporting');
                $actualReporting = error_reporting();
                error_reporting($backupReporting);
                $this->assertEquals(0, $actualReporting & E_STRICT);
@@ -241,7 +241,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function initializeBasicErrorReportingExcludesNotice() {
                $backupReporting = error_reporting();
-               $this->fixture->_call('initializeBasicErrorReporting');
+               $this->subject->_call('initializeBasicErrorReporting');
                $actualReporting = error_reporting();
                error_reporting($backupReporting);
                $this->assertEquals(0, $actualReporting & E_NOTICE);
@@ -252,7 +252,7 @@ class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function initializeBasicErrorReportingExcludesDeprecated() {
                $backupReporting = error_reporting();
-               $this->fixture->_call('initializeBasicErrorReporting');
+               $this->subject->_call('initializeBasicErrorReporting');
                $actualReporting = error_reporting();
                error_reporting($backupReporting);
                $this->assertEquals(0, $actualReporting & E_DEPRECATED);
index 0b07ec8..15f5643 100644 (file)
@@ -22,20 +22,20 @@ class RelationHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Core\Database\RelationHandler
         */
-       protected $fixture;
+       protected $subject;
 
        /**
         * @return void
         */
        protected function setUp() {
-               $this->fixture = $this->getMock(\TYPO3\CMS\Core\Database\RelationHandler::class, array('purgeVersionedIds', 'purgeLiveVersionedIds'));
+               $this->subject = $this->getMock(\TYPO3\CMS\Core\Database\RelationHandler::class, array('purgeVersionedIds', 'purgeLiveVersionedIds'));
        }
 
        /**
         * @return void
         */
        protected function tearDown() {
-               unset($this->fixture);
+               unset($this->subject);
        }
 
        /**
@@ -44,11 +44,11 @@ class RelationHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function purgeItemArrayReturnsFalseIfVersioningForTableIsDisabled() {
                $GLOBALS['TCA']['sys_category']['ctrl']['versioningWS'] = FALSE;
 
-               $this->fixture->tableArray = array(
+               $this->subject->tableArray = array(
                        'sys_category' => array(1, 2, 3),
                );
 
-               $this->assertFalse($this->fixture->purgeItemArray(0));
+               $this->assertFalse($this->subject->purgeItemArray(0));
        }
 
        /**
@@ -57,16 +57,16 @@ class RelationHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function purgeItemArrayReturnsTrueIfItemsHaveBeenPurged() {
                $GLOBALS['TCA']['sys_category']['ctrl']['versioningWS'] = 2;
 
-               $this->fixture->tableArray = array(
+               $this->subject->tableArray = array(
                        'sys_category' => array(1, 2, 3),
                );
 
-               $this->fixture->expects($this->once())
+               $this->subject->expects($this->once())
                        ->method('purgeVersionedIds')
                        ->with('sys_category', array(1, 2, 3))
                        ->will($this->returnValue(array(2)));
 
-               $this->assertTrue($this->fixture->purgeItemArray(0));
+               $this->assertTrue($this->subject->purgeItemArray(0));
        }
 
 }
\ No newline at end of file
index 782651f..15b80c8 100644 (file)
@@ -24,10 +24,10 @@ class SqlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Core\Database\SqlParser|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Database\SqlParser::class, array('dummy'));
+               $this->subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Database\SqlParser::class, array('dummy'));
        }
 
        /**
@@ -102,7 +102,7 @@ class SqlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                'comparator' => ''
                        )
                );
-               $output = $this->fixture->compileWhereClause($clauses);
+               $output = $this->subject->compileWhereClause($clauses);
                $parts = explode(' OR ', $output);
                $this->assertSame(count($clauses), count($parts));
                $this->assertContains('IFNULL', $output);
@@ -135,7 +135,7 @@ class SqlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @param string $expected The expected trimmed SQL with single space at the end
         */
        public function trimSqlReallyTrimsAllWhitespace($sql, $expected) {
-               $result = $this->fixture->_call('trimSQL', $sql);
+               $result = $this->subject->_call('trimSQL', $sql);
                $this->assertSame($expected, $result);
        }
 
index ad398c1..f8bf09e 100644 (file)
@@ -24,10 +24,10 @@ class JavaScriptEncoderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Core\Encoder\JavaScriptEncoder
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Core\Encoder\JavaScriptEncoder();
+               $this->subject = new \TYPO3\CMS\Core\Encoder\JavaScriptEncoder();
        }
 
        /**
@@ -83,7 +83,7 @@ class JavaScriptEncoderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @dataProvider encodeEncodesCorrectlyDataProvider
         */
        public function encodeEncodesCorrectly($input, $expected) {
-               $this->assertSame($expected, $this->fixture->encode($input));
+               $this->assertSame($expected, $this->subject->encode($input));
        }
 
 }
index 624ff7a..1277c43 100644 (file)
@@ -24,14 +24,14 @@ class DebugExceptionHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Core\Error\DebugExceptionHandler|\PHPUnit_Framework_MockObject_MockObject
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        /**
         * Sets up this test case.
         */
        protected function setUp() {
-               $this->fixture = $this->getMock(\TYPO3\CMS\Core\Error\DebugExceptionHandler::class, array('sendStatusHeaders', 'writeLogEntries'), array(), '', FALSE);
-               $this->fixture->expects($this->any())->method('discloseExceptionInformation')->will($this->returnValue(TRUE));
+               $this->subject = $this->getMock(\TYPO3\CMS\Core\Error\DebugExceptionHandler::class, array('sendStatusHeaders', 'writeLogEntries'), array(), '', FALSE);
+               $this->subject->expects($this->any())->method('discloseExceptionInformation')->will($this->returnValue(TRUE));
        }
 
        /**
@@ -41,7 +41,7 @@ class DebugExceptionHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $message = '<b>b</b><script>alert(1);</script>';
                $exception = new \Exception($message);
                ob_start();
-               $this->fixture->echoExceptionWeb($exception);
+               $this->subject->echoExceptionWeb($exception);
                $output = ob_get_contents();
                ob_end_clean();
                $this->assertContains(htmlspecialchars($message), $output);
index ecce656..ff3ac96 100644 (file)
@@ -24,14 +24,14 @@ class ProductionExceptionHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
        /**
         * @var \TYPO3\CMS\Core\Error\ProductionExceptionHandler|\PHPUnit_Framework_MockObject_MockObject
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        /**
         * Sets up this test case.
         */
        protected function setUp() {
-               $this->fixture = $this->getMock(\TYPO3\CMS\Core\Error\ProductionExceptionHandler::class, array('discloseExceptionInformation', 'sendStatusHeaders', 'writeLogEntries'), array(), '', FALSE);
-               $this->fixture->expects($this->any())->method('discloseExceptionInformation')->will($this->returnValue(TRUE));
+               $this->subject = $this->getMock(\TYPO3\CMS\Core\Error\ProductionExceptionHandler::class, array('discloseExceptionInformation', 'sendStatusHeaders', 'writeLogEntries'), array(), '', FALSE);
+               $this->subject->expects($this->any())->method('discloseExceptionInformation')->will($this->returnValue(TRUE));
        }
 
        /**
@@ -41,7 +41,7 @@ class ProductionExceptionHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                $message = '<b>b</b><script>alert(1);</script>';
                $exception = new \Exception($message);
                ob_start();
-               $this->fixture->echoExceptionWeb($exception);
+               $this->subject->echoExceptionWeb($exception);
                $output = ob_get_contents();
                ob_end_clean();
                $this->assertContains(htmlspecialchars($message), $output);
@@ -57,7 +57,7 @@ class ProductionExceptionHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                $exception = $this->getMock('Exception', array('getTitle'), array('some message'));
                $exception->expects($this->any())->method('getTitle')->will($this->returnValue($title));
                ob_start();
-               $this->fixture->echoExceptionWeb($exception);
+               $this->subject->echoExceptionWeb($exception);
                $output = ob_get_contents();
                ob_end_clean();
                $this->assertContains(htmlspecialchars($title), $output);
index 90f277c..dfe9301 100644 (file)
@@ -24,13 +24,13 @@ class InstallToolFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface
         */
-       protected $fixture;
+       protected $subject;
 
        /**
         * Set up
         */
        protected function setUp() {
-               $this->fixture = $this->getAccessibleMock(
+               $this->subject = $this->getAccessibleMock(
                        \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection::class,
                        array('dummy')
                );
@@ -53,10 +53,10 @@ class InstallToolFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
                $_SESSION['installToolFormToken'] = $sessionToken;
 
-               $this->fixture->_call('retrieveSessionToken');
+               $this->subject->_call('retrieveSessionToken');
 
                $this->assertTrue(
-                       $this->fixture->validateToken($tokenId, $formName, $action, $formInstanceName)
+                       $this->subject->validateToken($tokenId, $formName, $action, $formInstanceName)
                );
        }
 
@@ -66,9 +66,9 @@ class InstallToolFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function persistSessionTokenWritesTokensToSession() {
                $_SESSION['installToolFormToken'] = 'foo';
 
-               $this->fixture->_set('sessionToken', '881ffea2159ac72182557b79dc0c723f5a8d20136f9fab56cdd4f8b3a1dbcfcd');
+               $this->subject->_set('sessionToken', '881ffea2159ac72182557b79dc0c723f5a8d20136f9fab56cdd4f8b3a1dbcfcd');
 
-               $this->fixture->persistSessionToken();
+               $this->subject->persistSessionToken();
 
                $this->assertEquals(
                        '881ffea2159ac72182557b79dc0c723f5a8d20136f9fab56cdd4f8b3a1dbcfcd',
index 39cb373..70249b4 100644 (file)
@@ -24,10 +24,10 @@ class HtmlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Core\Html\HtmlParser
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Core\Html\HtmlParser();
+               $this->subject = new \TYPO3\CMS\Core\Html\HtmlParser();
        }
 
        /**
@@ -229,7 +229,7 @@ Value 2.2
         * @dataProvider substituteMarkerAndSubpartArrayRecursiveResolvesMarkersAndSubpartsArrayDataProvider
         */
        public function substituteMarkerAndSubpartArrayRecursiveResolvesMarkersAndSubpartsArray($template, $markersAndSubparts, $wrap, $uppercase, $deleteUnused, $expected) {
-               $this->assertSame($expected, $this->fixture->substituteMarkerAndSubpartArrayRecursive($template, $markersAndSubparts, $wrap, $uppercase, $deleteUnused));
+               $this->assertSame($expected, $this->subject->substituteMarkerAndSubpartArrayRecursive($template, $markersAndSubparts, $wrap, $uppercase, $deleteUnused));
        }
 
        /**
@@ -263,7 +263,7 @@ Value 2.2
         * @dataProvider cDataWillRemainUnmodifiedDataProvider
         */
        public function xHtmlCleaningDoesNotModifyCDATA($source, $expected) {
-               $result = $this->fixture->XHTML_clean($source);
+               $result = $this->subject->XHTML_clean($source);
                $this->assertSame($expected, $result);
        }
 
index cc08c16..1f8975b 100644 (file)
@@ -24,11 +24,11 @@ class RteHtmlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Core\Html\RteHtmlParser
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Core\Html\RteHtmlParser();
-               $this->fixture->procOptions = array(
+               $this->subject = new \TYPO3\CMS\Core\Html\RteHtmlParser();
+               $this->subject->procOptions = array(
                        'dontConvBRtoParagraph' => '1',
                        'preserveDIVSections' => '1',
                        'allowTagsOutside' => 'hr, address',
@@ -106,8 +106,8 @@ class RteHtmlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @dataProvider hrTagCorrectlyTransformedOnWayToDataBaseDataProvider
         */
        public function hrTagCorrectlyTransformedOnWayToDataBase($content, $expectedResult) {
-               $thisConfig = array('proc.' => $this->fixture->procOptions);
-               $this->assertEquals($expectedResult, $this->fixture->RTE_transform($content, array(), 'db', $thisConfig));
+               $thisConfig = array('proc.' => $this->subject->procOptions);
+               $this->assertEquals($expectedResult, $this->subject->RTE_transform($content, array(), 'db', $thisConfig));
        }
 
        /**
@@ -179,8 +179,8 @@ class RteHtmlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @dataProvider hrTagCorrectlyTransformedOnWayToDatabaseAndBackToRteProvider
         */
        public function hrTagCorrectlyTransformedOnWayToDatabaseAndBackToRte($content, $expectedResult) {
-               $thisConfig = array('proc.' => $this->fixture->procOptions);
-               $this->assertEquals($expectedResult, $this->fixture->RTE_transform($this->fixture->RTE_transform($content, array(), 'db', $thisConfig), array(), 'rte', $thisConfig));
+               $thisConfig = array('proc.' => $this->subject->procOptions);
+               $this->assertEquals($expectedResult, $this->subject->RTE_transform($this->subject->RTE_transform($content, array(), 'db', $thisConfig), array(), 'rte', $thisConfig));
        }
 
        /**
@@ -204,8 +204,8 @@ class RteHtmlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @dataProvider linkWithAtSignCorrectlyTransformedOnWayToRTEProvider
         */
        public function linkWithAtSignCorrectlyTransformedOnWayToRTE($content, $expectedResult) {
-               $thisConfig = array('proc.' => $this->fixture->procOptions);
-               $this->assertEquals($expectedResult, $this->fixture->RTE_transform($content, array(), 'rte', $thisConfig));
+               $thisConfig = array('proc.' => $this->subject->procOptions);
+               $this->assertEquals($expectedResult, $this->subject->RTE_transform($content, array(), 'rte', $thisConfig));
        }
 
        /**
@@ -389,8 +389,8 @@ class RteHtmlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @dataProvider paragraphCorrectlyTransformedOnWayToDatabaseProvider
         */
        public function paragraphCorrectlyTransformedOnWayToDatabase($content, $expectedResult) {
-               $thisConfig = array('proc.' => $this->fixture->procOptions);
-               $this->assertEquals($expectedResult, $this->fixture->RTE_transform($content, array(), 'db', $thisConfig));
+               $thisConfig = array('proc.' => $this->subject->procOptions);
+               $this->assertEquals($expectedResult, $this->subject->RTE_transform($content, array(), 'db', $thisConfig));
        }
 
        /**
@@ -486,8 +486,8 @@ class RteHtmlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @dataProvider lineBreakCorrectlyTransformedOnWayToRTEProvider
         */
        public function lineBreakCorrectlyTransformedOnWayToRTE($content, $expectedResult) {
-               $thisConfig = array('proc.' => $this->fixture->procOptions);
-               $this->assertEquals($expectedResult, $this->fixture->RTE_transform($content, array(), 'rte', $thisConfig));
+               $thisConfig = array('proc.' => $this->subject->procOptions);
+               $this->assertEquals($expectedResult, $this->subject->RTE_transform($content, array(), 'rte', $thisConfig));
        }
 
        /**
@@ -635,8 +635,8 @@ class RteHtmlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @dataProvider paragraphCorrectlyTransformedOnWayToDatabaseAndBackToRteProvider
         */
        public function paragraphCorrectlyTransformedOnWayToDatabaseAndBackToRte($content, $expectedResult) {
-               $thisConfig = array('proc.' => $this->fixture->procOptions);
-               $this->assertEquals($expectedResult, $this->fixture->RTE_transform($this->fixture->RTE_transform($content, array(), 'db', $thisConfig), array(), 'rte', $thisConfig));
+               $thisConfig = array('proc.' => $this->subject->procOptions);
+               $this->assertEquals($expectedResult, $this->subject->RTE_transform($this->subject->RTE_transform($content, array(), 'db', $thisConfig), array(), 'rte', $thisConfig));
        }
 
 }
index 0f148e7..4b55aef 100644 (file)
@@ -24,7 +24,7 @@ class GraphicalFunctionsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Core\Imaging\GraphicalFunctions
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        /**
         * Set up
@@ -32,7 +32,7 @@ class GraphicalFunctionsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @return void
         */
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Core\Imaging\GraphicalFunctions();
+               $this->subject = new \TYPO3\CMS\Core\Imaging\GraphicalFunctions();
        }
 
        /**
@@ -105,7 +105,7 @@ class GraphicalFunctionsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @dataProvider getScaleForImageDataProvider
         */
        public function getScaleForImage($info, $width, $height, $options, $expected) {
-               $result = $this->fixture->getImageScale($info, $width, $height, $options);
+               $result = $this->subject->getImageScale($info, $width, $height, $options);
                $this->assertEquals($result, $expected);
        }
 
index c154c92..0c3cdc3 100644 (file)
@@ -24,10 +24,10 @@ class MailerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Core\Mail\Mailer
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = $this->getMock(\TYPO3\CMS\Core\Mail\Mailer::class, array('emitPostInitializeMailerSignal'), array(), '', FALSE);
+               $this->subject = $this->getMock(\TYPO3\CMS\Core\Mail\Mailer::class, array('emitPostInitializeMailerSignal'), array(), '', FALSE);
        }
 
        //////////////////////////
@@ -39,9 +39,9 @@ class MailerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function injectedSettingsAreNotReplacedByGlobalSettings() {
                $settings = array('transport' => 'mbox', 'transport_mbox_file' => '/path/to/file');
                $GLOBALS['TYPO3_CONF_VARS']['MAIL'] = array('transport' => 'sendmail', 'transport_sendmail_command' => 'sendmail');
-               $this->fixture->injectMailSettings($settings);
-               $this->fixture->__construct();
-               $this->assertAttributeSame($settings, 'mailSettings', $this->fixture);
+               $this->subject->injectMailSettings($settings);
+               $this->subject->__construct();
+               $this->assertAttributeSame($settings, 'mailSettings', $this->subject);
        }
 
        /**
@@ -49,8 +49,8 @@ class MailerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function globalSettingsAreUsedIfNoSettingsAreInjected() {
                $settings = ($GLOBALS['TYPO3_CONF_VARS']['MAIL'] = array('transport' => 'sendmail', 'transport_sendmail_command' => 'sendmail'));
-               $this->fixture->__construct();
-               $this->assertAttributeSame($settings, 'mailSettings', $this->fixture);
+               $this->subject->__construct();
+               $this->assertAttributeSame($settings, 'mailSettings', $this->subject);
        }
 
        /**
@@ -74,8 +74,8 @@ class MailerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \TYPO3\CMS\Core\Exception
         */
        public function wrongConfigigurationThrowsException($settings) {
-               $this->fixture->injectMailSettings($settings);
-               $this->fixture->__construct();
+               $this->subject->injectMailSettings($settings);
+               $this->subject->__construct();
        }
 
        /**
@@ -88,17 +88,17 @@ class MailerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                public function __construct($settings) {}
                        }');
                }
-               $this->fixture->injectMailSettings(array('transport' => 't3lib_mail_SwiftMailerFakeTransport'));
-               $this->fixture->__construct();
+               $this->subject->injectMailSettings(array('transport' => 't3lib_mail_SwiftMailerFakeTransport'));
+               $this->subject->__construct();
        }
 
        /**
         * @test
         */
        public function noPortSettingSetsPortTo25() {
-               $this->fixture->injectMailSettings(array('transport' => 'smtp', 'transport_smtp_server' => 'localhost'));
-               $this->fixture->__construct();
-               $port = $this->fixture->getTransport()->getPort();
+               $this->subject->injectMailSettings(array('transport' => 'smtp', 'transport_smtp_server' => 'localhost'));
+               $this->subject->__construct();
+               $port = $this->subject->getTransport()->getPort();
                $this->assertEquals(25, $port);
        }
 
@@ -106,9 +106,9 @@ class MailerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function emptyPortSettingSetsPortTo25() {
-               $this->fixture->injectMailSettings(array('transport' => 'smtp', 'transport_smtp_server' => 'localhost:'));
-               $this->fixture->__construct();
-               $port = $this->fixture->getTransport()->getPort();
+               $this->subject->injectMailSettings(array('transport' => 'smtp', 'transport_smtp_server' => 'localhost:'));
+               $this->subject->__construct();
+               $port = $this->subject->getTransport()->getPort();
                $this->assertEquals(25, $port);
        }
 
@@ -116,9 +116,9 @@ class MailerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function givenPortSettingIsRespected() {
-               $this->fixture->injectMailSettings(array('transport' => 'smtp', 'transport_smtp_server' => 'localhost:12345'));
-               $this->fixture->__construct();
-               $port = $this->fixture->getTransport()->getPort();
+               $this->subject->injectMailSettings(array('transport' => 'smtp', 'transport_smtp_server' => 'localhost:12345'));
+               $this->subject->__construct();
+               $port = $this->subject->getTransport()->getPort();
                $this->assertEquals(12345, $port);
        }
 
index 9d2d707..01c0f5e 100644 (file)
@@ -24,14 +24,14 @@ class DriverRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Core\Resource\Driver\DriverRegistry
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->initializeFixture();
+               $this->initializeSubject();
        }
 
-       protected function initializeFixture() {
-               $this->fixture = new \TYPO3\CMS\Core\Resource\Driver\DriverRegistry();
+       protected function initializeSubject() {
+               $this->subject = new \TYPO3\CMS\Core\Resource\Driver\DriverRegistry();
        }
 
        /**
@@ -39,8 +39,8 @@ class DriverRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function registeredDriverClassesCanBeRetrieved() {
                $className = get_class($this->getMockForAbstractClass(\TYPO3\CMS\Core\Resource\Driver\AbstractDriver::class));
-               $this->fixture->registerDriverClass($className, 'foobar');
-               $returnedClassName = $this->fixture->getDriverClass('foobar');
+               $this->subject->registerDriverClass($className, 'foobar');
+               $returnedClassName = $this->subject->getDriverClass('foobar');
                $this->assertEquals($className, $returnedClassName);
        }
 
@@ -49,7 +49,7 @@ class DriverRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function registerDriverClassThrowsExceptionIfClassDoesNotExist() {
                $this->setExpectedException('InvalidArgumentException', '', 1314979197);
-               $this->fixture->registerDriverClass($this->getUniqueId());
+               $this->subject->registerDriverClass($this->getUniqueId());
        }
 
        /**
@@ -59,8 +59,8 @@ class DriverRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $this->setExpectedException('InvalidArgumentException', '', 1314979451);
                $className = get_class($this->getMockForAbstractClass(\TYPO3\CMS\Core\Resource\Driver\AbstractDriver::class));
                $className2 = get_class($this->getMockForAbstractClass(\TYPO3\CMS\Core\Resource\Driver\DriverInterface::class));
-               $this->fixture->registerDriverClass($className, 'foobar');
-               $this->fixture->registerDriverClass($className2, 'foobar');
+               $this->subject->registerDriverClass($className, 'foobar');
+               $this->subject->registerDriverClass($className2, 'foobar');
        }
 
        /**
@@ -68,7 +68,7 @@ class DriverRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getDriverClassThrowsExceptionIfClassIsNotRegistered() {
                $this->setExpectedException('InvalidArgumentException', '', 1314085990);
-               $this->fixture->getDriverClass($this->getUniqueId());
+               $this->subject->getDriverClass($this->getUniqueId());
        }
 
        /**
@@ -76,8 +76,8 @@ class DriverRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getDriverClassAcceptsClassNameIfClassIsRegistered() {
                $className = get_class($this->getMockForAbstractClass(\TYPO3\CMS\Core\Resource\Driver\AbstractDriver::class));
-               $this->fixture->registerDriverClass($className, 'foobar');
-               $this->assertEquals($className, $this->fixture->getDriverClass($className));
+               $this->subject->registerDriverClass($className, 'foobar');
+               $this->assertEquals($className, $this->subject->getDriverClass($className));
        }
 
        /**
@@ -91,8 +91,8 @@ class DriverRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                'class' => $className
                        )
                );
-               $this->initializeFixture();
-               $this->assertEquals($className, $this->fixture->getDriverClass($shortName));
+               $this->initializesubject();
+               $this->assertEquals($className, $this->subject->getDriverClass($shortName));
        }
 
        /**
@@ -106,9 +106,9 @@ class DriverRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                'class' => $className
                        )
                );
-               $this->initializeFixture();
-               $this->assertTrue($this->fixture->driverExists($shortName));
-               $this->assertFalse($this->fixture->driverExists($this->getUniqueId()));
+               $this->initializesubject();
+               $this->assertTrue($this->subject->driverExists($shortName));
+               $this->assertFalse($this->subject->driverExists($this->getUniqueId()));
        }
 
        /**
@@ -117,8 +117,8 @@ class DriverRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function driverExistsReturnsFalseIfDriverDoesNotExist() {
                $GLOBALS['TYPO3_CONF_VARS']['SYS']['fal']['registeredDrivers'] = array(
                );
-               $this->initializeFixture();
-               $this->assertFalse($this->fixture->driverExists($this->getUniqueId()));
+               $this->initializesubject();
+               $this->assertFalse($this->subject->driverExists($this->getUniqueId()));
        }
 
 }
index 4f60a45..0d1c13c 100644 (file)
@@ -22,10 +22,10 @@ class TreeDataProviderFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Core\Tree\TableConfiguration\TreeDataProviderFactory
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Core\Tree\TableConfiguration\TreeDataProviderFactory();
+               $this->subject = new \TYPO3\CMS\Core\Tree\TableConfiguration\TreeDataProviderFactory();
                $GLOBALS['TCA'] = array();
                $GLOBALS['TCA']['foo'] = array();
                $GLOBALS['TCA']['foo']['ctrl'] = array();
@@ -75,7 +75,7 @@ class TreeDataProviderFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \InvalidArgumentException
         */
        public function factoryThrowsExceptionIfInvalidConfigurationIsGiven(array $tcaConfiguration) {
-               $this->fixture->getDataProvider($tcaConfiguration, 'foo', 'bar', array('uid' => 1));
+               $this->subject->getDataProvider($tcaConfiguration, 'foo', 'bar', array('uid' => 1));
        }
 
        /**
@@ -89,7 +89,7 @@ class TreeDataProviderFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                }');
 
                $tcaConfiguration = array('treeConfig' => array('dataProvider' => $dataProviderMockClassName), 'internal_type' => 'foo');
-               $dataProvider = $this->fixture->getDataProvider($tcaConfiguration, 'foo', 'bar', array('uid' => 1));
+               $dataProvider = $this->subject->getDataProvider($tcaConfiguration, 'foo', 'bar', array('uid' => 1));
 
                $this->assertInstanceOf($dataProviderMockClassName, $dataProvider);
        }
@@ -107,7 +107,7 @@ class TreeDataProviderFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        }
                }';
                eval($classCode);
-               $dataProvider = $this->fixture->getDataProvider($tcaConfiguration, 'foo', 'bar', array('uid' => 1));
+               $dataProvider = $this->subject->getDataProvider($tcaConfiguration, 'foo', 'bar', array('uid' => 1));
 
                $this->assertInstanceOf($dataProviderMockClassName, $dataProvider);
        }
index 47f7a54..022306d 100644 (file)
@@ -26,7 +26,7 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var RootlineUtility|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject
         */
-       protected $fixture;
+       protected $subject;
 
        /**
         * @var \TYPO3\CMS\Frontend\Page\PageRepository|\PHPUnit_Framework_MockObject_MockObject
@@ -35,7 +35,7 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
        protected function setUp() {
                $this->pageContextMock = $this->getMock(\TYPO3\CMS\Frontend\Page\PageRepository::class);
-               $this->fixture = $this->getAccessibleMock(\TYPO3\CMS\Core\Utility\RootlineUtility::class, array('enrichWithRelationFields'), array(1, '', $this->pageContextMock));
+               $this->subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Utility\RootlineUtility::class, array('enrichWithRelationFields'), array(1, '', $this->pageContextMock));
        }
 
        protected function tearDown() {
@@ -69,24 +69,24 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function isMountedPageWithoutMountPointsReturnsFalse() {
-               $this->fixture->__construct(1);
-               $this->assertFalse($this->fixture->isMountedPage());
+               $this->subject->__construct(1);
+               $this->assertFalse($this->subject->isMountedPage());
        }
 
        /**
         * @test
         */
        public function isMountedPageWithMatchingMountPointParameterReturnsTrue() {
-               $this->fixture->__construct(1, '1-99');
-               $this->assertTrue($this->fixture->isMountedPage());
+               $this->subject->__construct(1, '1-99');
+               $this->assertTrue($this->subject->isMountedPage());
        }
 
        /**
         * @test
         */
        public function isMountedPageWithNonMatchingMountPointParameterReturnsFalse() {
-               $this->fixture->__construct(1, '99-99');
-               $this->assertFalse($this->fixture->isMountedPage());
+               $this->subject->__construct(1, '99-99');
+               $this->assertFalse($this->subject->isMountedPage());
        }
 
        /**
@@ -94,24 +94,24 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @expectedException \RuntimeException
         */
        public function processMountedPageWithNonMountedPageThrowsException() {
-               $this->fixture->__construct(1, '1-99');
-               $this->fixture->_call('processMountedPage', array('uid' => 1), array('uid' => 99, 'doktype' => \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT));
+               $this->subject->__construct(1, '1-99');
+               $this->subject->_call('processMountedPage', array('uid' => 1), array('uid' => 99, 'doktype' => \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT));
        }
 
        /**
         * @test
         */
        public function processMountedPageWithMountedPageNotThrowsException() {
-               $this->fixture->__construct(1, '1-99');
-               $this->assertNotEmpty($this->fixture->_call('processMountedPage', array('uid' => 1), array('uid' => 99, 'doktype' => \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_MOUNTPOINT, 'mount_pid' => 1)));
+               $this->subject->__construct(1, '1-99');
+               $this->assertNotEmpty($this->subject->_call('processMountedPage', array('uid' => 1), array('uid' => 99, 'doktype' => \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_MOUNTPOINT, 'mount_pid' => 1)));
        }
 
        /**
         * @test
         */
        public function processMountedPageWithMountedPageAddsMountedFromParameter() {
-               $this->fixture->__construct(1, '1-99');
-               $result = $this->fixture->_call('processMountedPage', array('uid' => 1), array('uid' => 99, 'doktype' => \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_MOUNTPOINT, 'mount_pid' => 1));
+               $this->subject->__construct(1, '1-99');
+               $result = $this->subject->_call('processMountedPage', array('uid' => 1), array('uid' => 99, 'doktype' => \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_MOUNTPOINT, 'mount_pid' => 1));
                $this->assertTrue(isset($result['_MOUNTED_FROM']));
                $this->assertSame(1, $result['_MOUNTED_FROM']);
        }
@@ -120,8 +120,8 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function processMountedPageWithMountedPageAddsMountPointParameterToReturnValue() {
-               $this->fixture->__construct(1, '1-99');
-               $result = $this->fixture->_call('processMountedPage', array('uid' => 1), array('uid' => 99, 'doktype' => \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_MOUNTPOINT, 'mount_pid' => 1));
+               $this->subject->__construct(1, '1-99');
+               $result = $this->subject->_call('processMountedPage', array('uid' => 1), array('uid' => 99, 'doktype' => \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_MOUNTPOINT, 'mount_pid' => 1));
                $this->assertTrue(isset($result['_MP_PARAM']));
                $this->assertSame('1-99', $result['_MP_PARAM']);
        }
@@ -130,8 +130,8 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function processMountedPageForMountPageIsOverlayAddsMountOLParameter() {
-               $this->fixture->__construct(1, '1-99');
-               $result = $this->fixture->_call('processMountedPage', array('uid' => 1), array('uid' => 99, 'doktype' => \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_MOUNTPOINT, 'mount_pid' => 1, 'mount_pid_ol' => 1));
+               $this->subject->__construct(1, '1-99');
+               $result = $this->subject->_call('processMountedPage', array('uid' => 1), array('uid' => 99, 'doktype' => \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_MOUNTPOINT, 'mount_pid' => 1, 'mount_pid_ol' => 1));
                $this->assertTrue(isset($result['_MOUNT_OL']));
                $this->assertSame(TRUE, $result['_MOUNT_OL']);
        }
@@ -140,8 +140,8 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function processMountedPageForMountPageIsOverlayAddsDataInformationAboutMountPage() {
-               $this->fixture->__construct(1, '1-99');
-               $result = $this->fixture->_call('processMountedPage', array('uid' => 1), array('uid' => 99, 'doktype' => \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_MOUNTPOINT, 'mount_pid' => 1, 'mount_pid_ol' => 1, 'pid' => 5, 'title' => 'TestCase'));
+               $this->subject->__construct(1, '1-99');
+               $result = $this->subject->_call('processMountedPage', array('uid' => 1), array('uid' => 99, 'doktype' => \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_MOUNTPOINT, 'mount_pid' => 1, 'mount_pid_ol' => 1, 'pid' => 5, 'title' => 'TestCase'));
                $this->assertTrue(isset($result['_MOUNT_PAGE']));
                $this->assertSame(array('uid' => 99, 'pid' => 5, 'title' => 'TestCase'), $result['_MOUNT_PAGE']);
        }
@@ -151,8 +151,8 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function processMountedPageForMountPageWithoutOverlayReplacesMountedPageWithMountPage() {
                $mountPointPageData = array('uid' => 99, 'doktype' => \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_MOUNTPOINT, 'mount_pid' => 1, 'mount_pid_ol' => 0);
-               $this->fixture->__construct(1, '1-99');
-               $result = $this->fixture->_call('processMountedPage', array('uid' => 1), $mountPointPageData);
+               $this->subject->__construct(1, '1-99');
+               $result = $this->subject->_call('processMountedPage', array('uid' => 1), $mountPointPageData);
                $this->assertIsSubset($mountPointPageData, $result);
        }
 
@@ -160,7 +160,7 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function columnHasRelationToResolveDetectsGroupFieldAsLocal() {
-               $this->assertFalse($this->fixture->_call('columnHasRelationToResolve', array(
+               $this->assertFalse($this->subject->_call('columnHasRelationToResolve', array(
                        'type' => 'group'
                )));
        }
@@ -169,7 +169,7 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function columnHasRelationToResolveDetectsGroupFieldWithMMAsRemote2() {
-               $this->assertTrue($this->fixture->_call('columnHasRelationToResolve', array(
+               $this->assertTrue($this->subject->_call('columnHasRelationToResolve', array(
                        'config' => array(
                                'type' => 'group',
                                'MM' => 'tx_xyz'
@@ -181,7 +181,7 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function columnHasRelationToResolveDetectsInlineFieldAsLocal() {
-               $this->assertFalse($this->fixture->_call('columnHasRelationToResolve', array(
+               $this->assertFalse($this->subject->_call('columnHasRelationToResolve', array(
                        'config' => array(
                                'type' => 'inline'
                        )
@@ -192,7 +192,7 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function columnHasRelationToResolveDetectsInlineFieldWithForeignKeyAsRemote() {
-               $this->assertTrue($this->fixture->_call('columnHasRelationToResolve', array(
+               $this->assertTrue($this->subject->_call('columnHasRelationToResolve', array(
                        'config' => array(
                                'type' => 'inline',
                                'foreign_field' => 'xyz'
@@ -204,7 +204,7 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function columnHasRelationToResolveDetectsInlineFieldWithFMMAsRemote() {
-               $this->assertTrue($this->fixture->_call('columnHasRelationToResolve', array(
+               $this->assertTrue($this->subject->_call('columnHasRelationToResolve', array(
                        'config' => array(
                                'type' => 'inline',
                                'MM' => 'xyz'
@@ -216,7 +216,7 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function columnHasRelationToResolveDetectsSelectFieldAsLocal() {
-               $this->assertFalse($this->fixture->_call('columnHasRelationToResolve', array(
+               $this->assertFalse($this->subject->_call('columnHasRelationToResolve', array(
                        'config' => array(
                                'type' => 'select'
                        )
@@ -227,7 +227,7 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function columnHasRelationToResolveDetectsSelectFieldWithMMAsRemote() {
-               $this->assertTrue($this->fixture->_call('columnHasRelationToResolve', array(
+               $this->assertTrue($this->subject->_call('columnHasRelationToResolve', array(
                        'config' => array(
                                'type' => 'select',
                                'MM' => 'xyz'
@@ -242,14 +242,14 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $this->pageContextMock->sys_language_uid = 8;
                $this->pageContextMock->versioningWorkspaceId = 15;
                $this->pageContextMock->versioningPreview = TRUE;
-               $this->fixture->__construct(42, '47-11', $this->pageContextMock);
-               $this->assertSame('42_47-11_8_15_1', $this->fixture->getCacheIdentifier());
+               $this->subject->__construct(42, '47-11', $this->pageContextMock);
+               $this->assertSame('42_47-11_8_15_1', $this->subject->getCacheIdentifier());
                $this->pageContextMock->versioningPreview = FALSE;
-               $this->fixture->__construct(42, '47-11', $this->pageContextMock);
-               $this->assertSame('42_47-11_8_15_0', $this->fixture->getCacheIdentifier());
+               $this->subject->__construct(42, '47-11', $this->pageContextMock);
+               $this->assertSame('42_47-11_8_15_0', $this->subject->getCacheIdentifier());
                $this->pageContextMock->versioningWorkspaceId = 0;
-               $this->fixture->__construct(42, '47-11', $this->pageContextMock);
-               $this->assertSame('42_47-11_8_0_0', $this->fixture->getCacheIdentifier());
+               $this->subject->__construct(42, '47-11', $this->pageContextMock);
+               $this->assertSame('42_47-11_8_0_0', $this->subject->getCacheIdentifier());
        }
 
        /**
@@ -261,8 +261,8 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $this->pageContextMock->sys_language_uid = 8;
                $this->pageContextMock->versioningWorkspaceId = 15;
                $this->pageContextMock->versioningPreview = TRUE;
-               $this->fixture->__construct(42, '47-11,48-12', $this->pageContextMock);
-               $this->assertTrue($cacheFrontendMock->isValidEntryIdentifier($this->fixture->getCacheIdentifier()));
+               $this->subject->__construct(42, '47-11,48-12', $this->pageContextMock);
+               $this->assertTrue($cacheFrontendMock->isValidEntryIdentifier($this->subject->getCacheIdentifier()));
        }
 
        /**
@@ -279,7 +279,7 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        '_PAGES_OVERLAY_UID' => '2',
                );
 
-               $this->fixture
+               $this->subject
                        ->expects($this->any())
                        ->method('enrichWithRelationFields')
                        ->with(2, $pageDataTranslated)
@@ -292,7 +292,7 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        ->will(
                                $this->returnValue($pageData)
                        );
-               $this->fixture->_set('databaseConnection',
+               $this->subject->_set('databaseConnection',
                        $databaseConnectionMock
                );
 
@@ -301,8 +301,8 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                                ->method('getPageOverlay')
                                ->will($this->returnValue($pageDataTranslated));
 
-               $this->fixture->_set('languageUid', 1);
-               $this->assertSame($pageDataTranslated, $this->fixture->_call('getRecordArray', 1));
+               $this->subject->_set('languageUid', 1);
+               $this->assertSame($pageDataTranslated, $this->subject->_call('getRecordArray', 1));
        }
 
        /**
index eb7598e..4205837 100644 (file)
@@ -22,21 +22,21 @@ class DocumentFormatTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Documentation\Domain\Model\DocumentFormat
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Documentation\Domain\Model\DocumentFormat();
+               $this->subject = new \TYPO3\CMS\Documentation\Domain\Model\DocumentFormat();
        }
 
        /**
         * @test
         */
        public function setFormatForStringSetsFormat() {
-               $this->fixture->setFormat('Conceived at T3DD13');
+               $this->subject->setFormat('Conceived at T3DD13');
 
                $this->assertSame(
                        'Conceived at T3DD13',
-                       $this->fixture->getFormat()
+                       $this->subject->getFormat()
                );
        }
 
@@ -44,11 +44,11 @@ class DocumentFormatTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function setPathForStringSetsPath() {
-               $this->fixture->setPath('Conceived at T3DD13');
+               $this->subject->setPath('Conceived at T3DD13');
 
                $this->assertSame(
                        'Conceived at T3DD13',
-                       $this->fixture->getPath()
+                       $this->subject->getPath()
                );
        }
 
index 2076223..69a469f 100644 (file)
@@ -22,21 +22,21 @@ class DocumentTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Documentation\Domain\Model\Document
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Documentation\Domain\Model\Document();
+               $this->subject = new \TYPO3\CMS\Documentation\Domain\Model\Document();
        }
 
        /**
         * @test
         */
        public function setPackageKeyForStringSetsPackageKey() {
-               $this->fixture->setPackageKey('Conceived at T3DD13');
+               $this->subject->setPackageKey('Conceived at T3DD13');
 
                $this->assertSame(
                        'Conceived at T3DD13',
-                       $this->fixture->getPackageKey()
+                       $this->subject->getPackageKey()
                );
        }
 
@@ -44,11 +44,11 @@ class DocumentTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function setIconForStringSetsTitle() {
-               $this->fixture->setIcon('Conceived at T3DD13');
+               $this->subject->setIcon('Conceived at T3DD13');
 
                $this->assertSame(
                        'Conceived at T3DD13',
-                       $this->fixture->getIcon()
+                       $this->subject->getIcon()
                );
        }
 
@@ -59,7 +59,7 @@ class DocumentTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $newObjectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $this->assertEquals(
                        $newObjectStorage,
-                       $this->fixture->getTranslations()
+                       $this->subject->getTranslations()
                );
        }
 
@@ -70,11 +70,11 @@ class DocumentTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $translation = new \TYPO3\CMS\Documentation\Domain\Model\DocumentTranslation();
                $objectStorageHoldingExactlyOneTranslations = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $objectStorageHoldingExactlyOneTranslations->attach($translation);
-               $this->fixture->setTranslations($objectStorageHoldingExactlyOneTranslations);
+               $this->subject->setTranslations($objectStorageHoldingExactlyOneTranslations);
 
                $this->assertSame(
                        $objectStorageHoldingExactlyOneTranslations,
-                       $this->fixture->getTranslations()
+                       $this->subject->getTranslations()
                );
        }
 
@@ -85,11 +85,11 @@ class DocumentTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $translation = new \TYPO3\CMS\Documentation\Domain\Model\DocumentTranslation();
                $objectStorageHoldingExactlyOneTranslation = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $objectStorageHoldingExactlyOneTranslation->attach($translation);
-               $this->fixture->addTranslation($translation);
+               $this->subject->addTranslation($translation);
 
                $this->assertEquals(
                        $objectStorageHoldingExactlyOneTranslation,
-                       $this->fixture->getTranslations()
+                       $this->subject->getTranslations()
                );
        }
 
@@ -101,12 +101,12 @@ class DocumentTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $localObjectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $localObjectStorage->attach($translation);
                $localObjectStorage->detach($translation);
-               $this->fixture->addTranslation($translation);
-               $this->fixture->removeTranslation($translation);
+               $this->subject->addTranslation($translation);
+               $this->subject->removeTranslation($translation);
 
                $this->assertEquals(
                        $localObjectStorage,
-                       $this->fixture->getTranslations()
+                       $this->subject->getTranslations()
                );
        }
 
index d3ba9ea..1d81b1e 100644 (file)
@@ -22,21 +22,21 @@ class DocumentTranslationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Documentation\Domain\Model\DocumentTranslation
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Documentation\Domain\Model\DocumentTranslation();
+               $this->subject = new \TYPO3\CMS\Documentation\Domain\Model\DocumentTranslation();
        }
 
        /**
         * @test
         */
        public function setLanguageForStringSetsLocale() {
-               $this->fixture->setLanguage('Conceived at T3DD13');
+               $this->subject->setLanguage('Conceived at T3DD13');
 
                $this->assertSame(
                        'Conceived at T3DD13',
-                       $this->fixture->getLanguage()
+                       $this->subject->getLanguage()
                );
        }
 
@@ -44,11 +44,11 @@ class DocumentTranslationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function setTitleForStringSetsTitle() {
-               $this->fixture->setTitle('Conceived at T3DD13');
+               $this->subject->setTitle('Conceived at T3DD13');
 
                $this->assertSame(
                        'Conceived at T3DD13',
-                       $this->fixture->getTitle()
+                       $this->subject->getTitle()
                );
        }
 
@@ -59,7 +59,7 @@ class DocumentTranslationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $newObjectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $this->assertEquals(
                        $newObjectStorage,
-                       $this->fixture->getFormats()
+                       $this->subject->getFormats()
                );
        }
 
@@ -70,11 +70,11 @@ class DocumentTranslationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $format = new \TYPO3\CMS\Documentation\Domain\Model\DocumentFormat();
                $objectStorageHoldingExactlyOneFormats = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $objectStorageHoldingExactlyOneFormats->attach($format);
-               $this->fixture->setFormats($objectStorageHoldingExactlyOneFormats);
+               $this->subject->setFormats($objectStorageHoldingExactlyOneFormats);
 
                $this->assertSame(
                        $objectStorageHoldingExactlyOneFormats,
-                       $this->fixture->getFormats()
+                       $this->subject->getFormats()
                );
        }
 
@@ -85,11 +85,11 @@ class DocumentTranslationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $format = new \TYPO3\CMS\Documentation\Domain\Model\DocumentFormat();
                $objectStorageHoldingExactlyOneFormat = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $objectStorageHoldingExactlyOneFormat->attach($format);
-               $this->fixture->addFormat($format);
+               $this->subject->addFormat($format);
 
                $this->assertEquals(
                        $objectStorageHoldingExactlyOneFormat,
-                       $this->fixture->getFormats()
+                       $this->subject->getFormats()
                );
        }
 
@@ -101,12 +101,12 @@ class DocumentTranslationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $localObjectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $localObjectStorage->attach($format);
                $localObjectStorage->detach($format);
-               $this->fixture->addFormat($format);
-               $this->fixture->removeFormat($format);
+               $this->subject->addFormat($format);
+               $this->subject->removeFormat($format);
 
                $this->assertEquals(
                        $localObjectStorage,
-                       $this->fixture->getFormats()
+                       $this->subject->getFormats()
                );
        }
 
index a98cc31..3064b95 100644 (file)
@@ -22,17 +22,17 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup();
+               $this->subject = new \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup();
        }
 
        /**
         * @test
         */
        public function getTitleInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getTitle());
+               $this->assertSame('', $this->subject->getTitle());
        }
 
        /**
@@ -40,15 +40,15 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setTitleSetsTitle() {
                $title = 'foo bar';
-               $this->fixture->setTitle($title);
-               $this->assertSame($title, $this->fixture->getTitle());
+               $this->subject->setTitle($title);
+               $this->assertSame($title, $this->subject->getTitle());
        }
 
        /**
         * @test
         */
        public function getDescriptionInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getDescription());
+               $this->assertSame('', $this->subject->getDescription());
        }
 
        /**
@@ -56,8 +56,8 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setDescriptionSetsDescription() {
                $description = 'foo bar';
-               $this->fixture->setDescription($description);
-               $this->assertSame($description, $this->fixture->getDescription());
+               $this->subject->setDescription($description);
+               $this->assertSame($description, $this->subject->getDescription());
        }
 
        /**
@@ -65,8 +65,8 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setSubGroupsSetsSubgroups() {
                $subGroups = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
-               $this->fixture->setSubGroups($subGroups);
-               $this->assertSame($subGroups, $this->fixture->getSubGroups());
+               $this->subject->setSubGroups($subGroups);
+               $this->assertSame($subGroups, $this->subject->getSubGroups());
        }
 
        /**
@@ -77,13 +77,13 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $group1->setTitle('foo');
                $group2 = new \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup();
                $group2->setTitle('bar');
-               $this->fixture->addSubGroup($group1);
-               $this->fixture->addSubGroup($group2);
-               $this->assertEquals(count($this->fixture->getSubGroups()), 2);
-               $this->fixture->removeSubGroup($group1);
-               $this->assertEquals(count($this->fixture->getSubGroups()), 1);
-               $this->fixture->removeSubGroup($group2);
-               $this->assertEquals(count($this->fixture->getSubGroups()), 0);
+               $this->subject->addSubGroup($group1);
+               $this->subject->addSubGroup($group2);
+               $this->assertEquals(count($this->subject->getSubGroups()), 2);
+               $this->subject->removeSubGroup($group1);
+               $this->assertEquals(count($this->subject->getSubGroups()), 1);
+               $this->subject->removeSubGroup($group2);
+               $this->assertEquals(count($this->subject->getSubGroups()), 0);
        }
 
        /**
@@ -94,17 +94,17 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $group1->setTitle('foo');
                $group2 = new \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup();
                $group2->setTitle('bar');
-               $this->fixture->addSubGroup($group1);
-               $this->fixture->addSubGroup($group2);
-               $this->fixture->removeAllSubGroups();
-               $this->assertEquals(count($this->fixture->getSubGroups()), 0);
+               $this->subject->addSubGroup($group1);
+               $this->subject->addSubGroup($group2);
+               $this->subject->removeAllSubGroups();
+               $this->assertEquals(count($this->subject->getSubGroups()), 0);
        }
 
        /**
         * @test
         */
        public function getModulesInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getModules());
+               $this->assertSame('', $this->subject->getModules());
        }
 
        /**
@@ -112,15 +112,15 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setModulesSetsModules() {
                $modules = 'foo,bar';
-               $this->fixture->setModules($modules);
-               $this->assertSame($modules, $this->fixture->getModules());
+               $this->subject->setModules($modules);
+               $this->assertSame($modules, $this->subject->getModules());
        }
 
        /**
         * @test
         */
        public function getTablesListeningInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getTablesListening());
+               $this->assertSame('', $this->subject->getTablesListening());
        }
 
        /**
@@ -128,22 +128,22 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setTablesListeningSetsTablesListening() {
                $tablesListening = 'foo,bar';
-               $this->fixture->setTablesListening($tablesListening);
-               $this->assertSame($tablesListening, $this->fixture->getTablesListening());
+               $this->subject->setTablesListening($tablesListening);
+               $this->assertSame($tablesListening, $this->subject->getTablesListening());
        }
 
        /**
         * @test
         */
        public function getTablesModifyInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getTablesModify());
+               $this->assertSame('', $this->subject->getTablesModify());
        }
 
        /**
         * @test
         */
        public function getPageTypesInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getPageTypes());
+               $this->assertSame('', $this->subject->getPageTypes());
        }
 
        /**
@@ -151,8 +151,8 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setPageTypesSetsPageTypes() {
                $pageTypes = 'foo,bar';
-               $this->fixture->setPageTypes($pageTypes);
-               $this->assertSame($pageTypes, $this->fixture->getPageTypes());
+               $this->subject->setPageTypes($pageTypes);
+               $this->assertSame($pageTypes, $this->subject->getPageTypes());
        }
 
        /**
@@ -160,15 +160,15 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setTablesModifySetsTablesModify() {
                $tablesModify = 'foo,bar';
-               $this->fixture->setTablesModify($tablesModify);
-               $this->assertSame($tablesModify, $this->fixture->getTablesModify());
+               $this->subject->setTablesModify($tablesModify);
+               $this->assertSame($tablesModify, $this->subject->getTablesModify());
        }
 
        /**
         * @test
         */
        public function getAllowedExcludeFieldsInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getAllowedExcludeFields());
+               $this->assertSame('', $this->subject->getAllowedExcludeFields());
        }
 
        /**
@@ -176,15 +176,15 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setAllowedExcludeFieldsSetsAllowedExcludeFields() {
                $allowedExcludeFields = 'foo,bar';
-               $this->fixture->setAllowedExcludeFields($allowedExcludeFields);
-               $this->assertSame($allowedExcludeFields, $this->fixture->getAllowedExcludeFields());
+               $this->subject->setAllowedExcludeFields($allowedExcludeFields);
+               $this->assertSame($allowedExcludeFields, $this->subject->getAllowedExcludeFields());
        }
 
        /**
         * @test
         */
        public function getExplicitlyAllowAndDenyInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getExplicitlyAllowAndDeny());
+               $this->assertSame('', $this->subject->getExplicitlyAllowAndDeny());
        }
 
        /**
@@ -192,15 +192,15 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setExplicitlyAllowAndDenySetsExplicitlyAllowAndDeny() {
                $explicitlyAllowAndDeny = 'foo,bar';
-               $this->fixture->setExplicitlyAllowAndDeny($explicitlyAllowAndDeny);
-               $this->assertSame($explicitlyAllowAndDeny, $this->fixture->getExplicitlyAllowAndDeny());
+               $this->subject->setExplicitlyAllowAndDeny($explicitlyAllowAndDeny);
+               $this->assertSame($explicitlyAllowAndDeny, $this->subject->getExplicitlyAllowAndDeny());
        }
 
        /**
         * @test
         */
        public function getAllowedLanguagesInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getAllowedLanguages());
+               $this->assertSame('', $this->subject->getAllowedLanguages());
        }
 
        /**
@@ -208,30 +208,30 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setAllowedLanguagesSetsAllowedLanguages() {
                $allowedLanguages = '1,0';
-               $this->fixture->setAllowedLanguages($allowedLanguages);
-               $this->assertSame($allowedLanguages, $this->fixture->getAllowedLanguages());
+               $this->subject->setAllowedLanguages($allowedLanguages);
+               $this->assertSame($allowedLanguages, $this->subject->getAllowedLanguages());
        }
 
        /**
         * @test
         */
        public function getWorkspacePermissionInitiallyReturnsFalse() {
-               $this->assertFalse($this->fixture->getWorkspacePermission());
+               $this->assertFalse($this->subject->getWorkspacePermission());
        }
 
        /**
         * @test
         */
        public function setWorkspacePermissionSetsWorkspacePermission() {
-               $this->fixture->setWorkspacePermissions(TRUE);
-               $this->assertTrue($this->fixture->getWorkspacePermission());
+               $this->subject->setWorkspacePermissions(TRUE);
+               $this->assertTrue($this->subject->getWorkspacePermission());
        }
 
        /**
         * @test
         */
        public function getDatabaseMountsInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getDatabaseMounts());
+               $this->assertSame('', $this->subject->getDatabaseMounts());
        }
 
        /**
@@ -239,15 +239,15 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setDatabaseMountsSetsDatabaseMounts() {
                $mounts = '1,42';
-               $this->fixture->setDatabaseMounts($mounts);
-               $this->assertSame($mounts, $this->fixture->getDatabaseMounts());
+               $this->subject->setDatabaseMounts($mounts);
+               $this->assertSame($mounts, $this->subject->getDatabaseMounts());
        }
 
        /**
         * @test
         */
        public function getFileOperationPermissionsInitiallyReturnsZero() {
-               $this->assertSame(0, $this->fixture->getFileOperationPermissions());
+               $this->assertSame(0, $this->subject->getFileOperationPermissions());
        }
 
        /**
@@ -255,170 +255,170 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setFileOperationPermissionsSetsFileOperationPermissions() {
                $permission = 7;
-               $this->fixture->setFileOperationPermissions($permission);
-               $this->assertSame($permission, $this->fixture->getFileOperationPermissions());
+               $this->subject->setFileOperationPermissions($permission);
+               $this->assertSame($permission, $this->subject->getFileOperationPermissions());
        }
 
        /**
         * @test
         */
        public function getIsFileOperationAllowedReturnsFalse() {
-               $this->fixture->setFileOperationPermissions(0);
-               $this->assertFalse($this->fixture->isFileOperationAllowed());
-               $this->fixture->setFileOperationPermissions(2);
-               $this->assertFalse($this->fixture->isFileOperationAllowed());
-               $this->fixture->setFileOperationPermissions(6);
-               $this->assertFalse($this->fixture->isFileOperationAllowed());
+               $this->subject->setFileOperationPermissions(0);
+               $this->assertFalse($this->subject->isFileOperationAllowed());
+               $this->subject->setFileOperationPermissions(2);
+               $this->assertFalse($this->subject->isFileOperationAllowed());
+               $this->subject->setFileOperationPermissions(6);
+               $this->assertFalse($this->subject->isFileOperationAllowed());
        }
 
        /**
         * @test
         */
        public function getIsFileOperationAllowedReturnsTrue() {
-               $this->fixture->setFileOperationPermissions(1);
-               $this->assertTrue($this->fixture->isFileOperationAllowed());
-               $this->fixture->setFileOperationPermissions(3);
-               $this->assertTrue($this->fixture->isFileOperationAllowed());
+               $this->subject->setFileOperationPermissions(1);
+               $this->assertTrue($this->subject->isFileOperationAllowed());
+               $this->subject->setFileOperationPermissions(3);
+               $this->assertTrue($this->subject->isFileOperationAllowed());
        }
 
        /**
         * @test
         */
        public function setFileOperationAllowedSetsFileOperationAllowed() {
-               $this->fixture->setFileOperationPermissions(0);
-               $this->fixture->setFileOperationAllowed(TRUE);
-               $this->assertTrue($this->fixture->isFileOperationAllowed());
+               $this->subject->setFileOperationPermissions(0);
+               $this->subject->setFileOperationAllowed(TRUE);
+               $this->assertTrue($this->subject->isFileOperationAllowed());
        }
 
        /**
         * @test
         */
        public function getIsFileUnzipAllowedReturnsFalse() {
-               $this->fixture->setFileOperationPermissions(0);
-               $this->assertFalse($this->fixture->isFileUnzipAllowed());
-               $this->fixture->setFileOperationPermissions(1);
-               $this->assertFalse($this->fixture->isFileUnzipAllowed());
-               $this->fixture->setFileOperationPermissions(5);
-               $this->assertFalse($this->fixture->isFileUnzipAllowed());
+               $this->subject->setFileOperationPermissions(0);
+               $this->assertFalse($this->subject->isFileUnzipAllowed());
+               $this->subject->setFileOperationPermissions(1);
+               $this->assertFalse($this->subject->isFileUnzipAllowed());
+               $this->subject->setFileOperationPermissions(5);
+               $this->assertFalse($this->subject->isFileUnzipAllowed());
        }
 
        /**
         * @test
         */
        public function getIsFileUnzipAllowedReturnsTrue() {
-               $this->fixture->setFileOperationPermissions(2);
-               $this->assertTrue($this->fixture->isFileUnzipAllowed());
-               $this->fixture->setFileOperationPermissions(3);
-               $this->assertTrue($this->fixture->isFileUnzipAllowed());
+               $this->subject->setFileOperationPermissions(2);
+               $this->assertTrue($this->subject->isFileUnzipAllowed());
+               $this->subject->setFileOperationPermissions(3);
+               $this->assertTrue($this->subject->isFileUnzipAllowed());
        }
 
        /**
         * @test
         */
        public function setFileUnzipAllowedSetsFileUnzipAllowed() {
-               $this->fixture->setFileOperationPermissions(0);
-               $this->fixture->setFileUnzipAllowed(TRUE);
-               $this->assertTrue($this->fixture->isFileUnzipAllowed());
+               $this->subject->setFileOperationPermissions(0);
+               $this->subject->setFileUnzipAllowed(TRUE);
+               $this->assertTrue($this->subject->isFileUnzipAllowed());
        }
 
        /**
         * @test
         */
        public function getIsDirectoryRemoveRecursivelyAllowedReturnsFalse() {
-               $this->fixture->setFileOperationPermissions(1);
-               $this->assertFalse($this->fixture->isDirectoryRemoveRecursivelyAllowed());
-               $this->fixture->setFileOperationPermissions(15);
-               $this->assertFalse($this->fixture->isDirectoryRemoveRecursivelyAllowed());
-               $this->fixture->setFileOperationPermissions(7);
-               $this->assertFalse($this->fixture->isDirectoryRemoveRecursivelyAllowed());
+               $this->subject->setFileOperationPermissions(1);
+               $this->assertFalse($this->subject->isDirectoryRemoveRecursivelyAllowed());
+               $this->subject->setFileOperationPermissions(15);
+               $this->assertFalse($this->subject->isDirectoryRemoveRecursivelyAllowed());
+               $this->subject->setFileOperationPermissions(7);
+               $this->assertFalse($this->subject->isDirectoryRemoveRecursivelyAllowed());
        }
 
        /**
         * @test
         */
        public function getIsDirectoryRemoveRecursivelyAllowedReturnsTrue() {
-               $this->fixture->setFileOperationPermissions(16);
-               $this->assertTrue($this->fixture->isDirectoryRemoveRecursivelyAllowed());
-               $this->fixture->setFileOperationPermissions(31);
-               $this->assertTrue($this->fixture->isDirectoryRemoveRecursivelyAllowed());
+               $this->subject->setFileOperationPermissions(16);
+               $this->assertTrue($this->subject->isDirectoryRemoveRecursivelyAllowed());
+               $this->subject->setFileOperationPermissions(31);
+               $this->assertTrue($this->subject->isDirectoryRemoveRecursivelyAllowed());
        }
 
        /**
         * @test
         */
        public function setDirectoryRemoveRecursivelyAllowedSetsDirectoryRemoveRecursivelyAllowed() {
-               $this->fixture->setFileOperationPermissions(0);
-               $this->fixture->setDirectoryRemoveRecursivelyAllowed(TRUE);
-               $this->assertTrue($this->fixture->isDirectoryRemoveRecursivelyAllowed());
+               $this->subject->setFileOperationPermissions(0);
+               $this->subject->setDirectoryRemoveRecursivelyAllowed(TRUE);
+               $this->assertTrue($this->subject->isDirectoryRemoveRecursivelyAllowed());
        }
 
        /**
         * @test
         */
        public function getIsDirectoryCopyAllowedReturnsFalse() {
-               $this->fixture->setFileOperationPermissions(0);
-               $this->assertFalse($this->fixture->isDirectoryCopyAllowed());
-               $this->fixture->setFileOperationPermissions(7);
-               $this->assertFalse($this->fixture->isDirectoryCopyAllowed());
-               $this->fixture->setFileOperationPermissions(23);
-               $this->assertFalse($this->fixture->isDirectoryCopyAllowed());
+               $this->subject->setFileOperationPermissions(0);
+               $this->assertFalse($this->subject->isDirectoryCopyAllowed());
+               $this->subject->setFileOperationPermissions(7);
+               $this->assertFalse($this->subject->isDirectoryCopyAllowed());
+               $this->subject->setFileOperationPermissions(23);
+               $this->assertFalse($this->subject->isDirectoryCopyAllowed());
        }
 
        /**
         * @test
         */
        public function getIsDirectoryCopyAllowedReturnsTrue() {
-               $this->fixture->setFileOperationPermissions(8);
-               $this->assertTrue($this->fixture->isDirectoryCopyAllowed());
-               $this->fixture->setFileOperationPermissions(15);
-               $this->assertTrue($this->fixture->isDirectoryCopyAllowed());
+               $this->subject->setFileOperationPermissions(8);
+               $this->assertTrue($this->subject->isDirectoryCopyAllowed());
+               $this->subject->setFileOperationPermissions(15);
+               $this->assertTrue($this->subject->isDirectoryCopyAllowed());
        }
 
        /**
         * @test
         */
        public function setDirectoryCopyAllowedSetsDirectoryCopyAllowed() {
-               $this->fixture->setFileOperationPermissions(0);
-               $this->fixture->setDirectoryCopyAllowed(TRUE);
-               $this->assertTrue($this->fixture->isDirectoryCopyAllowed());
+               $this->subject->setFileOperationPermissions(0);
+               $this->subject->setDirectoryCopyAllowed(TRUE);
+               $this->assertTrue($this->subject->isDirectoryCopyAllowed());
        }
 
        /**
         * @test
         */
        public function getIsDirectoryOperationAllowedReturnsFalse() {
-               $this->fixture->setFileOperationPermissions(0);
-               $this->assertFalse($this->fixture->isDirectoryOperationAllowed());
-               $this->fixture->setFileOperationPermissions(3);
-               $this->assertFalse($this->fixture->isDirectoryOperationAllowed());
-               $this->fixture->setFileOperationPermissions(11);
-               $this->assertFalse($this->fixture->isDirectoryOperationAllowed());
+               $this->subject->setFileOperationPermissions(0);
+               $this->assertFalse($this->subject->isDirectoryOperationAllowed());
+               $this->subject->setFileOperationPermissions(3);
+               $this->assertFalse($this->subject->isDirectoryOperationAllowed());
+               $this->subject->setFileOperationPermissions(11);
+               $this->assertFalse($this->subject->isDirectoryOperationAllowed());
        }
 
        /**
         * @test
         */
        public function getIsDirectoryOperationAllowedReturnsTrue() {
-               $this->fixture->setFileOperationPermissions(4);
-               $this->assertTrue($this->fixture->isDirectoryOperationAllowed());
-               $this->fixture->setFileOperationPermissions(7);
-               $this->assertTrue($this->fixture->isDirectoryOperationAllowed());
+               $this->subject->setFileOperationPermissions(4);
+               $this->assertTrue($this->subject->isDirectoryOperationAllowed());
+               $this->subject->setFileOperationPermissions(7);
+               $this->assertTrue($this->subject->isDirectoryOperationAllowed());
        }
 
        /**
         * @test
         */
        public function setDirectoryOperationAllowedSetsDirectoryOperationAllowed() {
-               $this->fixture->setFileOperationPermissions(0);
-               $this->fixture->setDirectoryoperationAllowed(TRUE);
-               $this->assertTrue($this->fixture->isDirectoryOperationAllowed());
+               $this->subject->setFileOperationPermissions(0);
+               $this->subject->setDirectoryoperationAllowed(TRUE);
+               $this->assertTrue($this->subject->isDirectoryOperationAllowed());
        }
 
        /**
         * @test
         */
        public function getLockToDomainInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getLockToDomain());
+               $this->assertSame('', $this->subject->getLockToDomain());
        }
 
        /**
@@ -426,30 +426,30 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setLockToDomainSetsLockToDomain() {
                $lockToDomain = 'foo.bar';
-               $this->fixture->setLockToDomain($lockToDomain);
-               $this->assertSame($lockToDomain, $this->fixture->getLockToDomain());
+               $this->subject->setLockToDomain($lockToDomain);
+               $this->assertSame($lockToDomain, $this->subject->getLockToDomain());
        }
 
        /**
         * @test
         */
        public function getHideInListInitiallyReturnsFalse() {
-               $this->assertFalse($this->fixture->getHideInList());
+               $this->assertFalse($this->subject->getHideInList());
        }
 
        /**
         * @test
         */
        public function setHideInListSetsHideInList() {
-               $this->fixture->setHideInList(TRUE);
-               $this->assertTrue($this->fixture->getHideInList());
+               $this->subject->setHideInList(TRUE);
+               $this->assertTrue($this->subject->getHideInList());
        }
 
        /**
         * @test
         */
        public function getTsConfigInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getTsConfig());
+               $this->assertSame('', $this->subject->getTsConfig());
        }
 
        /**
@@ -457,8 +457,8 @@ class BackendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setTsConfigSetsTsConfig() {
                $tsConfig = 'foo bar';
-               $this->fixture->setTsConfig($tsConfig);
-               $this->assertSame($tsConfig, $this->fixture->getTsConfig());
+               $this->subject->setTsConfig($tsConfig);
+               $this->assertSame($tsConfig, $this->subject->getTsConfig());
        }
 
 }
index b5d8f47..991a4f3 100644 (file)
@@ -22,17 +22,17 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Extbase\Domain\Model\BackendUser
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Extbase\Domain\Model\BackendUser();
+               $this->subject = new \TYPO3\CMS\Extbase\Domain\Model\BackendUser();
        }
 
        /**
         * @test
         */
        public function getUserNameInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getUserName());
+               $this->assertSame('', $this->subject->getUserName());
        }
 
        /**
@@ -40,45 +40,45 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setUserNameSetsUserName() {
                $userName = 'don.juan';
-               $this->fixture->setUserName($userName);
-               $this->assertSame($userName, $this->fixture->getUserName());
+               $this->subject->setUserName($userName);
+               $this->assertSame($userName, $this->subject->getUserName());
        }
 
        /**
         * @test
         */
        public function getIsAdministratorInitiallyReturnsFalse() {
-               $this->assertFalse($this->fixture->getIsAdministrator());
+               $this->assertFalse($this->subject->getIsAdministrator());
        }
 
        /**
         * @test
         */
        public function setIsAdministratorCanSetIsAdministratorToTrue() {
-               $this->fixture->setIsAdministrator(TRUE);
-               $this->assertTrue($this->fixture->getIsAdministrator());
+               $this->subject->setIsAdministrator(TRUE);
+               $this->assertTrue($this->subject->getIsAdministrator());
        }
 
        /**
         * @test
         */
        public function getIsDisabledInitiallyReturnsFalse() {
-               $this->assertFalse($this->fixture->getIsDisabled());
+               $this->assertFalse($this->subject->getIsDisabled());
        }
 
        /**
         * @test
         */
        public function setIsDisabledCanSetIsDisabledToTrue() {
-               $this->fixture->setIsDisabled(TRUE);
-               $this->assertTrue($this->fixture->getIsDisabled());
+               $this->subject->setIsDisabled(TRUE);
+               $this->assertTrue($this->subject->getIsDisabled());
        }
 
        /**
         * @test
         */
        public function getStartDateAndTimeInitiallyReturnsNull() {
-               $this->assertNull($this->fixture->getStartDateAndTime());
+               $this->assertNull($this->subject->getStartDateAndTime());
        }
 
        /**
@@ -86,15 +86,15 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setStartDateAndTimeSetsStartDateAndTime() {
                $date = new \DateTime();
-               $this->fixture->setStartDateAndTime($date);
-               $this->assertSame($date, $this->fixture->getStartDateAndTime());
+               $this->subject->setStartDateAndTime($date);
+               $this->assertSame($date, $this->subject->getStartDateAndTime());
        }
 
        /**
         * @test
         */
        public function getEndDateAndTimeInitiallyReturnsNull() {
-               $this->assertNull($this->fixture->getEndDateAndTime());
+               $this->assertNull($this->subject->getEndDateAndTime());
        }
 
        /**
@@ -102,23 +102,23 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setEndDateAndTimeSetsEndDateAndTime() {
                $date = new \DateTime();
-               $this->fixture->setEndDateAndTime($date);
-               $this->assertSame($date, $this->fixture->getEndDateAndTime());
+               $this->subject->setEndDateAndTime($date);
+               $this->assertSame($date, $this->subject->getEndDateAndTime());
        }
 
        /**
         * @test
         */
        public function isActivatedInitiallyReturnsTrue() {
-               $this->assertTrue($this->fixture->isActivated());
+               $this->assertTrue($this->subject->isActivated());
        }
 
        /**
         * @test
         */
        public function isActivatedForDisabledReturnsFalse() {
-               $this->fixture->setIsDisabled(TRUE);
-               $this->assertFalse($this->fixture->isActivated());
+               $this->subject->setIsDisabled(TRUE);
+               $this->assertFalse($this->subject->isActivated());
        }
 
        /**
@@ -126,8 +126,8 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isActivatedForStartDateAndTimeInFutureReturnsFalse() {
                $tomorrow = new \DateTime('tomorrow');
-               $this->fixture->setStartDateAndTime($tomorrow);
-               $this->assertFalse($this->fixture->isActivated());
+               $this->subject->setStartDateAndTime($tomorrow);
+               $this->assertFalse($this->subject->isActivated());
        }
 
        /**
@@ -135,8 +135,8 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isActivatedForStartDateAndTimeInPastReturnsTrue() {
                $yesterday = new \DateTime('yesterday');
-               $this->fixture->setStartDateAndTime($yesterday);
-               $this->assertTrue($this->fixture->isActivated());
+               $this->subject->setStartDateAndTime($yesterday);
+               $this->assertTrue($this->subject->isActivated());
        }
 
        /**
@@ -144,8 +144,8 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isActivatedForEndDateAndTimeInFutureReturnsTrue() {
                $tomorrow = new \DateTime('tomorrow');
-               $this->fixture->setEndDateAndTime($tomorrow);
-               $this->assertTrue($this->fixture->isActivated());
+               $this->subject->setEndDateAndTime($tomorrow);
+               $this->assertTrue($this->subject->isActivated());
        }
 
        /**
@@ -153,8 +153,8 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isActivatedForEndDateAndTimeInPastReturnsFalse() {
                $yesterday = new \DateTime('yesterday');
-               $this->fixture->setEndDateAndTime($yesterday);
-               $this->assertFalse($this->fixture->isActivated());
+               $this->subject->setEndDateAndTime($yesterday);
+               $this->assertFalse($this->subject->isActivated());
        }
 
        /**
@@ -162,10 +162,10 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isActivatedForStartDateAndTimeInPastEndDateAndTimeInFutureReturnsTrue() {
                $yesterday = new \DateTime('yesterday');
-               $this->fixture->setStartDateAndTime($yesterday);
+               $this->subject->setStartDateAndTime($yesterday);
                $tomorrow = new \DateTime('tomorrow');
-               $this->fixture->setEndDateAndTime($tomorrow);
-               $this->assertTrue($this->fixture->isActivated());
+               $this->subject->setEndDateAndTime($tomorrow);
+               $this->assertTrue($this->subject->isActivated());
        }
 
        /**
@@ -173,9 +173,9 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isActivatedForStartDateAndTimeInPastEndDateAndTimeInPastReturnsFalse() {
                $yesterday = new \DateTime('yesterday');
-               $this->fixture->setStartDateAndTime($yesterday);
-               $this->fixture->setEndDateAndTime($yesterday);
-               $this->assertFalse($this->fixture->isActivated());
+               $this->subject->setStartDateAndTime($yesterday);
+               $this->subject->setEndDateAndTime($yesterday);
+               $this->assertFalse($this->subject->isActivated());
        }
 
        /**
@@ -183,16 +183,16 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function isActivatedForStartDateAndTimeInFutureEndDateAndTimeInFutureReturnsFalse() {
                $tomorrow = new \DateTime('tomorrow');
-               $this->fixture->setStartDateAndTime($tomorrow);
-               $this->fixture->setEndDateAndTime($tomorrow);
-               $this->assertFalse($this->fixture->isActivated());
+               $this->subject->setStartDateAndTime($tomorrow);
+               $this->subject->setEndDateAndTime($tomorrow);
+               $this->assertFalse($this->subject->isActivated());
        }
 
        /**
         * @test
         */
        public function getEmailInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getEmail());
+               $this->assertSame('', $this->subject->getEmail());
        }
 
        /**
@@ -200,15 +200,15 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setEmailSetsEmail() {
                $email = 'don.juan@example.com';
-               $this->fixture->setEmail($email);
-               $this->assertSame($email, $this->fixture->getEmail());
+               $this->subject->setEmail($email);
+               $this->assertSame($email, $this->subject->getEmail());
        }
 
        /**
         * @test
         */
        public function getRealNameInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getRealName());
+               $this->assertSame('', $this->subject->getRealName());
        }
 
        /**
@@ -216,30 +216,30 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setRealNameSetsRealName() {
                $realName = 'Don Juan';
-               $this->fixture->setRealName($realName);
-               $this->assertSame($realName, $this->fixture->getRealName());
+               $this->subject->setRealName($realName);
+               $this->assertSame($realName, $this->subject->getRealName());
        }
 
        /**
         * @test
         */
        public function getIpLockIsDisabledInitiallyReturnsFalse() {
-               $this->assertFalse($this->fixture->getIpLockIsDisabled());
+               $this->assertFalse($this->subject->getIpLockIsDisabled());
        }
 
        /**
         * @test
         */
        public function setIpLockIsDisabledCanSetIpLockIsDisabledToTrue() {
-               $this->fixture->setIpLockIsDisabled(TRUE);
-               $this->assertTrue($this->fixture->getIpLockIsDisabled());
+               $this->subject->setIpLockIsDisabled(TRUE);
+               $this->assertTrue($this->subject->getIpLockIsDisabled());
        }
 
        /**
         * @test
         */
        public function getLastLoginDateAndTimeInitiallyReturnsNull() {
-               $this->assertNull($this->fixture->getLastLoginDateAndTime());
+               $this->assertNull($this->subject->getLastLoginDateAndTime());
        }
 
        /**
@@ -247,8 +247,8 @@ class BackendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setLastLoginDateAndTimeSetsLastLoginDateAndTime() {
                $date = new \DateTime();
-               $this->fixture->setLastLoginDateAndTime($date);
-               $this->assertSame($date, $this->fixture->getLastLoginDateAndTime());
+               $this->subject->setLastLoginDateAndTime($date);
+               $this->assertSame($date, $this->subject->getLastLoginDateAndTime());
        }
 
 }
index 973f2bd..46fbf66 100644 (file)
@@ -22,17 +22,17 @@ class FileMountTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Extbase\Domain\Model\FileMount
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Extbase\Domain\Model\FileMount();
+               $this->subject = new \TYPO3\CMS\Extbase\Domain\Model\FileMount();
        }
 
        /**
         * @test
         */
        public function getTitleInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getTitle());
+               $this->assertSame('', $this->subject->getTitle());
        }
 
        /**
@@ -40,15 +40,15 @@ class FileMountTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setTitleSetsTitle() {
                $title = 'foobar mount';
-               $this->fixture->setTitle($title);
-               $this->assertSame($title, $this->fixture->getTitle());
+               $this->subject->setTitle($title);
+               $this->assertSame($title, $this->subject->getTitle());
        }
 
        /**
         * @test
         */
        public function getPathInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getPath());
+               $this->assertSame('', $this->subject->getPath());
        }
 
        /**
@@ -56,23 +56,23 @@ class FileMountTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setPathSetsPath() {
                $path = 'foo/bar/';
-               $this->fixture->setPath($path);
-               $this->assertSame($path, $this->fixture->getPath());
+               $this->subject->setPath($path);
+               $this->assertSame($path, $this->subject->getPath());
        }
 
        /**
         * @test
         */
        public function getIsAbsolutePathInitiallyReturnsFalse() {
-               $this->assertFalse($this->fixture->getIsAbsolutePath());
+               $this->assertFalse($this->subject->getIsAbsolutePath());
        }
 
        /**
         * @test
         */
        public function setIsAbsolutePathCanSetBaseIsAbsolutePathToTrue() {
-               $this->fixture->setIsAbsolutePath(TRUE);
-               $this->assertTrue($this->fixture->getIsAbsolutePath());
+               $this->subject->setIsAbsolutePath(TRUE);
+               $this->assertTrue($this->subject->getIsAbsolutePath());
        }
 
 }
index bf394dc..dbadb9c 100644 (file)
@@ -22,18 +22,18 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup();
+               $this->subject = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup();
        }
 
        /**
         * @test
         */
        public function getTitleInitiallyReturnsEmptyString() {
-               $this->fixture = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup();
-               $this->assertSame('', $this->fixture->getTitle());
+               $this->subject = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup();
+               $this->assertSame('', $this->subject->getTitle());
        }
 
        /**
@@ -41,8 +41,8 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getTitleInitiallyReturnsGivenTitleFromConstruct() {
                $title = 'foo bar';
-               $this->fixture = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup($title);
-               $this->assertSame($title, $this->fixture->getTitle());
+               $this->subject = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup($title);
+               $this->assertSame($title, $this->subject->getTitle());
        }
 
        /**
@@ -50,15 +50,15 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setTitleSetsTitle() {
                $title = 'foo bar';
-               $this->fixture->setTitle($title);
-               $this->assertSame($title, $this->fixture->getTitle());
+               $this->subject->setTitle($title);
+               $this->assertSame($title, $this->subject->getTitle());
        }
 
        /**
         * @test
         */
        public function getLockToDomainInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getLockToDomain());
+               $this->assertSame('', $this->subject->getLockToDomain());
        }
 
        /**
@@ -66,15 +66,15 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setLockToDomainSetsLockToDomain() {
                $lockToDomain = 'foo.bar';
-               $this->fixture->setLockToDomain($lockToDomain);
-               $this->assertSame($lockToDomain, $this->fixture->getLockToDomain());
+               $this->subject->setLockToDomain($lockToDomain);
+               $this->assertSame($lockToDomain, $this->subject->getLockToDomain());
        }
 
        /**
         * @test
         */
        public function getDescriptionInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getDescription());
+               $this->assertSame('', $this->subject->getDescription());
        }
 
        /**
@@ -82,8 +82,8 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setDescriptionSetsDescription() {
                $description = 'foo bar';
-               $this->fixture->setDescription($description);
-               $this->assertSame($description, $this->fixture->getDescription());
+               $this->subject->setDescription($description);
+               $this->assertSame($description, $this->subject->getDescription());
        }
 
        /**
@@ -91,9 +91,9 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function addSubgroupAddsSubgroup() {
                $group1 = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup('foo');
-               $this->assertEquals(count($this->fixture->getSubgroup()), 0);
-               $this->fixture->addSubgroup($group1);
-               $this->assertEquals(count($this->fixture->getSubgroup()), 1);
+               $this->assertEquals(count($this->subject->getSubgroup()), 0);
+               $this->subject->addSubgroup($group1);
+               $this->assertEquals(count($this->subject->getSubgroup()), 1);
        }
 
        /**
@@ -102,13 +102,13 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function removeSubgroupRemovesSubgroup() {
                $group1 = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup('foo');
                $group2 = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup('bar');
-               $this->fixture->addSubgroup($group1);
-               $this->fixture->addSubgroup($group2);
-               $this->assertEquals(count($this->fixture->getSubgroup()), 2);
-               $this->fixture->removeSubgroup($group1);
-               $this->assertEquals(count($this->fixture->getSubgroup()), 1);
-               $this->fixture->removeSubgroup($group2);
-               $this->assertEquals(count($this->fixture->getSubgroup()), 0);
+               $this->subject->addSubgroup($group1);
+               $this->subject->addSubgroup($group2);
+               $this->assertEquals(count($this->subject->getSubgroup()), 2);
+               $this->subject->removeSubgroup($group1);
+               $this->assertEquals(count($this->subject->getSubgroup()), 1);
+               $this->subject->removeSubgroup($group2);
+               $this->assertEquals(count($this->subject->getSubgroup()), 0);
        }
 
        /**
@@ -118,8 +118,8 @@ class FrontendUserGroupTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $subgroup = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $group = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup('foo');
                $subgroup->attach($group);
-               $this->fixture->setSubgroup($subgroup);
-               $this->assertSame($subgroup, $this->fixture->getSubgroup());
+               $this->subject->setSubgroup($subgroup);
+               $this->assertSame($subgroup, $this->subject->getSubgroup());
        }
 
 }
index 7f2f2bb..8c98df6 100644 (file)
@@ -22,17 +22,17 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Extbase\Domain\Model\FrontendUser
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUser();
+               $this->subject = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUser();
        }
 
        /**
         * @test
         */
        public function getUsernameInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getUsername());
+               $this->assertSame('', $this->subject->getUsername());
        }
 
        /**
@@ -40,15 +40,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setUsernameSetsUsername() {
                $username = 'don.juan';
-               $this->fixture->setUsername($username);
-               $this->assertSame($username, $this->fixture->getUsername());
+               $this->subject->setUsername($username);
+               $this->assertSame($username, $this->subject->getUsername());
        }
 
        /**
         * @test
         */
        public function getPasswordInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getPassword());
+               $this->assertSame('', $this->subject->getPassword());
        }
 
        /**
@@ -56,8 +56,8 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setPasswordSetsPassword() {
                $password = 'f00Bar';
-               $this->fixture->setPassword($password);
-               $this->assertSame($password, $this->fixture->getPassword());
+               $this->subject->setPassword($password);
+               $this->assertSame($password, $this->subject->getPassword());
        }
 
        /**
@@ -66,8 +66,8 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function setUsergroupSetsUsergroup() {
                $usergroup = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
                $usergroup->attach(new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup('foo'));
-               $this->fixture->setUsergroup($usergroup);
-               $this->assertSame($usergroup, $this->fixture->getUsergroup());
+               $this->subject->setUsergroup($usergroup);
+               $this->assertSame($usergroup, $this->subject->getUsergroup());
        }
 
        /**
@@ -75,9 +75,9 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function addUsergroupAddsUserGroup() {
                $usergroup = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup('foo');
-               $this->assertEquals(count($this->fixture->getUsergroup()), 0);
-               $this->fixture->addUsergroup($usergroup);
-               $this->assertEquals(count($this->fixture->getUsergroup()), 1);
+               $this->assertEquals(count($this->subject->getUsergroup()), 0);
+               $this->subject->addUsergroup($usergroup);
+               $this->assertEquals(count($this->subject->getUsergroup()), 1);
        }
 
        /**
@@ -85,17 +85,17 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function removeUsergroupRemovesUsergroup() {
                $usergroup = new \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup('foo');
-               $this->fixture->addUsergroup($usergroup);
-               $this->assertEquals(count($this->fixture->getUsergroup()), 1);
-               $this->fixture->removeUsergroup($usergroup);
-               $this->assertEquals(count($this->fixture->getUsergroup()), 0);
+               $this->subject->addUsergroup($usergroup);
+               $this->assertEquals(count($this->subject->getUsergroup()), 1);
+               $this->subject->removeUsergroup($usergroup);
+               $this->assertEquals(count($this->subject->getUsergroup()), 0);
        }
 
        /**
         * @test
         */
        public function getNameInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getName());
+               $this->assertSame('', $this->subject->getName());
        }
 
        /**
@@ -103,15 +103,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setNameSetsName() {
                $name = 'don juan';
-               $this->fixture->setName($name);
-               $this->assertSame($name, $this->fixture->getName());
+               $this->subject->setName($name);
+               $this->assertSame($name, $this->subject->getName());
        }
 
        /**
         * @test
         */
        public function getFirstNameInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getFirstName());
+               $this->assertSame('', $this->subject->getFirstName());
        }
 
        /**
@@ -119,15 +119,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setFirstNameSetsFirstName() {
                $firstName = 'don';
-               $this->fixture->setFirstName($firstName);
-               $this->assertSame($firstName, $this->fixture->getFirstName());
+               $this->subject->setFirstName($firstName);
+               $this->assertSame($firstName, $this->subject->getFirstName());
        }
 
        /**
         * @test
         */
        public function getMiddleNameInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getMiddleName());
+               $this->assertSame('', $this->subject->getMiddleName());
        }
 
        /**
@@ -135,15 +135,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setMiddleNameSetsMiddleName() {
                $middleName = 'miguel';
-               $this->fixture->setMiddleName($middleName);
-               $this->assertSame($middleName, $this->fixture->getMiddleName());
+               $this->subject->setMiddleName($middleName);
+               $this->assertSame($middleName, $this->subject->getMiddleName());
        }
 
        /**
         * @test
         */
        public function getLastNameInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getLastName());
+               $this->assertSame('', $this->subject->getLastName());
        }
 
        /**
@@ -151,15 +151,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setLastNameSetsLastName() {
                $lastName = 'juan';
-               $this->fixture->setLastName($lastName);
-               $this->assertSame($lastName, $this->fixture->getLastName());
+               $this->subject->setLastName($lastName);
+               $this->assertSame($lastName, $this->subject->getLastName());
        }
 
        /**
         * @test
         */
        public function getAddressInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getAddress());
+               $this->assertSame('', $this->subject->getAddress());
        }
 
        /**
@@ -167,15 +167,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setAddressSetsAddress() {
                $address = 'foobar 42, foo';
-               $this->fixture->setAddress($address);
-               $this->assertSame($address, $this->fixture->getAddress());
+               $this->subject->setAddress($address);
+               $this->assertSame($address, $this->subject->getAddress());
        }
 
        /**
         * @test
         */
        public function getTelephoneInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getTelephone());
+               $this->assertSame('', $this->subject->getTelephone());
        }
 
        /**
@@ -183,15 +183,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setTelephoneSetsTelephone() {
                $telephone = '42';
-               $this->fixture->setTelephone($telephone);
-               $this->assertSame($telephone, $this->fixture->getTelephone());
+               $this->subject->setTelephone($telephone);
+               $this->assertSame($telephone, $this->subject->getTelephone());
        }
 
        /**
         * @test
         */
        public function getFaxInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getFax());
+               $this->assertSame('', $this->subject->getFax());
        }
 
        /**
@@ -199,15 +199,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setFaxSetsFax() {
                $fax = '42';
-               $this->fixture->setFax($fax);
-               $this->assertSame($fax, $this->fixture->getFax());
+               $this->subject->setFax($fax);
+               $this->assertSame($fax, $this->subject->getFax());
        }
 
        /**
         * @test
         */
        public function getEmailInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getEmail());
+               $this->assertSame('', $this->subject->getEmail());
        }
 
        /**
@@ -215,15 +215,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setEmailSetsEmail() {
                $email = 'don.juan@example.com';
-               $this->fixture->setEmail($email);
-               $this->assertSame($email, $this->fixture->getEmail());
+               $this->subject->setEmail($email);
+               $this->assertSame($email, $this->subject->getEmail());
        }
 
        /**
         * @test
         */
        public function getLockToDomainInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getLockToDomain());
+               $this->assertSame('', $this->subject->getLockToDomain());
        }
 
        /**
@@ -231,15 +231,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setLockToDomainSetsLockToDomain() {
                $lockToDomain = 'foo.bar';
-               $this->fixture->setLockToDomain($lockToDomain);
-               $this->assertSame($lockToDomain, $this->fixture->getLockToDomain());
+               $this->subject->setLockToDomain($lockToDomain);
+               $this->assertSame($lockToDomain, $this->subject->getLockToDomain());
        }
 
        /**
         * @test
         */
        public function getTitleInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getTitle());
+               $this->assertSame('', $this->subject->getTitle());
        }
 
        /**
@@ -247,15 +247,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setTitleSetsTitle() {
                $title = 'foobar';
-               $this->fixture->setTitle($title);
-               $this->assertSame($title, $this->fixture->getTitle());
+               $this->subject->setTitle($title);
+               $this->assertSame($title, $this->subject->getTitle());
        }
 
        /**
         * @test
         */
        public function getZipInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getZip());
+               $this->assertSame('', $this->subject->getZip());
        }
 
        /**
@@ -263,15 +263,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setZipSetsZip() {
                $zip = '42';
-               $this->fixture->setZip($zip);
-               $this->assertSame($zip, $this->fixture->getZip());
+               $this->subject->setZip($zip);
+               $this->assertSame($zip, $this->subject->getZip());
        }
 
        /**
         * @test
         */
        public function getCityInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getCity());
+               $this->assertSame('', $this->subject->getCity());
        }
 
        /**
@@ -279,15 +279,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setCitySetsCity() {
                $city = 'foo';
-               $this->fixture->setCity($city);
-               $this->assertSame($city, $this->fixture->getCity());
+               $this->subject->setCity($city);
+               $this->assertSame($city, $this->subject->getCity());
        }
 
        /**
         * @test
         */
        public function getCountryInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getCountry());
+               $this->assertSame('', $this->subject->getCountry());
        }
 
        /**
@@ -295,15 +295,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setCountrySetsCountry() {
                $country = 'foo';
-               $this->fixture->setCountry($country);
-               $this->assertSame($country, $this->fixture->getCountry());
+               $this->subject->setCountry($country);
+               $this->assertSame($country, $this->subject->getCountry());
        }
 
        /**
         * @test
         */
        public function getWwwInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getWww());
+               $this->assertSame('', $this->subject->getWww());
        }
 
        /**
@@ -311,15 +311,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setWwwSetsWww() {
                $www = 'foo.bar';
-               $this->fixture->setWww($www);
-               $this->assertSame($www, $this->fixture->getWww());
+               $this->subject->setWww($www);
+               $this->assertSame($www, $this->subject->getWww());
        }
 
        /**
         * @test
         */
        public function getCompanyInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getCompany());
+               $this->assertSame('', $this->subject->getCompany());
        }
 
        /**
@@ -327,15 +327,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setCompanySetsCompany() {
                $company = 'foo bar';
-               $this->fixture->setCompany($company);
-               $this->assertSame($company, $this->fixture->getCompany());
+               $this->subject->setCompany($company);
+               $this->assertSame($company, $this->subject->getCompany());
        }
 
        /**
         * @test
         */
        public function getImageInitiallyReturnsEmptyString() {
-               $this->assertSame('', $this->fixture->getImage());
+               $this->assertSame('', $this->subject->getImage());
        }
 
        /**
@@ -343,15 +343,15 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setImageSetsImage() {
                $image = 'foobar.gif';
-               $this->fixture->setImage($image);
-               $this->assertSame($image, $this->fixture->getImage());
+               $this->subject->setImage($image);
+               $this->assertSame($image, $this->subject->getImage());
        }
 
        /**
         * @test
         */
        public function getLastloginInitiallyReturnsNull() {
-               $this->assertNull($this->fixture->getLastlogin());
+               $this->assertNull($this->subject->getLastlogin());
        }
 
        /**
@@ -359,8 +359,8 @@ class FrontendUserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setLastloginSetsLastlogin() {
                $date = new \DateTime();
-               $this->fixture->setLastlogin($date);
-               $this->assertSame($date, $this->fixture->getLastlogin());
+               $this->subject->setLastlogin($date);
+               $this->assertSame($date, $this->subject->getLastlogin());
        }
 
 }
index 2a21975..b815670 100644 (file)
@@ -28,12 +28,12 @@ class RepositoryRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
                $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
-               /** @var $fixture \TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository|\PHPUnit_Framework_MockObject_MockObject */
-               $this->fixture = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class, array('findAll'), array($this->mockObjectManager));
+               /** @var $subject \TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository|\PHPUnit_Framework_MockObject_MockObject */
+               $this->subject = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class, array('findAll'), array($this->mockObjectManager));
        }
 
        /**
@@ -41,12 +41,12 @@ class RepositoryRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function findOneTypo3OrgRepositoryReturnsNullIfNoRepositoryWithThisTitleExists() {
 
-               $this->fixture
+               $this->subject
                        ->expects($this->once())
                        ->method('findAll')
                        ->will($this->returnValue(array()));
 
-               $this->assertNull($this->fixture->findOneTypo3OrgRepository());
+               $this->assertNull($this->subject->findOneTypo3OrgRepository());
        }
 
        /**
@@ -64,12 +64,12 @@ class RepositoryRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        ->method('getTitle')
                        ->will($this->returnValue('TYPO3.org Main Repository'));
 
-               $this->fixture
+               $this->subject
                        ->expects($this->once())
                        ->method('findAll')
                        ->will($this->returnValue(array($mockModelOne, $mockModelTwo)));
 
-               $this->assertSame($mockModelTwo, $this->fixture->findOneTypo3OrgRepository());
+               $this->assertSame($mockModelTwo, $this->subject->findOneTypo3OrgRepository());
        }
 
 }
index 787c941..3e33d95 100644 (file)
@@ -24,13 +24,13 @@ class AlphabeticFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Form\Filter\AlphabeticFilter
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        /**
         * Set up
         */
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Form\Filter\AlphabeticFilter();
+               $this->subject = new \TYPO3\CMS\Form\Filter\AlphabeticFilter();
        }
 
        /**
@@ -39,8 +39,8 @@ class AlphabeticFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function filterForStringWithUnicodeCharactersAndSpacesReturnsInputString() {
                $input = 'My name contains äøüößØœ';
                // This is default, but let's be explicit:
-               $this->fixture->setAllowWhiteSpace(TRUE);
-               $this->assertSame($input, $this->fixture->filter($input));
+               $this->subject->setAllowWhiteSpace(TRUE);
+               $this->assertSame($input, $this->subject->filter($input));
        }
 
        /**
@@ -49,8 +49,8 @@ class AlphabeticFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function filterForStringWithUnicodeCharactersAndSpacesWithAllowWhitespaceSetToFalseReturnsInputStringWithoutSpaces() {
                $input = 'My name contains äøüößØœ';
                $expected = 'MynamecontainsäøüößØœ';
-               $this->fixture->setAllowWhiteSpace(FALSE);
-               $this->assertSame($expected, $this->fixture->filter($input));
+               $this->subject->setAllowWhiteSpace(FALSE);
+               $this->assertSame($expected, $this->subject->filter($input));
        }
 
 }
index 0b83c5a..f74e992 100644 (file)
@@ -24,13 +24,13 @@ class AlphanumericFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Form\Filter\AlphanumericFilter
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        /**
         * Set up
         */
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Form\Filter\AlphanumericFilter();
+               $this->subject = new \TYPO3\CMS\Form\Filter\AlphanumericFilter();
        }
 
        /**
@@ -39,8 +39,8 @@ class AlphanumericFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function filterForStringWithUnicodeCharactersAndSpacesReturnsInputString() {
                $input = 'My name contains äøüößØœ';
                // This is default, but let's be explicit:
-               $this->fixture->setAllowWhiteSpace(TRUE);
-               $this->assertSame($input, $this->fixture->filter($input));
+               $this->subject->setAllowWhiteSpace(TRUE);
+               $this->assertSame($input, $this->subject->filter($input));
        }
 
        /**
@@ -49,15 +49,15 @@ class AlphanumericFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function filterForStringWithUnicodeCharactersAndSpacesWithAllowWhitespaceSetToFalseReturnsInputStringWithoutSpaces() {
                $input = 'My name contains äøüößØœ';
                $expected = 'MynamecontainsäøüößØœ';
-               $this->fixture->setAllowWhiteSpace(FALSE);
-               $this->assertSame($expected, $this->fixture->filter($input));
+               $this->subject->setAllowWhiteSpace(FALSE);
+               $this->assertSame($expected, $this->subject->filter($input));
        }
 
        /**
         * @test
         */
        public function filterAllowsNumericCharacters() {
-               $this->assertSame('foo23bar', $this->fixture->filter('foo23bar'));
+               $this->assertSame('foo23bar', $this->subject->filter('foo23bar'));
        }
 
 }
index f2414f9..c9e8d74 100644 (file)
@@ -24,10 +24,10 @@ class CurrencyFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Form\Filter\CurrencyFilter
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Form\Filter\CurrencyFilter();
+               $this->subject = new \TYPO3\CMS\Form\Filter\CurrencyFilter();
        }
 
        public function validDataProvider() {
@@ -64,9 +64,9 @@ class CurrencyFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @dataProvider validDataProvider
         */
        public function filterForVariousIntegerInputsReturnsFormattedCurrencyNotation($input, $thousandSeparator, $decimalPoint, $expected) {
-               $this->fixture->setThousandSeparator($thousandSeparator);
-               $this->fixture->setDecimalsPoint($decimalPoint);
-               $this->assertSame($expected, $this->fixture->filter($input));
+               $this->subject->setThousandSeparator($thousandSeparator);
+               $this->subject->setDecimalsPoint($decimalPoint);
+               $this->assertSame($expected, $this->subject->filter($input));
        }
 
 }
index 185e555..8d466a2 100644 (file)
@@ -24,10 +24,10 @@ class DigitFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Form\Filter\DigitFilter
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Form\Filter\DigitFilter();
+               $this->subject = new \TYPO3\CMS\Form\Filter\DigitFilter();
        }
 
        public function validDataProvider() {
@@ -47,7 +47,7 @@ class DigitFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function filterForStringsReturnsStringsFilteredToOnlyContainDigits($input, $expected) {
                $this->assertSame(
                        $expected,
-                       $this->fixture->filter($input)
+                       $this->subject->filter($input)
                );
        }
 
index 6c02b97..35b4297 100644 (file)
@@ -24,10 +24,10 @@ class IntegerFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Form\Filter\IntegerFilter
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Form\Filter\IntegerFilter();
+               $this->subject = new \TYPO3\CMS\Form\Filter\IntegerFilter();
        }
 
        public function dataProvider() {
@@ -49,7 +49,7 @@ class IntegerFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function filterForVariousInputReturnsInputCastedToInteger($input, $expected) {
                $this->assertSame(
                        $expected,
-                       $this->fixture->filter($input)
+                       $this->subject->filter($input)
                );
        }
 
index 6be9c85..5310ad5 100644 (file)
@@ -24,10 +24,10 @@ class LowerCaseFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Form\Filter\LowerCaseFilter
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Form\Filter\LowerCaseFilter();
+               $this->subject = new \TYPO3\CMS\Form\Filter\LowerCaseFilter();
                $GLOBALS['TSFE'] = new \stdClass();
                $GLOBALS['TSFE']->csConvObj = new \TYPO3\CMS\Core\Charset\CharsetConverter();
                $GLOBALS['TSFE']->renderCharset = 'utf-8';
@@ -50,7 +50,7 @@ class LowerCaseFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function filterForVariousInputReturnsLowercasedInput($input, $expected) {
                $this->assertSame(
                        $expected,
-                       $this->fixture->filter($input)
+                       $this->subject->filter($input)
                );
        }
 
index 181ee88..e22406b 100644 (file)
@@ -24,10 +24,10 @@ class RegExpFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Form\Filter\RegExpFilter
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Form\Filter\RegExpFilter();
+               $this->subject = new \TYPO3\CMS\Form\Filter\RegExpFilter();
        }
 
        public function dataProvider() {
@@ -55,10 +55,10 @@ class RegExpFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @dataProvider dataProvider
         */
        public function filterForStringReturnsInputWithoutCharactersMatchedByRegularExpression($input, $regularExpression, $expected) {
-               $this->fixture->setRegularExpression($regularExpression);
+               $this->subject->setRegularExpression($regularExpression);
                $this->assertSame(
                        $expected,
-                       $this->fixture->filter($input)
+                       $this->subject->filter($input)
                );
        }
 
index 7802919..455c5e6 100644 (file)
@@ -24,10 +24,10 @@ class RemoveXssFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Form\Filter\RemoveXssFilter
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Form\Filter\RemoveXssFilter();
+               $this->subject = new \TYPO3\CMS\Form\Filter\RemoveXssFilter();
        }
 
        public function maliciousStringProvider() {
@@ -47,7 +47,7 @@ class RemoveXssFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function filterForMaliciousStringReturnsInputFilteredOfXssCode($input) {
                $this->assertNotSame(
                        $input,
-                       $this->fixture->filter($input)
+                       $this->subject->filter($input)
                );
        }
 
index 43df34b..9001f1d 100644 (file)
@@ -24,13 +24,13 @@ class StripNewLinesFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Form\Filter\StripNewLinesFilter
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        /**
         * Set up
         */
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Form\Filter\StripNewLinesFilter();
+               $this->subject = new \TYPO3\CMS\Form\Filter\StripNewLinesFilter();
        }
 
        public function dataProviderWithNewlines() {
@@ -67,7 +67,7 @@ text', 'some text'),
        public function filterForStringWithNewlineReturnsStringWithoutNewline($input, $expected) {
                $this->assertSame(
                        $expected,
-                       $this->fixture->filter($input)
+                       $this->subject->filter($input)
                );
        }
 
index f5d9a7f..a5f6d71 100644 (file)
@@ -27,13 +27,13 @@ class TitleCaseFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var TitleCaseFilter
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        /**
         * Set up
         */
        protected function setUp() {
-               $this->fixture = new TitleCaseFilter();
+               $this->subject = new TitleCaseFilter();
                $GLOBALS['TSFE'] = new \stdClass();
                $GLOBALS['TSFE']->csConvObj = new CharsetConverter();
                $GLOBALS['TSFE']->renderCharset = 'utf-8';
@@ -58,7 +58,7 @@ class TitleCaseFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function filterForStringReturnsStringWithUppercasedWords($input, $expected) {
                $this->assertSame(
                        $expected,
-                       $this->fixture->filter($input)
+                       $this->subject->filter($input)
                );
        }
 
index 24e3e38..525fc68 100644 (file)
@@ -24,13 +24,13 @@ class TrimFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Form\Filter\TrimFilter
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        /**
         * Set up
         */
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Form\Filter\TrimFilter();
+               $this->subject = new \TYPO3\CMS\Form\Filter\TrimFilter();
        }
 
        public function stringProvider() {
@@ -59,7 +59,7 @@ some text ', 'some text', '
        public function filterForStringWithWhitespaceInFrontAndEndReturnsStringWithoutThisWhitespace($input, $expected) {
                $this->assertSame(
                        $expected,
-                       $this->fixture->filter($input)
+                       $this->subject->filter($input)
                );
        }
 
@@ -68,11 +68,11 @@ some text ', 'some text', '
         * @dataProvider stringProviderForCharacterList
         */
        public function filterForStringWithCharactersInCharacterListReturnsStringWithoutTheseCharacters($input, $expected, $characterList) {
-               $this->fixture->setCharacterList($characterList);
+               $this->subject->setCharacterList($characterList);
 
                $this->assertSame(
                        $expected,
-                       $this->fixture->filter($input)
+                       $this->subject->filter($input)
                );
        }
 
index 620dacd..7f6424c 100644 (file)
@@ -24,13 +24,13 @@ class UpperCaseFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Form\Filter\UpperCaseFilter
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        /**
         * Set up
         */
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Form\Filter\UpperCaseFilter();
+               $this->subject = new \TYPO3\CMS\Form\Filter\UpperCaseFilter();
                $GLOBALS['TSFE'] = new \stdClass();
                $GLOBALS['TSFE']->csConvObj = new \TYPO3\CMS\Core\Charset\CharsetConverter();
                $GLOBALS['TSFE']->renderCharset = 'utf-8';
@@ -50,7 +50,7 @@ class UpperCaseFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function filterForStringReturnsUppercasedString($input, $expected) {
                $this->assertSame(
                        $expected,
-                       $this->fixture->filter($input)
+                       $this->subject->filter($input)
                );
        }
 
index 4f096ed..534780d 100644 (file)
@@ -22,14 +22,14 @@ class PostProcessorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Form\PostProcess\PostProcessor
         */
-       public $fixture;
+       public $subject;
 
        /**
         * Set up
         */
        protected function setUp() {
                $form = $this->getMock(\TYPO3\CMS\Form\Domain\Model\Form::class, array(), array(), '', FALSE);
-               $this->fixture = $this->getMock(
+               $this->subject = $this->getMock(
                        \TYPO3\CMS\Form\PostProcess\PostProcessor::class,
                        array('sortTypoScriptKeyList'),
                        array($form, array())
@@ -55,9 +55,9 @@ class PostProcessorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        10 => $this->getUniqueId('postprocess'),
                        20 => $classNameWithoutPrefix
                );
-               $this->fixture->typoScript = $typoScript;
-               $this->fixture->expects($this->once())->method('sortTypoScriptKeyList')->will($this->returnValue(array(10, 20)));
-               $returnValue = $this->fixture->process();
+               $this->subject->typoScript = $typoScript;
+               $this->subject->expects($this->once())->method('sortTypoScriptKeyList')->will($this->returnValue(array(10, 20)));
+               $returnValue = $this->subject->process();
                $this->assertEquals('processedWithoutPrefix', $returnValue);
        }
 
@@ -80,9 +80,9 @@ class PostProcessorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        10 => $this->getUniqueId('postprocess'),
                        20 => $classNameWithPrefix
                );
-               $this->fixture->typoScript = $typoScript;
-               $this->fixture->expects($this->once())->method('sortTypoScriptKeyList')->will($this->returnValue(array(10, 20)));
-               $returnValue = $this->fixture->process();
+               $this->subject->typoScript = $typoScript;
+               $this->subject->expects($this->once())->method('sortTypoScriptKeyList')->will($this->returnValue(array(10, 20)));
+               $returnValue = $this->subject->process();
                $this->assertEquals('processedWithPrefix', $returnValue);
        }
 
@@ -105,9 +105,9 @@ class PostProcessorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        10 => $this->getUniqueId('postprocess'),
                        20 => $classNameWithoutInterface
                );
-               $this->fixture->typoScript = $typoScript;
-               $this->fixture->expects($this->once())->method('sortTypoScriptKeyList')->will($this->returnValue(array(10, 20)));
-               $returnValue = $this->fixture->process();
+               $this->subject->typoScript = $typoScript;
+               $this->subject->expects($this->once())->method('sortTypoScriptKeyList')->will($this->returnValue(array(10, 20)));
+               $returnValue = $this->subject->process();
                $this->assertEquals('', $returnValue);
        }
 
index d47367b..7ed5137 100644 (file)
@@ -23,14 +23,14 @@ class AbstractMenuContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        /**
         * Set up this testcase
         */
        protected function setUp() {
                $proxy = $this->buildAccessibleProxy(\TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject::class);
-               $this->fixture = new $proxy();
+               $this->subject = new $proxy();
                $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
                $GLOBALS['TSFE'] = $this->getMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class, array(), array($GLOBALS['TYPO3_CONF_VARS'], 1, 1));
                $GLOBALS['TSFE']->cObj = new \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer();
@@ -46,8 +46,8 @@ class AbstractMenuContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @return void
         */
        protected function prepareSectionIndexTest() {
-               $this->fixture->sys_page = $this->getMock(\TYPO3\CMS\Frontend\Page\PageRepository::class);
-               $this->fixture->parent_cObj = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+               $this->subject->sys_page = $this->getMock(\TYPO3\CMS\Frontend\Page\PageRepository::class);
+               $this->subject->parent_cObj = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
        }
 
        /**
@@ -55,8 +55,8 @@ class AbstractMenuContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function sectionIndexReturnsEmptyArrayIfTheRequestedPageCouldNotBeFetched() {
                $this->prepareSectionIndexTest();
-               $this->fixture->sys_page->expects($this->once())->method('getPage')->will($this->returnValue(NULL));
-               $result = $this->fixture->_call('sectionIndex', 'field');
+               $this->subject->sys_page->expects($this->once())->method('getPage')->will($this->returnValue(NULL));
+               $result = $this->subject->_call('sectionIndex', 'field');
                $this->assertEquals($result, array());
        }
 
@@ -65,9 +65,9 @@ class AbstractMenuContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function sectionIndexUsesTheInternalIdIfNoPageIdWasGiven() {
                $this->prepareSectionIndexTest();
-               $this->fixture->id = 10;
-               $this->fixture->sys_page->expects($this->once())->method('getPage')->will($this->returnValue(NULL))->with(10);
-               $result = $this->fixture->_call('sectionIndex', 'field');
+               $this->subject->id = 10;
+               $this->subject->sys_page->expects($this->once())->method('getPage')->will($this->returnValue(NULL))->with(10);
+               $result = $this->subject->_call('sectionIndex', 'field');
                $this->assertEquals($result, array());
        }
 
@@ -77,9 +77,9 @@ class AbstractMenuContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function sectionIndexThrowsAnExceptionIfTheInternalQueryFails() {
                $this->prepareSectionIndexTest();
-               $this->fixture->sys_page->expects($this->once())->method('getPage')->will($this->returnValue(array()));
-               $this->fixture->parent_cObj->expects($this->once())->method('exec_getQuery')->will($this->returnValue(0));
-               $this->fixture->_call('sectionIndex', 'field');
+               $this->subject->sys_page->expects($this->once())->method('getPage')->will($this->returnValue(array()));
+               $this->subject->parent_cObj->expects($this->once())->method('exec_getQuery')->will($this->returnValue(0));
+               $this->subject->_call('sectionIndex', 'field');
        }
 
        /**
@@ -87,13 +87,13 @@ class AbstractMenuContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function sectionIndexReturnsOverlaidRowBasedOnTheLanguageOfTheGivenPage() {
                $this->prepareSectionIndexTest();
-               $this->fixture->mconf['sectionIndex.']['type'] = 'all';
+               $this->subject->mconf['sectionIndex.']['type'] = 'all';
                $GLOBALS['TSFE']->sys_language_contentOL = 1;
-               $this->fixture->sys_page->expects($this->once())->method('getPage')->will($this->returnValue(array('_PAGES_OVERLAY_LANGUAGE' => 1)));
-               $this->fixture->parent_cObj->expects($this->once())->method('exec_getQuery')->will($this->returnValue(1));
+               $this->subject->sys_page->expects($this->once())->method('getPage')->will($this->returnValue(array('_PAGES_OVERLAY_LANGUAGE' => 1)));
+               $this->subject->parent_cObj->expects($this->once())->method('exec_getQuery')->will($this->returnValue(1));
                $GLOBALS['TYPO3_DB']->expects($this->exactly(2))->method('sql_fetch_assoc')->will($this->onConsecutiveCalls($this->returnValue(array('uid' => 0, 'header' => 'NOT_OVERLAID')), $this->returnValue(FALSE)));
-               $this->fixture->sys_page->expects($this->once())->method('getRecordOverlay')->will($this->returnValue(array('uid' => 0, 'header' => 'OVERLAID')));
-               $result = $this->fixture->_call('sectionIndex', 'field');
+               $this->subject->sys_page->expects($this->once())->method('getRecordOverlay')->will($this->returnValue(array('uid' => 0, 'header' => 'OVERLAID')));
+               $result = $this->subject->_call('sectionIndex', 'field');
                $this->assertEquals($result[0]['title'], 'OVERLAID');
        }
 
@@ -145,11 +145,11 @@ class AbstractMenuContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function sectionIndexFilters($expectedAmount, array $dataRow) {
                $this->prepareSectionIndexTest();
-               $this->fixture->mconf['sectionIndex.']['type'] = 'header';
-               $this->fixture->sys_page->expects($this->once())->method('getPage')->will($this->returnValue(array()));
-               $this->fixture->parent_cObj->expects($this->once())->method('exec_getQuery')->will($this->returnValue(1));
+               $this->subject->mconf['sectionIndex.']['type'] = 'header';
+               $this->subject->sys_page->expects($this->once())->method('getPage')->will($this->returnValue(array()));
+               $this->subject->parent_cObj->expects($this->once())->method('exec_getQuery')->will($this->returnValue(1));
                $GLOBALS['TYPO3_DB']->expects($this->exactly(2))->method('sql_fetch_assoc')->will($this->onConsecutiveCalls($this->returnValue($dataRow), $this->returnValue(FALSE)));
-               $result = $this->fixture->_call('sectionIndex', 'field');
+               $result = $this->subject->_call('sectionIndex', 'field');
                $this->assertCount($expectedAmount, $result);
        }
 
@@ -189,16 +189,16 @@ class AbstractMenuContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function sectionIndexQueriesWithDifferentColPos($configuration, $whereClausePrefix) {
                $this->prepareSectionIndexTest();
-               $this->fixture->sys_page->expects($this->once())->method('getPage')->will($this->returnValue(array()));
-               $this->fixture->mconf['sectionIndex.'] = $configuration;
+               $this->subject->sys_page->expects($this->once())->method('getPage')->will($this->returnValue(array()));
+               $this->subject->mconf['sectionIndex.'] = $configuration;
                $queryConfiguration = array(
                        'pidInList' => 12,
                        'orderBy' => 'field',
                        'languageField' => 'sys_language_uid',
                        'where' => $whereClausePrefix
                );
-               $this->fixture->parent_cObj->expects($this->once())->method('exec_getQuery')->with('tt_content', $queryConfiguration)->will($this->returnValue(1));
-               $this->fixture->_call('sectionIndex', 'field', 12);
+               $this->subject->parent_cObj->expects($this->once())->method('exec_getQuery')->with('tt_content', $queryConfiguration)->will($this->returnValue(1));
+               $this->subject->_call('sectionIndex', 'field', 12);
        }
 
        ////////////////////////////////////
@@ -252,15 +252,15 @@ class AbstractMenuContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                }
 
                $this->prepareSectionIndexTest();
-               $this->fixture->parent_cObj = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class, array());
+               $this->subject->parent_cObj = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class, array());
 
-               $this->fixture->sys_page->expects($this->once())->method('getMenu')->will($this->returnValue($menu));
-               $this->fixture->menuArr = array(
+               $this->subject->sys_page->expects($this->once())->method('getMenu')->will($this->returnValue($menu));
+               $this->subject->menuArr = array(
                        0 => array('uid' => 1)
                );
-               $this->fixture->conf['excludeUidList'] = $excludeUidList;
+               $this->subject->conf['excludeUidList'] = $excludeUidList;
 
-               $this->assertEquals($expectedResult, $this->fixture->isItemState('IFSUB', 0));
+               $this->assertEquals($expectedResult, $this->subject->isItemState('IFSUB', 0));
        }
 
 }
index e69bb47..ffae23d 100644 (file)
@@ -24,12 +24,12 @@ class TypoScriptFrontendControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
        /**
         * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = $this->getAccessibleMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class, array('dummy'), array(), '', FALSE);
-               $this->fixture->TYPO3_CONF_VARS = $GLOBALS['TYPO3_CONF_VARS'];
-               $this->fixture->TYPO3_CONF_VARS['SYS']['encryptionKey'] = '170928423746123078941623042360abceb12341234231';
+               $this->subject = $this->getAccessibleMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class, array('dummy'), array(), '', FALSE);
+               $this->subject->TYPO3_CONF_VARS = $GLOBALS['TYPO3_CONF_VARS'];
+               $this->subject->TYPO3_CONF_VARS['SYS']['encryptionKey'] = '170928423746123078941623042360abceb12341234231';
        }
 
        ////////////////////////////////
@@ -84,7 +84,7 @@ class TypoScriptFrontendControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         */
        public function localizationReturnsUnchangedStringIfNotLocallangLabel() {
                $string = $this->getUniqueId();
-               $this->assertEquals($string, $this->fixture->sL($string));
+               $this->assertEquals($string, $this->subject->sL($string));
        }
 
 }
index c7f95c8..97f922f 100644 (file)
@@ -24,13 +24,13 @@ class MediaWizardProviderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\TYPO3\CMS\Frontend\MediaWizard\MediaWizardProvider
         */
-       protected $fixture;
+       protected $subject;
 
        /**
         * Setup
         */
        protected function setUp() {
-               $this->fixture = $this->getAccessibleMock(\TYPO3\CMS\Frontend\MediaWizard\MediaWizardProvider::class, array('dummy'), array(), '', FALSE);
+               $this->subject = $this->getAccessibleMock(\TYPO3\CMS\Frontend\MediaWizard\MediaWizardProvider::class, array('dummy'), array(), '', FALSE);
        }
 
        /**
@@ -83,7 +83,7 @@ class MediaWizardProviderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function process_youtube($url, $expected) {
-               $result = $this->fixture->_call('process_youtube', $url);
+               $result = $this->subject->_call('process_youtube', $url);
                $this->assertEquals($expected, $result);
        }
 
index 8e3aa99..a297168 100644 (file)
@@ -24,7 +24,7 @@ class CacheHashCalculatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Frontend\Page\CacheHashCalculator
         */
-       protected $fixture;
+       protected $subject;
 
        /**
         * @var array
@@ -36,8 +36,8 @@ class CacheHashCalculatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        'encryptionKey' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']
                );
                $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] = 't3lib_cacheHashTest';
-               $this->fixture = $this->getMock(\TYPO3\CMS\Frontend\Page\CacheHashCalculator::class, array('foo'));
-               $this->fixture->setConfiguration(array(
+               $this->subject = $this->getMock(\TYPO3\CMS\Frontend\Page\CacheHashCalculator::class, array('foo'));
+               $this->subject->setConfiguration(array(
                        'excludedParameters' => array('exclude1', 'exclude2'),
                        'cachedParametersWhiteList' => array(),
                        'requireCacheHashPresenceParameters' => array('req1', 'req2'),
@@ -51,7 +51,7 @@ class CacheHashCalculatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function cacheHashCalculationWorks($params, $expected) {
-               $this->assertEquals($expected, $this->fixture->calculateCacheHash($params));
+               $this->assertEquals($expected, $this->subject->calculateCacheHash($params));
        }
 
        /**
@@ -86,7 +86,7 @@ class CacheHashCalculatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function getRelevantParametersWorks($params, $expected) {
-               $actual = $this->fixture->getRelevantParameters($params);
+               $actual = $this->subject->getRelevantParameters($params);
                $this->assertEquals($expected, array_keys($actual));
        }
 
@@ -120,7 +120,7 @@ class CacheHashCalculatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function canGenerateForParameters($params, $expected) {
-               $this->assertEquals($expected, $this->fixture->generateForParameters($params));
+               $this->assertEquals($expected, $this->subject->generateForParameters($params));
        }
 
        /**
@@ -147,7 +147,7 @@ class CacheHashCalculatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function parametersRequireCacheHashWorks($params, $expected) {
-               $this->assertEquals($expected, $this->fixture->doParametersRequireCacheHash($params));
+               $this->assertEquals($expected, $this->subject->doParametersRequireCacheHash($params));
        }
 
        /**
@@ -173,8 +173,8 @@ class CacheHashCalculatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function canWhitelistParameters($params, $expected) {
                $method = new \ReflectionMethod(\TYPO3\CMS\Frontend\Page\CacheHashCalculator::class, 'setCachedParametersWhiteList');
                $method->setAccessible(TRUE);
-               $method->invoke($this->fixture, array('whitep1', 'whitep2'));
-               $this->assertEquals($expected, $this->fixture->generateForParameters($params));
+               $method->invoke($this->subject, array('whitep1', 'whitep2'));
+               $this->assertEquals($expected, $this->subject->generateForParameters($params));
        }
 
        /**
@@ -197,8 +197,8 @@ class CacheHashCalculatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function canSkipParametersWithEmptyValues($params, $settings, $expected) {
-               $this->fixture->setConfiguration($settings);
-               $actual = $this->fixture->getRelevantParameters($params);
+               $this->subject->setConfiguration($settings);
+               $actual = $this->subject->getRelevantParameters($params);
                $this->assertEquals($expected, array_keys($actual));
        }
 
index ed327e8..64998de 100644 (file)
@@ -27,13 +27,13 @@ class IndexerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         *
         * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\IndexedSearch\Indexer
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        /**
         * Sets up the test
         */
        protected function setUp() {
-               $this->fixture = $this->getMock(\TYPO3\CMS\IndexedSearch\Indexer::class, array('dummy'));
+               $this->subject = $this->getMock(\TYPO3\CMS\IndexedSearch\Indexer::class, array('dummy'));
        }
 
        /**
@@ -41,7 +41,7 @@ class IndexerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function extractHyperLinksDoesNotReturnNonExistingLocalPath() {
                $html = 'test <a href="' . $this->getUniqueId() . '">test</a> test';
-               $result = $this->fixture->extractHyperLinks($html);
+               $result = $this->subject->extractHyperLinks($html);
                $this->assertEquals(1, count($result));
                $this->assertEquals('', $result[0]['localPath']);
        }
@@ -56,7 +56,7 @@ class IndexerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $GLOBALS['T3_VAR']['ext']['indexed_search']['indexLocalFiles'] = array(
                        \TYPO3\CMS\Core\Utility\GeneralUtility::shortMD5('testfile') => $temporaryFileName,
                );
-               $result = $this->fixture->extractHyperLinks($html);
+               $result = $this->subject->extractHyperLinks($html);
                $this->assertEquals(1, count($result));
                $this->assertEquals($temporaryFileName, $result[0]['localPath']);
        }
@@ -67,7 +67,7 @@ class IndexerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function extractHyperLinksRecurnsCorrectPathWithBaseUrl() {
                $baseURL = \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL');
                $html = 'test <a href="' . $baseURL . 'index.php">test</a> test';
-               $result = $this->fixture->extractHyperLinks($html);
+               $result = $this->subject->extractHyperLinks($html);
                $this->assertEquals(1, count($result));
                $this->assertEquals(PATH_site . 'index.php', $result[0]['localPath']);
        }
@@ -77,7 +77,7 @@ class IndexerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function extractHyperLinksFindsCorrectPathWithAbsolutePath() {
                $html = 'test <a href="index.php">test</a> test';
-               $result = $this->fixture->extractHyperLinks($html);
+               $result = $this->subject->extractHyperLinks($html);
                $this->assertEquals(1, count($result));
                $this->assertEquals(PATH_site . 'index.php', $result[0]['localPath']);
        }
@@ -88,7 +88,7 @@ class IndexerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function extractHyperLinksFindsCorrectPathForPathWithinTypo3Directory() {
                $path = substr(PATH_typo3, strlen(PATH_site) - 1);
                $html = 'test <a href="' . $path . 'index.php">test</a> test';
-               $result = $this->fixture->extractHyperLinks($html);
+               $result = $this->subject->extractHyperLinks($html);
                $this->assertEquals(1, count($result));
                $this->assertEquals(PATH_typo3 . 'index.php', $result[0]['localPath']);
        }
@@ -101,7 +101,7 @@ class IndexerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $html = 'test <a href="' . $absRefPrefix . 'index.php">test</a> test';
                $GLOBALS['TSFE'] = $this->getMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class, array(), array(), '', FALSE);
                $GLOBALS['TSFE']->config['config']['absRefPrefix'] = $absRefPrefix;
-               $result = $this->fixture->extractHyperLinks($html);
+               $result = $this->subject->extractHyperLinks($html);
                $this->assertEquals(1, count($result));
                $this->assertEquals(PATH_site . 'index.php', $result[0]['localPath']);
        }
@@ -112,7 +112,7 @@ class IndexerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function extractBaseHrefExtractsBaseHref() {
                $baseHref = 'http://example.com/';
                $html = '<html><head><Base Href="' . $baseHref . '" /></head></html>';
-               $result = $this->fixture->extractBaseHref($html);
+               $result = $this->subject->extractBaseHref($html);
                $this->assertEquals($baseHref, $result);
        }
 
index 5f43f76..c545b8e 100644 (file)
@@ -24,13 +24,13 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Lang\Domain\Model\Extension
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        /**
         * Set up
         */
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Lang\Domain\Model\Extension();
+               $this->subject = new \TYPO3\CMS\Lang\Domain\Model\Extension();
        }
 
        /**
@@ -39,7 +39,7 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getKeyInitiallyReturnsEmptyString() {
                $this->assertSame(
                        '',
-                       $this->fixture->getKey()
+                       $this->subject->getKey()
                );
        }
 
@@ -48,11 +48,11 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getKeyInitiallyReturnsGivenKeyFromConstruct() {
                $key = 'foo bar';
-               $this->fixture = new \TYPO3\CMS\Lang\Domain\Model\Extension($key);
+               $this->subject = new \TYPO3\CMS\Lang\Domain\Model\Extension($key);
 
                $this->assertSame(
                        $key,
-                       $this->fixture->getKey()
+                       $this->subject->getKey()
                );
        }
 
@@ -61,11 +61,11 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setKeySetsKey() {
                $key = 'foo bar';
-               $this->fixture->setKey($key);
+               $this->subject->setKey($key);
 
                $this->assertSame(
                        $key,
-                       $this->fixture->getKey()
+                       $this->subject->getKey()
                );
        }
 
@@ -75,7 +75,7 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getTitleInitiallyReturnsEmptyString() {
                $this->assertSame(
                        '',
-                       $this->fixture->getTitle()
+                       $this->subject->getTitle()
                );
        }
 
@@ -84,11 +84,11 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getTitleInitiallyReturnsGivenTitleFromConstruct() {
                $title = 'foo bar';
-               $this->fixture = new \TYPO3\CMS\Lang\Domain\Model\Extension('', $title);
+               $this->subject = new \TYPO3\CMS\Lang\Domain\Model\Extension('', $title);
 
                $this->assertSame(
                        $title,
-                       $this->fixture->getTitle()
+                       $this->subject->getTitle()
                );
        }
 
@@ -97,11 +97,11 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setTitleSetsTitle() {
                $title = 'foo bar';
-               $this->fixture->setTitle($title);
+               $this->subject->setTitle($title);
 
                $this->assertSame(
                        $title,
-                       $this->fixture->getTitle()
+                       $this->subject->getTitle()
                );
        }
 
@@ -111,7 +111,7 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getIconInitiallyReturnsEmptyString() {
                $this->assertSame(
                        '',
-                       $this->fixture->getIcon()
+                       $this->subject->getIcon()
                );
        }
 
@@ -120,11 +120,11 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getIconInitiallyReturnsGivenIconFromConstruct() {
                $icon = 'foo bar';
-               $this->fixture = new \TYPO3\CMS\Lang\Domain\Model\Extension('', '', $icon);
+               $this->subject = new \TYPO3\CMS\Lang\Domain\Model\Extension('', '', $icon);
 
                $this->assertSame(
                        $icon,
-                       $this->fixture->getIcon()
+                       $this->subject->getIcon()
                );
        }
 
@@ -133,11 +133,11 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setIconSetsIcon() {
                $icon = 'foo bar';
-               $this->fixture->setIcon($icon);
+               $this->subject->setIcon($icon);
 
                $this->assertSame(
                        $icon,
-                       $this->fixture->getIcon()
+                       $this->subject->getIcon()
                );
        }
 
@@ -147,7 +147,7 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getVersionInitiallyReturnsEmptyString() {
                $this->assertSame(
                        '',
-                       $this->fixture->getVersion()
+                       $this->subject->getVersion()
                );
        }
 
@@ -156,11 +156,11 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setVersionSetsVersion() {
                $version = 10;
-               $this->fixture->setVersion($version);
+               $this->subject->setVersion($version);
 
                $this->assertSame(
                        $version,
-                       $this->fixture->getVersion()
+                       $this->subject->getVersion()
                );
        }
 
@@ -169,11 +169,11 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setVersionSetsVersionFromString() {
                $version = 4012003;
-               $this->fixture->setVersionFromString('4.12.3');
+               $this->subject->setVersionFromString('4.12.3');
 
                $this->assertSame(
                        $version,
-                       $this->fixture->getVersion()
+                       $this->subject->getVersion()
                );
        }
 
@@ -183,7 +183,7 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getUpdateResultInitiallyReturnsEmptyArray() {
                $this->assertSame(
                        array(),
-                       $this->fixture->getUpdateResult()
+                       $this->subject->getUpdateResult()
                );
        }
 
@@ -198,11 +198,11 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                        ),
                );
 
-               $this->fixture->setUpdateResult($updateResult);
+               $this->subject->setUpdateResult($updateResult);
 
                $this->assertSame(
                        $updateResult,
-                       $this->fixture->getUpdateResult()
+                       $this->subject->getUpdateResult()
                );
        }
 
index 972a4f3..c1bed28 100644 (file)
@@ -24,13 +24,13 @@ class LanguageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Lang\Domain\Model\Language
         */
-       protected $fixture = NULL;
+       protected $subject = NULL;
 
        /**
         * Set up
         */
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Lang\Domain\Model\Language();
+               $this->subject = new \TYPO3\CMS\Lang\Domain\Model\Language();
        }
 
        /**
@@ -39,7 +39,7 @@ class LanguageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getLocaleInitiallyReturnsEmptyString() {
                $this->assertSame(
                        '',
-                       $this->fixture->getLocale()
+                       $this->subject->getLocale()
                );
        }
 
@@ -48,11 +48,11 @@ class LanguageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getLocaleInitiallyReturnsGivenLocaleFromConstruct() {
                $locale = 'nl';
-               $this->fixture = new \TYPO3\CMS\Lang\Domain\Model\Language($locale);
+               $this->subject = new \TYPO3\CMS\Lang\Domain\Model\Language($locale);
 
                $this->assertSame(
                        $locale,
-                       $this->fixture->getLocale()
+                       $this->subject->getLocale()
                );
        }
 
@@ -61,11 +61,11 @@ class LanguageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setLocaleSetsLocale() {
                $locale = 'nl';
-               $this->fixture->setLocale($locale);
+               $this->subject->setLocale($locale);
 
                $this->assertSame(
                        $locale,
-                       $this->fixture->getLocale()
+                       $this->subject->getLocale()
                );
        }
 
@@ -75,7 +75,7 @@ class LanguageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getLanguageInitiallyReturnsEmptyString() {
                $this->assertSame(
                        '',
-                       $this->fixture->getLabel()
+                       $this->subject->getLabel()
                );
        }
 
@@ -84,11 +84,11 @@ class LanguageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getLanguageInitiallyReturnsGivenLanguageFromConstruct() {
                $language = 'nl';
-               $this->fixture = new \TYPO3\CMS\Lang\Domain\Model\Language('', $language);
+               $this->subject = new \TYPO3\CMS\Lang\Domain\Model\Language('', $language);
 
                $this->assertSame(
                        $language,
-                       $this->fixture->getLabel()
+                       $this->subject->getLabel()
                );
        }
 
@@ -97,11 +97,11 @@ class LanguageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setLanguageSetsLanguage() {
                $language = 'nl';
-               $this->fixture->setLabel($language);
+               $this->subject->setLabel($language);
 
                $this->assertSame(
                        $language,
-                       $this->fixture->getLabel()
+                       $this->subject->getLabel()
                );
        }
 
@@ -111,7 +111,7 @@ class LanguageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        public function getSelectedInitiallyReturnsFalse() {
                $this->assertSame(
                        FALSE,
-                       $this->fixture->getSelected()
+                       $this->subject->getSelected()
                );
        }
 
@@ -120,11 +120,11 @@ class LanguageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function getSelectedInitiallyReturnsGivenSelectedFromConstruct() {
                $selected = FALSE;
-               $this->fixture = new \TYPO3\CMS\Lang\Domain\Model\Language('', '', FALSE);
+               $this->subject = new \TYPO3\CMS\Lang\Domain\Model\Language('', '', FALSE);
 
                $this->assertSame(
                        $selected,
-                       $this->fixture->getSelected()
+                       $this->subject->getSelected()
                );
        }
 
@@ -133,11 +133,11 @@ class LanguageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         */
        public function setSelectedSetsSelected() {
                $selected = TRUE;
-               $this->fixture->setSelected($selected);
+               $this->subject->setSelected($selected);
 
                $this->assertSame(
                        $selected,
-                       $this->fixture->getSelected()
+                       $this->subject->getSelected()
                );
        }
 
index e213a90..0094f0b 100644 (file)
@@ -24,10 +24,10 @@ class ArrayBrowserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        /**
         * @var \TYPO3\CMS\Lowlevel\Utility\ArrayBrowser
         */
-       protected $fixture;
+       protected $subject;
 
        protected function setUp() {
-               $this->fixture = new \TYPO3\CMS\Lowlevel\Utility\ArrayBrowser();
+               $this->subject = new \TYPO3\CMS\Lowlevel\Utility\ArrayBrowser();
        }
 
        ///////////////////////////////
@@ -37,14 +37,14 @@ class ArrayBrowserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
         * @test
         */
        public function depthKeysWithEmptyFirstParameterAddsNothing() {
-               $this->assertEquals(array(), $this->fixture->depthKeys(array(), array()));
+               $this->assertEquals(array(), $this->subject->depthKeys(array(), array()));
        }
 
        /**
         * @test
         */
        public function depthKeysWithNumericKeyAddsOneNumberForKeyFromFirstArray() {
-               $this->assertEquals(array(0 => 1), $this->fixture->depthKeys(array('foo'), array()));
+               $this->assertEquals(array(0 => 1), $this->subject->depthKeys(array('foo'), array()));
        }
 
 }