From 0d91116e67feb4662b4b67db95d6fa220dfcd930 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 13 Mar 2024 21:54:34 +0200 Subject: [PATCH] Use the "::class" in test suite for class referencing --- tests/aik099/PHPUnit/ApplicationTest.php | 8 ++-- .../ApiBrowserConfigurationTestCase.php | 15 +++--- .../BrowserConfigurationFactoryTest.php | 9 ++-- .../BrowserConfigurationTest.php | 11 +++-- .../BrowserStackBrowserConfigurationTest.php | 4 +- .../SauceLabsBrowserConfigurationTest.php | 4 +- tests/aik099/PHPUnit/BrowserTestCaseTest.php | 46 +++++++++---------- tests/aik099/PHPUnit/Fixture/SetupFixture.php | 21 +++++---- .../Integration/ApiIntegrationTest.php | 2 +- .../PHPUnit/Integration/DIContainerTest.php | 38 +++++++++------ .../Integration/EventDispatchingTest.php | 2 +- .../PHPUnit/Integration/SuiteBuildingTest.php | 13 +++--- .../MinkDriver/DriverFactoryRegistryTest.php | 5 +- .../PHPUnit/MinkDriver/DriverFactoryTest.php | 20 ++++---- .../RemoteCoverageHelperTest.php | 9 ++-- .../Session/IsolatedSessionStrategyTest.php | 2 +- .../PHPUnit/Session/SessionFactoryTest.php | 9 ++-- .../Session/SessionStrategyManagerTest.php | 16 ++++--- .../Session/SessionStrategyTestCase.php | 9 ++-- .../Session/SharedSessionStrategyTest.php | 2 +- .../TestCase/ApplicationAwareTestCase.php | 2 +- .../TestSuite/BrowserTestSuiteTest.php | 3 +- .../TestSuite/RegularTestSuiteTest.php | 15 ++++-- .../TestSuite/TestSuiteFactoryTest.php | 19 ++++---- 24 files changed, 163 insertions(+), 121 deletions(-) diff --git a/tests/aik099/PHPUnit/ApplicationTest.php b/tests/aik099/PHPUnit/ApplicationTest.php index 407c582..4c8f480 100644 --- a/tests/aik099/PHPUnit/ApplicationTest.php +++ b/tests/aik099/PHPUnit/ApplicationTest.php @@ -13,6 +13,7 @@ use aik099\PHPUnit\Application; use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; +use aik099\PHPUnit\TestSuite\TestSuiteFactory; class ApplicationTest extends AbstractTestCase { @@ -51,10 +52,7 @@ public function testInstanceIsShared() */ public function testGetTestSuiteFactory() { - $this->assertInstanceOf( - 'aik099\\PHPUnit\\TestSuite\\TestSuiteFactory', - $this->_application->getTestSuiteFactory() - ); + $this->assertInstanceOf(TestSuiteFactory::class, $this->_application->getTestSuiteFactory()); } /** @@ -64,7 +62,7 @@ public function testGetTestSuiteFactory() */ public function testGetObject() { - $this->assertInstanceOf('aik099\\PHPUnit\\Application', $this->_application->getObject('application')); + $this->assertInstanceOf(Application::class, $this->_application->getObject('application')); } /** diff --git a/tests/aik099/PHPUnit/BrowserConfiguration/ApiBrowserConfigurationTestCase.php b/tests/aik099/PHPUnit/BrowserConfiguration/ApiBrowserConfigurationTestCase.php index 13b0e6b..d3202d0 100644 --- a/tests/aik099/PHPUnit/BrowserConfiguration/ApiBrowserConfigurationTestCase.php +++ b/tests/aik099/PHPUnit/BrowserConfiguration/ApiBrowserConfigurationTestCase.php @@ -19,6 +19,9 @@ use ConsoleHelpers\PHPUnitCompat\Framework\TestResult; use Mockery as m; use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; +use Behat\Mink\Driver\Selenium2Driver; +use Behat\Mink\Driver\DriverInterface; +use Behat\Mink\Session; abstract class ApiBrowserConfigurationTestCase extends BrowserConfigurationTest { @@ -56,10 +59,10 @@ abstract class ApiBrowserConfigurationTestCase extends BrowserConfigurationTest protected function setUpTest() { if ( $this->needsAPIClient() ) { - $this->apiClient = m::mock('\\aik099\\PHPUnit\\APIClient\\IAPIClient'); + $this->apiClient = m::mock(IAPIClient::class); } - $this->apiClientFactory = m::mock('\\aik099\\PHPUnit\\APIClient\\APIClientFactory'); + $this->apiClientFactory = m::mock(APIClientFactory::class); parent::setUpTest(); @@ -309,7 +312,7 @@ public function testOnTestEnded($driver_type) $test_case = $this->createTestCase('TEST_NAME'); if ( $driver_type == 'selenium' ) { - $driver = m::mock('\\Behat\\Mink\\Driver\\Selenium2Driver'); + $driver = m::mock(Selenium2Driver::class); $driver->shouldReceive('getWebDriverSessionId')->once()->andReturn('SID'); $this->apiClient->shouldReceive('updateStatus')->with('SID', true, 'test status message')->once(); @@ -317,11 +320,11 @@ public function testOnTestEnded($driver_type) $test_case->shouldReceive('getStatusMessage')->once()->andReturn('test status message'); // For shared strategy. } else { - $driver = m::mock('\\Behat\\Mink\\Driver\\DriverInterface'); + $driver = m::mock(DriverInterface::class); $this->expectException('RuntimeException'); } - $session = m::mock('Behat\\Mink\\Session'); + $session = m::mock(Session::class); $session->shouldReceive('getDriver')->once()->andReturn($driver); $session->shouldReceive('isStarted')->once()->andReturn(true); @@ -353,7 +356,7 @@ public function testTestEndedWithoutSession($stopped_or_missing) $test_case = $this->createTestCase('TEST_NAME'); if ( $stopped_or_missing ) { - $session = m::mock('Behat\\Mink\\Session'); + $session = m::mock(Session::class); $session->shouldReceive('isStarted')->once()->andReturn(false); $test_case->shouldReceive('getSession')->with(false)->once()->andReturn($session); } diff --git a/tests/aik099/PHPUnit/BrowserConfiguration/BrowserConfigurationFactoryTest.php b/tests/aik099/PHPUnit/BrowserConfiguration/BrowserConfigurationFactoryTest.php index a9d330f..ade1567 100644 --- a/tests/aik099/PHPUnit/BrowserConfiguration/BrowserConfigurationFactoryTest.php +++ b/tests/aik099/PHPUnit/BrowserConfiguration/BrowserConfigurationFactoryTest.php @@ -16,6 +16,7 @@ use Mockery as m; use tests\aik099\PHPUnit\AbstractTestCase; use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; +use aik099\PHPUnit\BrowserTestCase; class BrowserConfigurationFactoryTest extends AbstractTestCase { @@ -51,7 +52,7 @@ public function testCreateBrowserConfiguration(array $browser_config, $type) { $browser_aliases = array('alias-one' => array()); - $test_case = m::mock('aik099\\PHPUnit\\BrowserTestCase'); + $test_case = m::mock(BrowserTestCase::class); $test_case->shouldReceive('getBrowserAliases')->once()->andReturn($browser_aliases); $cleaned_browser_config = $browser_config; @@ -72,7 +73,7 @@ public function testCreateBrowserConfiguration(array $browser_config, $type) $actual_browser = $this->_factory->createBrowserConfiguration($browser_config, $test_case); $this->assertEquals($type, $actual_browser->getType()); - $this->assertInstanceOf('aik099\\PHPUnit\\BrowserConfiguration\\BrowserConfiguration', $actual_browser); + $this->assertInstanceOf(BrowserConfiguration::class, $actual_browser); } /** @@ -99,7 +100,7 @@ public function testCreateBrowserConfigurationError() $browser_aliases = array('alias-one' => array()); - $test_case = m::mock('aik099\\PHPUnit\\BrowserTestCase'); + $test_case = m::mock(BrowserTestCase::class); $test_case->shouldReceive('getBrowserAliases')->once()->andReturn($browser_aliases); $this->_factory->createBrowserConfiguration(array('type' => 'test'), $test_case); @@ -128,7 +129,7 @@ public function testRegisterFailure() */ private function _createBrowserConfiguration($type) { - $browser_configuration = m::mock('aik099\\PHPUnit\\BrowserConfiguration\\BrowserConfiguration'); + $browser_configuration = m::mock(BrowserConfiguration::class); $browser_configuration->shouldReceive('getType')->andReturn($type); return $browser_configuration; diff --git a/tests/aik099/PHPUnit/BrowserConfiguration/BrowserConfigurationTest.php b/tests/aik099/PHPUnit/BrowserConfiguration/BrowserConfigurationTest.php index 3998f2c..bfad600 100644 --- a/tests/aik099/PHPUnit/BrowserConfiguration/BrowserConfigurationTest.php +++ b/tests/aik099/PHPUnit/BrowserConfiguration/BrowserConfigurationTest.php @@ -22,13 +22,14 @@ use tests\aik099\PHPUnit\Fixture\WithBrowserConfig; use tests\aik099\PHPUnit\Fixture\WithoutBrowserConfig; use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; +use aik099\PHPUnit\MinkDriver\IMinkDriverFactory; class BrowserConfigurationTest extends AbstractTestCase { use ExpectException; - const TEST_CASE_CLASS = '\\aik099\\PHPUnit\\BrowserTestCase'; + const TEST_CASE_CLASS = BrowserTestCase::class; const HOST = 'example_host'; @@ -89,7 +90,7 @@ class BrowserConfigurationTest extends AbstractTestCase protected function setUpTest() { if ( !$this->browserConfigurationClass ) { - $this->browserConfigurationClass = 'aik099\\PHPUnit\\BrowserConfiguration\\BrowserConfiguration'; + $this->browserConfigurationClass = BrowserConfiguration::class; } $this->setup = array( @@ -116,9 +117,9 @@ protected function setUpTest() */ protected function createDriverFactoryRegistry() { - $registry = m::mock('\\aik099\\PHPUnit\\MinkDriver\\DriverFactoryRegistry'); + $registry = m::mock(DriverFactoryRegistry::class); - $selenium2_driver_factory = m::mock('\\aik099\\PHPUnit\\MinkDriver\\IMinkDriverFactory'); + $selenium2_driver_factory = m::mock(IMinkDriverFactory::class); $selenium2_driver_factory->shouldReceive('getDriverDefaults')->andReturn(array( 'baseUrl' => 'http://www.super-url.com', 'driverOptions' => array( @@ -130,7 +131,7 @@ protected function createDriverFactoryRegistry() ->with('selenium2') ->andReturn($selenium2_driver_factory); - $zombie_driver_factory = m::mock('\\aik099\\PHPUnit\\MinkDriver\\IMinkDriverFactory'); + $zombie_driver_factory = m::mock(IMinkDriverFactory::class); $zombie_driver_factory->shouldReceive('getDriverDefaults')->andReturn(array()); $registry ->shouldReceive('get') diff --git a/tests/aik099/PHPUnit/BrowserConfiguration/BrowserStackBrowserConfigurationTest.php b/tests/aik099/PHPUnit/BrowserConfiguration/BrowserStackBrowserConfigurationTest.php index d567fcb..c157b55 100644 --- a/tests/aik099/PHPUnit/BrowserConfiguration/BrowserStackBrowserConfigurationTest.php +++ b/tests/aik099/PHPUnit/BrowserConfiguration/BrowserStackBrowserConfigurationTest.php @@ -11,6 +11,8 @@ namespace tests\aik099\PHPUnit\BrowserConfiguration; +use aik099\PHPUnit\BrowserConfiguration\BrowserStackBrowserConfiguration; + class BrowserStackBrowserConfigurationTest extends ApiBrowserConfigurationTestCase { @@ -21,7 +23,7 @@ class BrowserStackBrowserConfigurationTest extends ApiBrowserConfigurationTestCa */ protected function setUpTest() { - $this->browserConfigurationClass = 'aik099\\PHPUnit\\BrowserConfiguration\\BrowserStackBrowserConfiguration'; + $this->browserConfigurationClass = BrowserStackBrowserConfiguration::class; $this->tunnelCapabilities = array( 'browserstack.local' => 'true', diff --git a/tests/aik099/PHPUnit/BrowserConfiguration/SauceLabsBrowserConfigurationTest.php b/tests/aik099/PHPUnit/BrowserConfiguration/SauceLabsBrowserConfigurationTest.php index f528a2c..2d97375 100644 --- a/tests/aik099/PHPUnit/BrowserConfiguration/SauceLabsBrowserConfigurationTest.php +++ b/tests/aik099/PHPUnit/BrowserConfiguration/SauceLabsBrowserConfigurationTest.php @@ -11,6 +11,8 @@ namespace tests\aik099\PHPUnit\BrowserConfiguration; +use aik099\PHPUnit\BrowserConfiguration\SauceLabsBrowserConfiguration; + class SauceLabsBrowserConfigurationTest extends ApiBrowserConfigurationTestCase { @@ -21,7 +23,7 @@ class SauceLabsBrowserConfigurationTest extends ApiBrowserConfigurationTestCase */ protected function setUpTest() { - $this->browserConfigurationClass = 'aik099\\PHPUnit\\BrowserConfiguration\\SauceLabsBrowserConfiguration'; + $this->browserConfigurationClass = SauceLabsBrowserConfiguration::class; $this->tunnelCapabilities = array( 'tunnel-identifier' => 'env:PHPUNIT_MINK_TUNNEL_ID', diff --git a/tests/aik099/PHPUnit/BrowserTestCaseTest.php b/tests/aik099/PHPUnit/BrowserTestCaseTest.php index 935a078..d648731 100644 --- a/tests/aik099/PHPUnit/BrowserTestCaseTest.php +++ b/tests/aik099/PHPUnit/BrowserTestCaseTest.php @@ -30,17 +30,20 @@ use tests\aik099\PHPUnit\Fixture\WithBrowserConfig; use tests\aik099\PHPUnit\Fixture\WithoutBrowserConfig; use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; +use aik099\PHPUnit\MinkDriver\IMinkDriverFactory; +use Behat\Mink\Session; +use ConsoleHelpers\CodeCoverageCompat\Driver\Driver; class BrowserTestCaseTest extends AbstractTestCase { use ExpectException; - const BROWSER_CLASS = '\\aik099\\PHPUnit\\BrowserConfiguration\\BrowserConfiguration'; + const BROWSER_CLASS = BrowserConfiguration::class; - const MANAGER_CLASS = '\\aik099\\PHPUnit\\Session\\SessionStrategyManager'; + const MANAGER_CLASS = SessionStrategyManager::class; - const SESSION_STRATEGY_INTERFACE = '\\aik099\\PHPUnit\\Session\\ISessionStrategy'; + const SESSION_STRATEGY_INTERFACE = ISessionStrategy::class; /** * Browser configuration factory. @@ -59,9 +62,7 @@ protected function setUpTest() define('PHPUNIT_TESTSUITE', true); } - $this->browserConfigurationFactory = m::mock( - 'aik099\\PHPUnit\\BrowserConfiguration\\IBrowserConfigurationFactory' - ); + $this->browserConfigurationFactory = m::mock(IBrowserConfigurationFactory::class); } /** @@ -109,9 +110,9 @@ public function testSetBrowserCorrect() */ protected function createDriverFactoryRegistry() { - $registry = m::mock('\\aik099\\PHPUnit\\MinkDriver\\DriverFactoryRegistry'); + $registry = m::mock(DriverFactoryRegistry::class); - $driver_factory = m::mock('\\aik099\\PHPUnit\\MinkDriver\\IMinkDriverFactory'); + $driver_factory = m::mock(IMinkDriverFactory::class); $driver_factory->shouldReceive('getDriverDefaults')->andReturn(array()); $registry @@ -203,8 +204,8 @@ public function testGetSession() { $browser = $this->getBrowser(0); - $expected_session1 = m::mock('\\Behat\\Mink\\Session'); - $expected_session2 = m::mock('\\Behat\\Mink\\Session'); + $expected_session1 = m::mock(Session::class); + $expected_session2 = m::mock(Session::class); /** @var ISessionStrategy $session_strategy */ $session_strategy = m::mock(self::SESSION_STRATEGY_INTERFACE); @@ -291,10 +292,7 @@ public function testGetCollectCodeCoverageInformationSuccess() ); } else { - $code_coverage = new CodeCoverage( - m::mock('\\ConsoleHelpers\\CodeCoverageCompat\\Driver\\Driver'), - new Filter() - ); + $code_coverage = new CodeCoverage(m::mock(Driver::class), new Filter()); } $test_result->setCodeCoverage($code_coverage); @@ -331,7 +329,7 @@ public function testRunCreateResult() /** @var BrowserTestCase $test_case */ list($test_case,) = $this->prepareForRun(); - $this->assertInstanceOf('\\ConsoleHelpers\\PHPUnitCompat\\Framework\\TestResult', $test_case->run()); + $this->assertInstanceOf(TestResult::class, $test_case->run()); } /** @@ -368,7 +366,7 @@ public function testRunWithCoverageWithoutRemoteUrl() $browser = $test_case->getBrowser(); $browser->shouldReceive('getBaseUrl')->once()->andReturn('A'); - $session = m::mock('\\Behat\\Mink\\Session'); + $session = m::mock(Session::class); $session->shouldReceive('visit')->with('A')->once(); $session->shouldReceive('setCookie')->with(RemoteCoverageTool::TEST_ID_VARIABLE, null)->once(); $session->shouldReceive('setCookie')->with(RemoteCoverageTool::TEST_ID_VARIABLE, m::not(''))->once(); @@ -377,7 +375,7 @@ public function testRunWithCoverageWithoutRemoteUrl() $test_case->run($result); - if ( \class_exists('\SebastianBergmann\CodeCoverage\ProcessedCodeCoverageData') ) { + if ( \class_exists(ProcessedCodeCoverageData::class) ) { $actual_coverage = $code_coverage->getData(); $expected_coverage = new ProcessedCodeCoverageData(); $expected_coverage->setLineCoverage(array( @@ -443,7 +441,7 @@ public function testRunWithCoverage() $browser = $test_case->getBrowser(); $browser->shouldReceive('getBaseUrl')->once()->andReturn('A'); - $session = m::mock('\\Behat\\Mink\\Session'); + $session = m::mock(Session::class); $session->shouldReceive('visit')->with('A')->once(); $session->shouldReceive('setCookie')->with(RemoteCoverageTool::TEST_ID_VARIABLE, null)->once(); $session->shouldReceive('setCookie')->with(RemoteCoverageTool::TEST_ID_VARIABLE, m::not(''))->once(); @@ -454,7 +452,7 @@ public function testRunWithCoverage() $covered_by_test = 'tests\aik099\PHPUnit\Fixture\WithoutBrowserConfig::getTestId'; - if ( \class_exists('\SebastianBergmann\CodeCoverage\ProcessedCodeCoverageData') ) { + if ( \class_exists(ProcessedCodeCoverageData::class) ) { $expected_coverage = new ProcessedCodeCoverageData(); $expected_coverage->setLineCoverage(array( $this->getCoverageFixtureFile() => array( @@ -502,10 +500,10 @@ protected function getCoverageFixtureFile() */ protected function getRemoteCoverageHelperMock(array $expected_coverage = null) { - $remote_coverage_helper = m::mock('aik099\\PHPUnit\\RemoteCoverage\\RemoteCoverageHelper'); + $remote_coverage_helper = m::mock(RemoteCoverageHelper::class); if ( $expected_coverage !== null ) { - if ( \class_exists('\SebastianBergmann\CodeCoverage\RawCodeCoverageData') ) { + if ( \class_exists(RawCodeCoverageData::class) ) { $remote_coverage_helper ->shouldReceive('get') ->with('some-url', 'tests\aik099\PHPUnit\Fixture\WithoutBrowserConfig__getTestId') @@ -519,7 +517,7 @@ protected function getRemoteCoverageHelperMock(array $expected_coverage = null) } } - if ( \class_exists('\SebastianBergmann\CodeCoverage\RawCodeCoverageData') ) { + if ( \class_exists(RawCodeCoverageData::class) ) { $remote_coverage_helper ->shouldReceive('getEmpty') ->andReturn(RawCodeCoverageData::fromXdebugWithoutPathCoverage(array())); @@ -546,13 +544,13 @@ protected function getCodeCoverageMock(array $expected_coverage) $driver = m::mock('\PHP_CodeCoverage_Driver'); } else { - $driver = m::mock('\\ConsoleHelpers\\CodeCoverageCompat\\Driver\\Driver'); + $driver = m::mock(Driver::class); } $driver->shouldReceive('start')->once(); // Can't assert call count, because expectations are verified prior to coverage being queried. - if ( \class_exists('\SebastianBergmann\CodeCoverage\RawCodeCoverageData') ) { + if ( \class_exists(RawCodeCoverageData::class) ) { $driver->shouldReceive('stop') /*->once()*/ ->andReturn( diff --git a/tests/aik099/PHPUnit/Fixture/SetupFixture.php b/tests/aik099/PHPUnit/Fixture/SetupFixture.php index c071c97..b88a393 100644 --- a/tests/aik099/PHPUnit/Fixture/SetupFixture.php +++ b/tests/aik099/PHPUnit/Fixture/SetupFixture.php @@ -19,6 +19,10 @@ use Behat\Mink\Session; use Mockery as m; use tests\aik099\PHPUnit\TVerifyTestExpectations; +use aik099\PHPUnit\APIClient\IAPIClient; +use aik099\PHPUnit\BrowserConfiguration\IBrowserConfigurationFactory; +use aik099\PHPUnit\MinkDriver\IMinkDriverFactory; +use Behat\Mink\Driver\Selenium2Driver; class SetupFixture extends BrowserTestCase { @@ -30,11 +34,11 @@ class SetupFixture extends BrowserTestCase */ protected function setUpTest() { - $api_client = m::mock('aik099\\PHPUnit\\APIClient\\IAPIClient'); + $api_client = m::mock(IAPIClient::class); $api_client->shouldReceive('updateStatus')->withAnyArgs()->once(); /** @var APIClientFactory $api_client_factory */ - $api_client_factory = m::mock('\\aik099\\PHPUnit\\APIClient\\APIClientFactory'); + $api_client_factory = m::mock(APIClientFactory::class); $browser = new SauceLabsBrowserConfiguration($this->createDriverFactoryRegistry(), $api_client_factory); @@ -46,8 +50,7 @@ protected function setUpTest() $browser_config = array('apiUsername' => 'a', 'apiKey' => 'b'); - /** @var IBrowserConfigurationFactory $factory */ - $factory = m::mock('aik099\\PHPUnit\\BrowserConfiguration\\IBrowserConfigurationFactory'); + $factory = m::mock(IBrowserConfigurationFactory::class); $factory->shouldReceive('createBrowserConfiguration') ->with($browser_config, $this) @@ -67,9 +70,9 @@ protected function setUpTest() */ protected function createDriverFactoryRegistry() { - $registry = m::mock('\\aik099\\PHPUnit\\MinkDriver\\DriverFactoryRegistry'); + $registry = m::mock(DriverFactoryRegistry::class); - $driver_factory = m::mock('\\aik099\\PHPUnit\\MinkDriver\\IMinkDriverFactory'); + $driver_factory = m::mock(IMinkDriverFactory::class); $driver_factory->shouldReceive('getDriverDefaults')->andReturn(array()); $registry @@ -87,10 +90,10 @@ protected function createDriverFactoryRegistry() */ public function testEvents() { - $driver = m::mock('\\Behat\\Mink\\Driver\\Selenium2Driver'); + $driver = m::mock(Selenium2Driver::class); $driver->shouldReceive('getWebDriverSessionId')->once()->andReturn('SID'); - $session = m::mock('Behat\\Mink\\Session'); + $session = m::mock(Session::class); // For ApiBrowserConfiguration::onTestEnded. $session->shouldReceive('getDriver')->once()->andReturn($driver); @@ -114,7 +117,7 @@ public function testEvents() */ private function _setSession(Session $session) { - $property = new \ReflectionProperty('aik099\\PHPUnit\\BrowserTestCase', '_session'); + $property = new \ReflectionProperty(BrowserTestCase::class, '_session'); $property->setAccessible(true); $property->setValue($this, $session); } diff --git a/tests/aik099/PHPUnit/Integration/ApiIntegrationTest.php b/tests/aik099/PHPUnit/Integration/ApiIntegrationTest.php index 82a1e47..93f827c 100644 --- a/tests/aik099/PHPUnit/Integration/ApiIntegrationTest.php +++ b/tests/aik099/PHPUnit/Integration/ApiIntegrationTest.php @@ -40,7 +40,7 @@ public function testAPICalls() { $result = new TestResult(); - $suite = ApiIntegrationFixture::suite('tests\\aik099\\PHPUnit\\Fixture\\ApiIntegrationFixture'); + $suite = ApiIntegrationFixture::suite(ApiIntegrationFixture::class); $suite->run($result); $this->assertTrue(true); diff --git a/tests/aik099/PHPUnit/Integration/DIContainerTest.php b/tests/aik099/PHPUnit/Integration/DIContainerTest.php index 20af4ca..82e9acd 100644 --- a/tests/aik099/PHPUnit/Integration/DIContainerTest.php +++ b/tests/aik099/PHPUnit/Integration/DIContainerTest.php @@ -14,6 +14,17 @@ use aik099\PHPUnit\Application; use aik099\PHPUnit\DIContainer; use tests\aik099\PHPUnit\AbstractTestCase; +use aik099\PHPUnit\TestSuite\RegularTestSuite; +use aik099\PHPUnit\TestSuite\BrowserTestSuite; +use aik099\PHPUnit\APIClient\APIClientFactory; +use aik099\PHPUnit\TestSuite\TestSuiteFactory; +use aik099\PHPUnit\RemoteCoverage\RemoteUrl; +use aik099\PHPUnit\Session\SessionStrategyManager; +use aik099\PHPUnit\Session\SessionStrategyFactory; +use aik099\PHPUnit\Session\SessionFactory; +use aik099\PHPUnit\RemoteCoverage\RemoteCoverageHelper; +use aik099\PHPUnit\BrowserConfiguration\BrowserConfigurationFactory; +use aik099\PHPUnit\MinkDriver\DriverFactoryRegistry; class DIContainerTest extends AbstractTestCase { @@ -58,21 +69,18 @@ public function testServiceDefinitions($service_id, $class_name) public static function serviceDefinitionsDataProvider() { return array( - array('application', 'aik099\\PHPUnit\\Application'), - array('session_factory', 'aik099\\PHPUnit\\Session\\SessionFactory'), - array('session_strategy_factory', 'aik099\\PHPUnit\\Session\\SessionStrategyFactory'), - array('session_strategy_manager', 'aik099\\PHPUnit\\Session\\SessionStrategyManager'), - array('remote_url', 'aik099\\PHPUnit\\RemoteCoverage\\RemoteUrl'), - array('remote_coverage_helper', 'aik099\\PHPUnit\\RemoteCoverage\\RemoteCoverageHelper'), - array('test_suite_factory', 'aik099\\PHPUnit\\TestSuite\\TestSuiteFactory'), - array('regular_test_suite', 'aik099\\PHPUnit\\TestSuite\\RegularTestSuite'), - array('browser_test_suite', 'aik099\\PHPUnit\\TestSuite\\BrowserTestSuite'), - array('api_client_factory', 'aik099\\PHPUnit\\APIClient\\APIClientFactory'), - array( - 'browser_configuration_factory', - 'aik099\\PHPUnit\\BrowserConfiguration\\BrowserConfigurationFactory', - ), - array('driver_factory_registry', 'aik099\\PHPUnit\\MinkDriver\\DriverFactoryRegistry'), + array('application', Application::class), + array('session_factory', SessionFactory::class), + array('session_strategy_factory', SessionStrategyFactory::class), + array('session_strategy_manager', SessionStrategyManager::class), + array('remote_url', RemoteUrl::class), + array('remote_coverage_helper', RemoteCoverageHelper::class), + array('test_suite_factory', TestSuiteFactory::class), + array('regular_test_suite', RegularTestSuite::class), + array('browser_test_suite', BrowserTestSuite::class), + array('api_client_factory', APIClientFactory::class), + array('browser_configuration_factory', BrowserConfigurationFactory::class), + array('driver_factory_registry', DriverFactoryRegistry::class), ); } diff --git a/tests/aik099/PHPUnit/Integration/EventDispatchingTest.php b/tests/aik099/PHPUnit/Integration/EventDispatchingTest.php index 56cb306..dbf9a31 100644 --- a/tests/aik099/PHPUnit/Integration/EventDispatchingTest.php +++ b/tests/aik099/PHPUnit/Integration/EventDispatchingTest.php @@ -56,7 +56,7 @@ public function testSetupEvent() $result = new TestResult(); - $suite = SetupFixture::suite('tests\\aik099\\PHPUnit\\Fixture\\SetupFixture'); + $suite = SetupFixture::suite(SetupFixture::class); $suite->run($result); $error_msgs = array(); diff --git a/tests/aik099/PHPUnit/Integration/SuiteBuildingTest.php b/tests/aik099/PHPUnit/Integration/SuiteBuildingTest.php index 690584e..c176c7c 100644 --- a/tests/aik099/PHPUnit/Integration/SuiteBuildingTest.php +++ b/tests/aik099/PHPUnit/Integration/SuiteBuildingTest.php @@ -20,17 +20,18 @@ use tests\aik099\PHPUnit\AbstractTestCase; use tests\aik099\PHPUnit\Fixture\WithBrowserConfig; use tests\aik099\PHPUnit\Fixture\WithoutBrowserConfig; +use aik099\PHPUnit\Session\ISessionStrategy; class SuiteBuildingTest extends AbstractTestCase { - const SUITE_CLASS = '\\aik099\\PHPUnit\\TestSuite\\RegularTestSuite'; + const SUITE_CLASS = RegularTestSuite::class; - const BROWSER_SUITE_CLASS = '\\aik099\\PHPUnit\\TestSuite\\BrowserTestSuite'; + const BROWSER_SUITE_CLASS = BrowserTestSuite::class; - const TEST_CASE_WITH_CONFIG = '\\tests\\aik099\\PHPUnit\\Fixture\\WithBrowserConfig'; + const TEST_CASE_WITH_CONFIG = WithBrowserConfig::class; - const TEST_CASE_WITHOUT_CONFIG = '\\tests\\aik099\\PHPUnit\\Fixture\\WithoutBrowserConfig'; + const TEST_CASE_WITHOUT_CONFIG = WithoutBrowserConfig::class; /** * Tests, that suite is built correctly in case, when static $browsers array is filled-in in test case class. @@ -53,7 +54,7 @@ public function testWithBrowserConfiguration() $suite_tests = $test_suite->tests(); $this->checkArray($suite_tests, 2, self::TEST_CASE_WITH_CONFIG); - $this->assertInstanceOf('aik099\PHPUnit\Session\ISessionStrategy', $suite_tests[0]->getSessionStrategy()); + $this->assertInstanceOf(ISessionStrategy::class, $suite_tests[0]->getSessionStrategy()); } } @@ -134,7 +135,7 @@ protected function createTestSuite($class_name) */ protected function getPhpUnitVersion() { - if ( \class_exists('PHPUnit\Runner\Version') ) { + if ( \class_exists(Version::class) ) { return Version::id(); } diff --git a/tests/aik099/PHPUnit/MinkDriver/DriverFactoryRegistryTest.php b/tests/aik099/PHPUnit/MinkDriver/DriverFactoryRegistryTest.php index c23d99d..d60dd82 100644 --- a/tests/aik099/PHPUnit/MinkDriver/DriverFactoryRegistryTest.php +++ b/tests/aik099/PHPUnit/MinkDriver/DriverFactoryRegistryTest.php @@ -16,6 +16,7 @@ use Mockery as m; use tests\aik099\PHPUnit\AbstractTestCase; use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; +use aik099\PHPUnit\MinkDriver\IMinkDriverFactory; class DriverFactoryRegistryTest extends AbstractTestCase { @@ -39,7 +40,7 @@ public function setUpTest() public function testAddingAndGetting() { - $factory = m::mock('aik099\\PHPUnit\\MinkDriver\\IMinkDriverFactory'); + $factory = m::mock(IMinkDriverFactory::class); $factory->shouldReceive('getDriverName')->andReturn('test'); $this->_driverFactoryRegistry->add($factory); @@ -52,7 +53,7 @@ public function testAddingExisting() $this->expectException('LogicException'); $this->expectExceptionMessage('Driver factory for "test" driver is already registered.'); - $factory = m::mock('aik099\\PHPUnit\\MinkDriver\\IMinkDriverFactory'); + $factory = m::mock(IMinkDriverFactory::class); $factory->shouldReceive('getDriverName')->andReturn('test'); $this->_driverFactoryRegistry->add($factory); diff --git a/tests/aik099/PHPUnit/MinkDriver/DriverFactoryTest.php b/tests/aik099/PHPUnit/MinkDriver/DriverFactoryTest.php index 8a17918..54b6360 100644 --- a/tests/aik099/PHPUnit/MinkDriver/DriverFactoryTest.php +++ b/tests/aik099/PHPUnit/MinkDriver/DriverFactoryTest.php @@ -17,6 +17,10 @@ use aik099\PHPUnit\MinkDriver\IMinkDriverFactory; use tests\aik099\PHPUnit\AbstractTestCase; use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; +use aik099\PHPUnit\MinkDriver\GoutteDriverFactory; +use aik099\PHPUnit\MinkDriver\SahiDriverFactory; +use aik099\PHPUnit\MinkDriver\Selenium2DriverFactory; +use aik099\PHPUnit\MinkDriver\ZombieDriverFactory; class DriverFactoryTest extends AbstractTestCase { @@ -79,20 +83,20 @@ public static function driverDataProvider() { return array( 'goutte' => array( - 'Behat\\Mink\\Driver\\GoutteDriver', - 'aik099\PHPUnit\MinkDriver\GoutteDriverFactory', + '\Behat\Mink\Driver\GoutteDriver', + GoutteDriverFactory::class, ), 'sahi' => array( - 'Behat\\Mink\\Driver\\SahiDriver', - 'aik099\PHPUnit\MinkDriver\SahiDriverFactory', + '\Behat\Mink\Driver\SahiDriver', + SahiDriverFactory::class, ), 'selenium2' => array( - 'Behat\\Mink\\Driver\\Selenium2Driver', - 'aik099\PHPUnit\MinkDriver\Selenium2DriverFactory', + '\Behat\Mink\Driver\Selenium2Driver', + Selenium2DriverFactory::class, ), 'zombie' => array( - 'Behat\\Mink\\Driver\\ZombieDriver', - 'aik099\PHPUnit\MinkDriver\ZombieDriverFactory', + '\Behat\Mink\Driver\ZombieDriver', + ZombieDriverFactory::class, ), ); } diff --git a/tests/aik099/PHPUnit/RemoteCoverage/RemoteCoverageHelperTest.php b/tests/aik099/PHPUnit/RemoteCoverage/RemoteCoverageHelperTest.php index 67e1faa..952f06c 100644 --- a/tests/aik099/PHPUnit/RemoteCoverage/RemoteCoverageHelperTest.php +++ b/tests/aik099/PHPUnit/RemoteCoverage/RemoteCoverageHelperTest.php @@ -18,6 +18,7 @@ use tests\aik099\PHPUnit\AbstractTestCase; use Yoast\PHPUnitPolyfills\Polyfills\AssertIsType; use Yoast\PHPUnitPolyfills\Polyfills\ExpectException; +use SebastianBergmann\CodeCoverage\RawCodeCoverageData; class RemoteCoverageHelperTest extends AbstractTestCase { @@ -45,7 +46,7 @@ class RemoteCoverageHelperTest extends AbstractTestCase */ protected function setUpTest() { - $this->_remoteUrl = m::mock('aik099\\PHPUnit\\RemoteCoverage\\RemoteUrl'); + $this->_remoteUrl = m::mock(RemoteUrl::class); $this->_remoteCoverageHelper = new RemoteCoverageHelper($this->_remoteUrl); } @@ -99,8 +100,8 @@ public function testCreateUrl($coverage_script_url, $test_id, $expected_url) $result = $this->_remoteCoverageHelper->get($coverage_script_url, $test_id); - if ( \class_exists('\SebastianBergmann\CodeCoverage\RawCodeCoverageData') ) { - $this->assertInstanceOf('\SebastianBergmann\CodeCoverage\RawCodeCoverageData', $result); + if ( \class_exists(RawCodeCoverageData::class) ) { + $this->assertInstanceOf(RawCodeCoverageData::class, $result); $this->assertCount(0, $result->lineCoverage()); } else { @@ -165,7 +166,7 @@ public function testValidCoverageIsReturned() 14 => 1, ); - if ( \class_exists('\SebastianBergmann\CodeCoverage\RawCodeCoverageData') ) { + if ( \class_exists(RawCodeCoverageData::class) ) { $this->assertEquals(array($class_source_file => $expected), $content->lineCoverage()); } else { diff --git a/tests/aik099/PHPUnit/Session/IsolatedSessionStrategyTest.php b/tests/aik099/PHPUnit/Session/IsolatedSessionStrategyTest.php index 43be1b9..3f40dfd 100644 --- a/tests/aik099/PHPUnit/Session/IsolatedSessionStrategyTest.php +++ b/tests/aik099/PHPUnit/Session/IsolatedSessionStrategyTest.php @@ -31,7 +31,7 @@ class IsolatedSessionStrategyTest extends SessionStrategyTestCase */ protected function setUpTest() { - $this->_factory = m::mock('aik099\\PHPUnit\\Session\\ISessionFactory'); + $this->_factory = m::mock(ISessionFactory::class); $this->strategy = new IsolatedSessionStrategy($this->_factory); } diff --git a/tests/aik099/PHPUnit/Session/SessionFactoryTest.php b/tests/aik099/PHPUnit/Session/SessionFactoryTest.php index 7a8677a..9e016c6 100644 --- a/tests/aik099/PHPUnit/Session/SessionFactoryTest.php +++ b/tests/aik099/PHPUnit/Session/SessionFactoryTest.php @@ -14,6 +14,9 @@ use aik099\PHPUnit\Session\SessionFactory; use Mockery as m; use tests\aik099\PHPUnit\AbstractTestCase; +use Behat\Mink\Driver\DriverInterface; +use aik099\PHPUnit\BrowserConfiguration\BrowserConfiguration; +use Behat\Mink\Session; class SessionFactoryTest extends AbstractTestCase { @@ -40,15 +43,15 @@ protected function setUpTest() */ public function testCreateSession() { - $driver = m::mock('Behat\\Mink\\Driver\\DriverInterface'); + $driver = m::mock(DriverInterface::class); $driver->shouldReceive('setSession')->with(m::any())->once(); - $browser = m::mock('aik099\\PHPUnit\\BrowserConfiguration\\BrowserConfiguration'); + $browser = m::mock(BrowserConfiguration::class); $browser->shouldReceive('createDriver')->once()->andReturn($driver); $session = $this->_factory->createSession($browser); - $this->assertInstanceOf('Behat\\Mink\\Session', $session); + $this->assertInstanceOf(Session::class, $session); $this->assertSame($driver, $session->getDriver()); } diff --git a/tests/aik099/PHPUnit/Session/SessionStrategyManagerTest.php b/tests/aik099/PHPUnit/Session/SessionStrategyManagerTest.php index 4f584e3..14c8d35 100644 --- a/tests/aik099/PHPUnit/Session/SessionStrategyManagerTest.php +++ b/tests/aik099/PHPUnit/Session/SessionStrategyManagerTest.php @@ -17,6 +17,10 @@ use aik099\PHPUnit\Session\SessionStrategyManager; use Mockery as m; use tests\aik099\PHPUnit\AbstractTestCase; +use aik099\PHPUnit\Session\IsolatedSessionStrategy; +use aik099\PHPUnit\Session\SharedSessionStrategy; +use aik099\PHPUnit\BrowserConfiguration\BrowserConfiguration; +use aik099\PHPUnit\BrowserTestCase; class SessionStrategyManagerTest extends AbstractTestCase { @@ -40,7 +44,7 @@ class SessionStrategyManagerTest extends AbstractTestCase */ protected function setUpTest() { - $this->factory = m::mock('aik099\\PHPUnit\\Session\\ISessionStrategyFactory'); + $this->factory = m::mock(ISessionStrategyFactory::class); $this->manager = new SessionStrategyManager($this->factory); } @@ -79,7 +83,7 @@ public function testGetSessionStrategySharing() $this->factory ->shouldReceive('createStrategy') ->andReturnUsing(function () { - return m::mock('aik099\\PHPUnit\\Session\\ISessionStrategy'); + return m::mock(ISessionStrategy::class); }); // Sequential identical browser configurations share strategy. @@ -103,7 +107,7 @@ public function testGetSessionStrategySharing() */ public function testGetSessionStrategyIsolated() { - $expected = '\\aik099\\PHPUnit\\Session\\IsolatedSessionStrategy'; + $expected = IsolatedSessionStrategy::class; $this->factory->shouldReceive('createStrategy')->andReturn(m::mock($expected)); $this->assertInstanceOf($expected, $this->_getStrategy(ISessionStrategyFactory::TYPE_ISOLATED, 'IS1')); @@ -116,7 +120,7 @@ public function testGetSessionStrategyIsolated() */ public function testGetSessionStrategyShared() { - $expected = '\\aik099\\PHPUnit\\Session\\SharedSessionStrategy'; + $expected = SharedSessionStrategy::class; $this->factory->shouldReceive('createStrategy')->andReturn(m::mock($expected)); $this->assertInstanceOf($expected, $this->_getStrategy(ISessionStrategyFactory::TYPE_SHARED, 'SH1')); @@ -132,11 +136,11 @@ public function testGetSessionStrategyShared() */ private function _getStrategy($strategy_type, $strategy_hash) { - $browser = m::mock('aik099\\PHPUnit\\BrowserConfiguration\\BrowserConfiguration'); + $browser = m::mock(BrowserConfiguration::class); $browser->shouldReceive('getSessionStrategy')->once()->andReturn($strategy_type); $browser->shouldReceive('getSessionStrategyHash')->once()->andReturn($strategy_hash); - $test_case = m::mock('aik099\\PHPUnit\\BrowserTestCase'); + $test_case = m::mock(BrowserTestCase::class); return $this->manager->getSessionStrategy($browser, $test_case); } diff --git a/tests/aik099/PHPUnit/Session/SessionStrategyTestCase.php b/tests/aik099/PHPUnit/Session/SessionStrategyTestCase.php index 28f9857..a3e4354 100644 --- a/tests/aik099/PHPUnit/Session/SessionStrategyTestCase.php +++ b/tests/aik099/PHPUnit/Session/SessionStrategyTestCase.php @@ -13,15 +13,18 @@ use aik099\PHPUnit\Session\ISessionStrategy; use tests\aik099\PHPUnit\AbstractTestCase; +use aik099\PHPUnit\BrowserConfiguration\BrowserConfiguration; +use Behat\Mink\Session; +use aik099\PHPUnit\BrowserTestCase; class SessionStrategyTestCase extends AbstractTestCase { - const BROWSER_CLASS = '\\aik099\\PHPUnit\\BrowserConfiguration\\BrowserConfiguration'; + const BROWSER_CLASS = BrowserConfiguration::class; - const SESSION_CLASS = '\\Behat\\Mink\\Session'; + const SESSION_CLASS = Session::class; - const TEST_CASE_CLASS = 'aik099\\PHPUnit\\BrowserTestCase'; + const TEST_CASE_CLASS = BrowserTestCase::class; /** * Session strategy. diff --git a/tests/aik099/PHPUnit/Session/SharedSessionStrategyTest.php b/tests/aik099/PHPUnit/Session/SharedSessionStrategyTest.php index 898b1f4..aa0abe1 100644 --- a/tests/aik099/PHPUnit/Session/SharedSessionStrategyTest.php +++ b/tests/aik099/PHPUnit/Session/SharedSessionStrategyTest.php @@ -52,7 +52,7 @@ protected function setUpTest() $this->_session1 = $this->createSession(); $this->_session2 = $this->createSession(); - $this->_isolatedStrategy = m::mock('\\aik099\\PHPUnit\\Session\\IsolatedSessionStrategy'); + $this->_isolatedStrategy = m::mock(IsolatedSessionStrategy::class); $this->strategy = new SharedSessionStrategy($this->_isolatedStrategy); } diff --git a/tests/aik099/PHPUnit/TestCase/ApplicationAwareTestCase.php b/tests/aik099/PHPUnit/TestCase/ApplicationAwareTestCase.php index b3a7648..1596729 100644 --- a/tests/aik099/PHPUnit/TestCase/ApplicationAwareTestCase.php +++ b/tests/aik099/PHPUnit/TestCase/ApplicationAwareTestCase.php @@ -31,7 +31,7 @@ class ApplicationAwareTestCase extends AbstractTestCase */ protected function setUpTest() { - $this->application = m::mock('aik099\\PHPUnit\\Application'); + $this->application = m::mock(Application::class); } /** diff --git a/tests/aik099/PHPUnit/TestSuite/BrowserTestSuiteTest.php b/tests/aik099/PHPUnit/TestSuite/BrowserTestSuiteTest.php index f9a6805..9d00b1e 100644 --- a/tests/aik099/PHPUnit/TestSuite/BrowserTestSuiteTest.php +++ b/tests/aik099/PHPUnit/TestSuite/BrowserTestSuiteTest.php @@ -14,6 +14,7 @@ use aik099\PHPUnit\TestSuite\BrowserTestSuite; use Mockery as m; use tests\aik099\PHPUnit\AbstractTestCase; +use ConsoleHelpers\PHPUnitCompat\Framework\Test; class BrowserTestSuiteTest extends AbstractTestCase { @@ -72,7 +73,7 @@ public static function nameFromBrowserDataProvider() public function testSetBrowserFromConfiguration() { $browser = array('name' => 'safari'); - $test = m::mock('\\ConsoleHelpers\\PHPUnitCompat\\Framework\\Test'); + $test = m::mock(Test::class); $test->shouldReceive('setBrowserFromConfiguration')->with($browser)->once(); $this->_suite->addTest($test); diff --git a/tests/aik099/PHPUnit/TestSuite/RegularTestSuiteTest.php b/tests/aik099/PHPUnit/TestSuite/RegularTestSuiteTest.php index e6a2b1b..badb265 100644 --- a/tests/aik099/PHPUnit/TestSuite/RegularTestSuiteTest.php +++ b/tests/aik099/PHPUnit/TestSuite/RegularTestSuiteTest.php @@ -14,6 +14,11 @@ use aik099\PHPUnit\TestSuite\RegularTestSuite; use Mockery as m; use tests\aik099\PHPUnit\AbstractTestCase; +use tests\aik099\PHPUnit\Fixture\WithoutBrowserConfig; +use aik099\PHPUnit\Session\SessionStrategyManager; +use aik099\PHPUnit\BrowserConfiguration\IBrowserConfigurationFactory; +use aik099\PHPUnit\RemoteCoverage\RemoteCoverageHelper; +use ConsoleHelpers\PHPUnitCompat\Framework\Test; class RegularTestSuiteTest extends AbstractTestCase { @@ -27,7 +32,7 @@ public function testAddTestMethods() { $suite = $this->_createSuite(); - $actual = $suite->addTestMethods('tests\\aik099\\PHPUnit\\Fixture\\WithoutBrowserConfig'); + $actual = $suite->addTestMethods(WithoutBrowserConfig::class); $this->assertSame($suite, $actual, 'The fluid interface doesn\'t work.'); $this->assertCount(2, $actual->tests(), 'Not all tests were added.'); @@ -40,11 +45,11 @@ public function testAddTestMethods() */ public function testSetTestDependencies() { - $manager = m::mock('aik099\\PHPUnit\\Session\\SessionStrategyManager'); - $factory = m::mock('aik099\\PHPUnit\\BrowserConfiguration\\IBrowserConfigurationFactory'); - $helper = m::mock('aik099\\PHPUnit\\RemoteCoverage\\RemoteCoverageHelper'); + $manager = m::mock(SessionStrategyManager::class); + $factory = m::mock(IBrowserConfigurationFactory::class); + $helper = m::mock(RemoteCoverageHelper::class); - $test = m::mock('\\ConsoleHelpers\\PHPUnitCompat\\Framework\\Test'); + $test = m::mock(Test::class); $test->shouldReceive('setSessionStrategyManager')->with($manager)->once(); $test->shouldReceive('setBrowserConfigurationFactory')->with($factory)->once(); $test->shouldReceive('setRemoteCoverageHelper')->with($helper)->once(); diff --git a/tests/aik099/PHPUnit/TestSuite/TestSuiteFactoryTest.php b/tests/aik099/PHPUnit/TestSuite/TestSuiteFactoryTest.php index f3c2da6..ac13fc5 100644 --- a/tests/aik099/PHPUnit/TestSuite/TestSuiteFactoryTest.php +++ b/tests/aik099/PHPUnit/TestSuite/TestSuiteFactoryTest.php @@ -18,6 +18,9 @@ use aik099\PHPUnit\TestSuite\TestSuiteFactory; use Mockery as m; use tests\aik099\PHPUnit\TestCase\ApplicationAwareTestCase; +use aik099\PHPUnit\TestSuite\RegularTestSuite; +use tests\aik099\PHPUnit\Fixture\WithoutBrowserConfig; +use tests\aik099\PHPUnit\Fixture\WithBrowserConfig; class TestSuiteFactoryTest extends ApplicationAwareTestCase { @@ -57,9 +60,9 @@ protected function setUpTest() { parent::setUpTest(); - $this->_manager = m::mock('aik099\\PHPUnit\\Session\\SessionStrategyManager'); - $this->_browserFactory = m::mock('aik099\\PHPUnit\\BrowserConfiguration\\IBrowserConfigurationFactory'); - $this->_remoteCoverageHelper = m::mock('aik099\\PHPUnit\\RemoteCoverage\\RemoteCoverageHelper'); + $this->_manager = m::mock(SessionStrategyManager::class); + $this->_browserFactory = m::mock(IBrowserConfigurationFactory::class); + $this->_remoteCoverageHelper = m::mock(RemoteCoverageHelper::class); $this->_factory = new TestSuiteFactory($this->_manager, $this->_browserFactory, $this->_remoteCoverageHelper); $this->_factory->setApplication($this->application); @@ -72,8 +75,8 @@ protected function setUpTest() */ public function testCreateSuiteFromTestCaseWithoutBrowsers() { - $suite_class_name = 'aik099\\PHPUnit\\TestSuite\\RegularTestSuite'; - $test_case_class_name = 'tests\\aik099\\PHPUnit\\Fixture\\WithoutBrowserConfig'; + $suite_class_name = RegularTestSuite::class; + $test_case_class_name = WithoutBrowserConfig::class; $suite = m::mock($suite_class_name); $suite->shouldReceive('setName')->with($test_case_class_name)->once(); @@ -95,8 +98,8 @@ public function testCreateSuiteFromTestCaseWithoutBrowsers() */ public function testCreateSuiteFromTestCaseWithBrowsers() { - $suite_class_name = 'aik099\\PHPUnit\\TestSuite\\RegularTestSuite'; - $test_case_class_name = 'tests\\aik099\\PHPUnit\\Fixture\\WithBrowserConfig'; + $suite_class_name = RegularTestSuite::class; + $test_case_class_name = WithBrowserConfig::class; $browser_suite1 = $this->_createBrowserTestSuiteMock($test_case_class_name, array( 'browserName' => 'firefox', 'host' => 'localhost', @@ -126,7 +129,7 @@ public function testCreateSuiteFromTestCaseWithBrowsers() */ private function _createBrowserTestSuiteMock($class_name, array $browser) { - $suite = m::mock('aik099\\PHPUnit\\TestSuite\\BrowserTestSuite'); + $suite = m::mock(BrowserTestSuite::class); $suite->shouldReceive('nameFromBrowser')->with($browser)->once()->andReturn('OK'); $suite->shouldReceive('setName')->with($class_name . ': OK')->once(); $suite->shouldReceive('addTestMethods')->with($class_name)->once();