From: =?utf-8?q?David_Pr=C3=A9vot?= Date: Sat, 12 Dec 2020 14:10:18 -0400 Subject: Adapt to recent version of PHPUnit (9) --- src/test/php/PDepend/ApplicationTest.php | 7 ++- .../Bugs/ClosureResultsInExceptionBug070Test.php | 2 +- .../EndLessLoopBetweenForParentClassBug152Test.php | 2 +- .../Bugs/EndlessInheritanceBug18459091Test.php | 10 ++-- src/test/php/PDepend/EngineTest.php | 2 +- .../Issues/NamespaceSupportIssue002Test.php | 2 +- .../PHPDependCatchesParsingErrorsIssue061Test.php | 4 +- .../Issues/ReflectionCompatibilityIssue067Test.php | 4 +- .../Metrics/Analyzer/ClassLevelAnalyzerTest.php | 6 +-- .../Metrics/Analyzer/CodeRankAnalyzerTest.php | 6 +-- .../Metrics/Analyzer/CouplingAnalyzerTest.php | 4 +- .../Metrics/Analyzer/CrapIndexAnalyzerTest.php | 2 +- src/test/php/PDepend/ParserTest.php | 4 +- src/test/php/PDepend/Report/Jdepend/ChartTest.php | 2 +- .../php/PDepend/Source/AST/ASTArtifactListTest.php | 6 +-- src/test/php/PDepend/Source/AST/ASTClassTest.php | 10 ++-- .../PDepend/Source/AST/ASTCompoundVariableTest.php | 2 +- .../PDepend/Source/AST/ASTForeachStatementTest.php | 2 +- .../php/PDepend/Source/AST/ASTIfStatementTest.php | 2 +- .../php/PDepend/Source/AST/ASTInterfaceTest.php | 2 +- src/test/php/PDepend/Source/AST/ASTLiteralTest.php | 2 +- src/test/php/PDepend/Source/AST/ASTMethodTest.php | 2 +- src/test/php/PDepend/Source/AST/ASTNodeTest.php | 4 +- .../PDepend/Source/AST/ASTParentReferenceTest.php | 6 +-- .../PDepend/Source/AST/ASTPropertyPostfixTest.php | 6 +-- .../php/PDepend/Source/AST/ASTPropertyTest.php | 4 +- .../PDepend/Source/AST/ASTSelfReferenceTest.php | 4 +- src/test/php/PDepend/Source/AST/ASTStringTest.php | 4 +- .../php/PDepend/Source/AST/ASTSwitchLabelTest.php | 2 +- .../PDepend/Source/AST/ASTSwitchStatementTest.php | 4 +- .../AST/ASTTraitAdaptationPrecedenceTest.php | 2 +- src/test/php/PDepend/Source/AST/ASTTraitTest.php | 2 +- .../php/PDepend/Source/AST/ASTTryStatementTest.php | 2 +- .../Features/PHP80/ExplicitOctalNotationTest.php | 6 +-- .../Language/PHP/Features/PHP80/UnionTypesTest.php | 6 +-- .../PHP/Features/PHP81/IntersectionTypesTest.php | 12 ++--- .../Source/Language/PHP/PHPParserGenericTest.php | 8 ++-- .../Language/PHP/PHPParserGenericVersion70Test.php | 2 +- .../Source/Language/PHP/PHPParserVersion53Test.php | 8 ++-- .../Source/Language/PHP/PHPParserVersion54Test.php | 54 +++++++++++----------- .../Source/Language/PHP/PHPParserVersion55Test.php | 14 +++--- .../Source/Language/PHP/PHPParserVersion56Test.php | 16 +++---- .../Source/Language/PHP/PHPParserVersion70Test.php | 2 +- .../Source/Language/PHP/PHPParserVersion72Test.php | 6 +-- .../Source/Language/PHP/PHPParserVersion74Test.php | 18 +++----- .../Source/Parser/ASTArgumentsParsingTest.php | 2 +- .../Parser/ASTFormalParameterParsingTest.php | 4 +- src/test/php/PDepend/TextUI/CommandTest.php | 4 +- src/test/php/PDepend/TextUI/RunnerTest.php | 8 ++-- .../php/PDepend/Util/Cache/CacheFactoryTest.php | 4 +- src/test/php/PDepend/Util/ConfigurationTest.php | 4 +- src/test/php/PDepend/Util/Coverage/FactoryTest.php | 6 +-- 52 files changed, 146 insertions(+), 163 deletions(-) diff --git a/src/test/php/PDepend/ApplicationTest.php b/src/test/php/PDepend/ApplicationTest.php index fce0d77..7793bca 100644 --- a/src/test/php/PDepend/ApplicationTest.php +++ b/src/test/php/PDepend/ApplicationTest.php @@ -90,14 +90,13 @@ class ApplicationTest extends AbstractTest $this->assertRegExp('/expectException('InvalidArgumentException'); + $this->expectExceptionMessageMatches('(^The configuration file ".*fileThatDoesNotExists\.txt" doesn\'t exist\.$)'); + $application = new \PDepend\Application(); $application->setConfigurationFile($filename); } diff --git a/src/test/php/PDepend/Bugs/ClosureResultsInExceptionBug070Test.php b/src/test/php/PDepend/Bugs/ClosureResultsInExceptionBug070Test.php index fdf78bc..277f207 100644 --- a/src/test/php/PDepend/Bugs/ClosureResultsInExceptionBug070Test.php +++ b/src/test/php/PDepend/Bugs/ClosureResultsInExceptionBug070Test.php @@ -98,10 +98,10 @@ class ClosureResultsInExceptionBug070Test extends AbstractRegressionTest * Tests that the parser handles a closure function with bound variables. * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExceptionForInvalidBoundClosureVariableBug70() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Bugs/EndLessLoopBetweenForParentClassBug152Test.php b/src/test/php/PDepend/Bugs/EndLessLoopBetweenForParentClassBug152Test.php index 91cecaa..151826a 100644 --- a/src/test/php/PDepend/Bugs/EndLessLoopBetweenForParentClassBug152Test.php +++ b/src/test/php/PDepend/Bugs/EndLessLoopBetweenForParentClassBug152Test.php @@ -71,10 +71,10 @@ class EndLessLoopBetweenForParentClassBug152Test extends AbstractRegressionTest * testClassNotResultsInEndlessLoopWhileCallingGetParentClass2 * * @return void - * @expectedException \PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException */ public function testClassNotResultsInEndlessLoopWhileCallingGetParentClass2() { + $this->expectException('\PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException'); $this->parseCodeResourceForTest() ->current() ->getClasses() diff --git a/src/test/php/PDepend/Bugs/EndlessInheritanceBug18459091Test.php b/src/test/php/PDepend/Bugs/EndlessInheritanceBug18459091Test.php index 93bb515..c02e30c 100644 --- a/src/test/php/PDepend/Bugs/EndlessInheritanceBug18459091Test.php +++ b/src/test/php/PDepend/Bugs/EndlessInheritanceBug18459091Test.php @@ -79,10 +79,10 @@ class EndlessInheritanceBug18459091Test extends AbstractRegressionTest * testClassLevelAnalyzerNotRunsEndlessForTwoLevelClassHierarchy * * @return void - * @expectedException \PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException */ public function testClassLevelAnalyzerNotRunsEndlessForTwoLevelClassHierarchy() { + $this->expectException('\PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException'); set_time_limit(5); $ccnAnalyzer = new CyclomaticComplexityAnalyzer(); @@ -98,10 +98,10 @@ class EndlessInheritanceBug18459091Test extends AbstractRegressionTest * testClassLevelAnalyzerNotRunsEndlessForDeepClassHierarchy * * @return void - * @expectedException \PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException */ public function testClassLevelAnalyzerNotRunsEndlessForDeepClassHierarchy() { + $this->expectException('\PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException'); set_time_limit(5); $ccnAnalyzer = new CyclomaticComplexityAnalyzer(); @@ -153,10 +153,10 @@ class EndlessInheritanceBug18459091Test extends AbstractRegressionTest * testInheritanceAnalyzerNotRunsEndlessForTwoLevelClassHierarchy * * @return void - * @expectedException \PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException */ public function testInheritanceAnalyzerNotRunsEndlessForTwoLevelClassHierarchy() { + $this->expectException('\PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException'); set_time_limit(5); $analyzer = new InheritanceAnalyzer(); @@ -167,10 +167,10 @@ class EndlessInheritanceBug18459091Test extends AbstractRegressionTest * testInheritanceAnalyzerNotRunsEndlessForDeepClassHierarchy * * @return void - * @expectedException \PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException */ public function testInheritanceAnalyzerNotRunsEndlessForDeepClassHierarchy() { + $this->expectException('\PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException'); set_time_limit(5); $analyzer = new InheritanceAnalyzer(); @@ -225,6 +225,6 @@ class EndlessInheritanceBug18459091Test extends AbstractRegressionTest $command->run(); $output = ob_get_clean(); - $this->assertContains(' is part of an endless inheritance hierarchy', $output); + $this->assertStringContainsString(' is part of an endless inheritance hierarchy', $output); } } diff --git a/src/test/php/PDepend/EngineTest.php b/src/test/php/PDepend/EngineTest.php index 90f83c0..da141cd 100644 --- a/src/test/php/PDepend/EngineTest.php +++ b/src/test/php/PDepend/EngineTest.php @@ -384,10 +384,10 @@ class EngineTest extends AbstractTest * added file does not exist. * * @return void - * @expectedException InvalidArgumentException */ public function testAddFileMethodThrowsExpectedExceptionForFileThatNotExists() { + $this->expectException('InvalidArgumentException'); $engine = $this->createEngineFixture(); $engine->addFile($this->createRunResourceURI('pdepend_')); } diff --git a/src/test/php/PDepend/Issues/NamespaceSupportIssue002Test.php b/src/test/php/PDepend/Issues/NamespaceSupportIssue002Test.php index 3ef8745..ad13b2b 100644 --- a/src/test/php/PDepend/Issues/NamespaceSupportIssue002Test.php +++ b/src/test/php/PDepend/Issues/NamespaceSupportIssue002Test.php @@ -355,7 +355,7 @@ class NamespaceSupportIssue002Test extends AbstractFeatureTest ->current(); $this->assertEquals($namespaceName, $dependency->getNamespace()->getName()); - $this->assertContains( + $this->assertStringContainsString( $function->getNamespace()->getName(), $dependency->getNamespace()->getName() ); diff --git a/src/test/php/PDepend/Issues/PHPDependCatchesParsingErrorsIssue061Test.php b/src/test/php/PDepend/Issues/PHPDependCatchesParsingErrorsIssue061Test.php index dd60588..b4f10ef 100644 --- a/src/test/php/PDepend/Issues/PHPDependCatchesParsingErrorsIssue061Test.php +++ b/src/test/php/PDepend/Issues/PHPDependCatchesParsingErrorsIssue061Test.php @@ -129,7 +129,7 @@ class PHPDependCatchesParsingErrorsIssue061Test extends AbstractFeatureTest list($exitCode, $output) = $this->runTextUICommand(); - $this->assertNotContains('Following errors occurred:', $output); + $this->assertStringNotContainsString('Following errors occurred:', $output); } /** @@ -149,7 +149,7 @@ class PHPDependCatchesParsingErrorsIssue061Test extends AbstractFeatureTest ); list($exitCode, $output) = $this->runTextUICommand(); - $this->assertContains('Unexpected token: ), line: 7, col: 49, file:', $output); + $this->assertStringContainsString('Unexpected token: ), line: 7, col: 49, file:', $output); } /** diff --git a/src/test/php/PDepend/Issues/ReflectionCompatibilityIssue067Test.php b/src/test/php/PDepend/Issues/ReflectionCompatibilityIssue067Test.php index cdc62a7..9f5617b 100644 --- a/src/test/php/PDepend/Issues/ReflectionCompatibilityIssue067Test.php +++ b/src/test/php/PDepend/Issues/ReflectionCompatibilityIssue067Test.php @@ -664,10 +664,10 @@ class ReflectionCompatibilityIssue067Test extends AbstractFeatureTest * * @return void * @covers \PDepend\Source\Parser\MissingValueException - * @expectedException \PDepend\Source\Parser\MissingValueException */ public function testParserThrowsExpectedExceptionForMissingDefaultValue() { + $this->expectException('\PDepend\Source\Parser\MissingValueException'); $this->parseTestCase(); } @@ -677,10 +677,10 @@ class ReflectionCompatibilityIssue067Test extends AbstractFeatureTest * * @return void * @covers \PDepend\Source\Parser\TokenStreamEndException - * @expectedException \PDepend\Source\Parser\TokenStreamEndException */ public function testParserThrowsExpectedExceptionWhenReachesEofWhileParsingDefaultValue() { + $this->expectException('\PDepend\Source\Parser\TokenStreamEndException'); $this->parseTestCase(); } diff --git a/src/test/php/PDepend/Metrics/Analyzer/ClassLevelAnalyzerTest.php b/src/test/php/PDepend/Metrics/Analyzer/ClassLevelAnalyzerTest.php index 15dca61..de87fcd 100644 --- a/src/test/php/PDepend/Metrics/Analyzer/ClassLevelAnalyzerTest.php +++ b/src/test/php/PDepend/Metrics/Analyzer/ClassLevelAnalyzerTest.php @@ -63,10 +63,10 @@ class ClassLevelAnalyzerTest extends AbstractMetricsTest * method fails with an exception if no cc analyzer was set. * * @return void - * @expectedException RuntimeException */ public function testAnalyzerFailsWithoutCCAnalyzerFail() { + $this->expectException('RuntimeException'); $namespace = new ASTNamespace('package1'); $namespaces = new ASTArtifactList(array($namespace)); @@ -79,10 +79,10 @@ class ClassLevelAnalyzerTest extends AbstractMetricsTest * fails for an invalid child analyzer. * * @return void - * @expectedException InvalidArgumentException */ public function testAddAnalyzerFailsForAnInvalidAnalyzerTypeFail() { + $this->expectException('InvalidArgumentException'); $analyzer = new ClassLevelAnalyzer(); $analyzer->addAnalyzer(new CodeRankAnalyzer()); } @@ -508,7 +508,7 @@ class ClassLevelAnalyzerTest extends AbstractMetricsTest { $metrics = $this->calculateTraitMetrics(); - $this->assertInternalType('array', $metrics); + $this->assertIsArray($metrics); return $metrics; } diff --git a/src/test/php/PDepend/Metrics/Analyzer/CodeRankAnalyzerTest.php b/src/test/php/PDepend/Metrics/Analyzer/CodeRankAnalyzerTest.php index 73201c2..46616b9 100644 --- a/src/test/php/PDepend/Metrics/Analyzer/CodeRankAnalyzerTest.php +++ b/src/test/php/PDepend/Metrics/Analyzer/CodeRankAnalyzerTest.php @@ -425,8 +425,8 @@ class CodeRankAnalyzerTest extends AbstractMetricsTest foreach ($expected as $key => $info) { $metrics = $this->analyzer->getNodeMetrics($info[0]); - $this->assertEquals($info[1]['cr'], $metrics['cr'], '', 0.00005); - $this->assertEquals($info[1]['rcr'], $metrics['rcr'], '', 0.00005); + $this->assertEqualsWithDelta($info[1]['cr'], $metrics['cr'], 0.00005); + $this->assertEqualsWithDelta($info[1]['rcr'], $metrics['rcr'], 0.00005); unset($expected[$key]); } @@ -452,7 +452,7 @@ class CodeRankAnalyzerTest extends AbstractMetricsTest $class = new ASTClass('PDepend'); $metrics = $this->analyzer->getNodeMetrics($class); - $this->assertInternalType('array', $metrics); + $this->assertIsArray($metrics); $this->assertEquals(0, count($metrics)); } diff --git a/src/test/php/PDepend/Metrics/Analyzer/CouplingAnalyzerTest.php b/src/test/php/PDepend/Metrics/Analyzer/CouplingAnalyzerTest.php index 5bbab1f..e901e93 100644 --- a/src/test/php/PDepend/Metrics/Analyzer/CouplingAnalyzerTest.php +++ b/src/test/php/PDepend/Metrics/Analyzer/CouplingAnalyzerTest.php @@ -605,7 +605,7 @@ class CouplingAnalyzerTest extends AbstractMetricsTest public function testGetNodeMetricsForTrait() { $metrics = $this->calculateTraitMetrics(); - $this->assertInternalType('array', $metrics); + $this->assertIsArray($metrics); return $metrics; } @@ -678,7 +678,7 @@ class CouplingAnalyzerTest extends AbstractMetricsTest $analyzer->analyze($this->parseCodeResourceForTest()); $metrics = $analyzer->getProjectMetrics(); - $this->assertInternalType('array', $metrics); + $this->assertIsArray($metrics); return $metrics; } diff --git a/src/test/php/PDepend/Metrics/Analyzer/CrapIndexAnalyzerTest.php b/src/test/php/PDepend/Metrics/Analyzer/CrapIndexAnalyzerTest.php index 94cec48..a0c33e6 100644 --- a/src/test/php/PDepend/Metrics/Analyzer/CrapIndexAnalyzerTest.php +++ b/src/test/php/PDepend/Metrics/Analyzer/CrapIndexAnalyzerTest.php @@ -178,7 +178,7 @@ class CrapIndexAnalyzerTest extends AbstractMetricsTest private function doTestCrapIndexCalculation($testCase, $ccn, $crapIndex) { $metrics = $this->calculateCrapIndex($testCase, $ccn); - $this->assertEquals($crapIndex, $metrics['crap'], '', 0.005); + $this->assertEqualsWithDelta($crapIndex, $metrics['crap'], 0.005); } /** diff --git a/src/test/php/PDepend/ParserTest.php b/src/test/php/PDepend/ParserTest.php index 607daa9..ce1d01e 100644 --- a/src/test/php/PDepend/ParserTest.php +++ b/src/test/php/PDepend/ParserTest.php @@ -1318,10 +1318,10 @@ class ParserTest extends AbstractTest * testParserThrowsExpectedExceptionWhenDefaultStaticDefaultValueNotExists * * @return void - * @expectedException \PDepend\Source\Parser\MissingValueException */ public function testParserThrowsExpectedExceptionWhenDefaultStaticDefaultValueNotExists() { + $this->expectException('\PDepend\Source\Parser\MissingValueException'); $this->parseCodeResourceForTest(); } @@ -1527,10 +1527,10 @@ class ParserTest extends AbstractTest * testParseExpressionUntilThrowsExceptionForUnclosedStatement * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParseExpressionUntilThrowsExceptionForUnclosedStatement() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Report/Jdepend/ChartTest.php b/src/test/php/PDepend/Report/Jdepend/ChartTest.php index 448861c..daafec7 100644 --- a/src/test/php/PDepend/Report/Jdepend/ChartTest.php +++ b/src/test/php/PDepend/Report/Jdepend/ChartTest.php @@ -111,10 +111,10 @@ class ChartTest extends AbstractTest * configured. * * @return void - * @expectedException \PDepend\Report\NoLogOutputException */ public function testThrowsExceptionForInvalidLogTarget() { + $this->expectException('\PDepend\Report\NoLogOutputException'); $logger = new Chart(); $logger->close(); } diff --git a/src/test/php/PDepend/Source/AST/ASTArtifactListTest.php b/src/test/php/PDepend/Source/AST/ASTArtifactListTest.php index 9fe4837..8a432b7 100644 --- a/src/test/php/PDepend/Source/AST/ASTArtifactListTest.php +++ b/src/test/php/PDepend/Source/AST/ASTArtifactListTest.php @@ -215,10 +215,10 @@ class ASTArtifactListTest extends AbstractTest * * @return void * @since 1.0.0 - * @expectedException OutOfBoundsException */ public function testArrayBehaviorOffsetGetThrowsExpectedOutOfBoundsException() { + $this->expectException('OutOfBoundsException'); $iterator = new ASTArtifactList(array()); $iterator[0]->getName(); } @@ -228,10 +228,10 @@ class ASTArtifactListTest extends AbstractTest * * @return void * @since 1.0.0 - * @expectedException BadMethodCallException */ public function testArrayBehaviorOffsetSetThrowsExpectedBadMethodCallException() { + $this->expectException('BadMethodCallException'); $iterator = new ASTArtifactList(array()); $iterator[0] = new ASTClass('Class'); } @@ -241,10 +241,10 @@ class ASTArtifactListTest extends AbstractTest * * @return void * @since 1.0.0 - * @expectedException BadMethodCallException */ public function testArrayBehaviorOffsetUnsetThrowsExpectedBadMethodCallException() { + $this->expectException('BadMethodCallException'); $iterator = new ASTArtifactList(array()); unset($iterator[0]); } diff --git a/src/test/php/PDepend/Source/AST/ASTClassTest.php b/src/test/php/PDepend/Source/AST/ASTClassTest.php index d678a0c..7dcafe6 100644 --- a/src/test/php/PDepend/Source/AST/ASTClassTest.php +++ b/src/test/php/PDepend/Source/AST/ASTClassTest.php @@ -362,12 +362,12 @@ class ASTClassTest extends AbstractASTArtifactTest * @return void * @since 1.0.0 * @covers \PDepend\Source\AST\ASTTraitMethodCollisionException - * @expectedException \PDepend\Source\AST\ASTTraitMethodCollisionException * * @group issue-154 */ public function testGetAllMethodsWithMethodCollisionThrowsExpectedException() { + $this->expectException('\PDepend\Source\AST\ASTTraitMethodCollisionException'); $class = $this->getFirstClassForTestCase(); $class->getAllMethods(); } @@ -915,10 +915,10 @@ class ASTClassTest extends AbstractASTArtifactTest * when it is called with an invalid modifier. * * @return void - * @expectedException InvalidArgumentException */ public function testSetModifiersThrowsExpectedExceptionForInvalidModifier() { + $this->expectException('InvalidArgumentException'); $class = new ASTClass(__CLASS__); $class->setModifiers( 2 | @@ -1199,10 +1199,10 @@ class ASTClassTest extends AbstractASTArtifactTest * Tests that it is not possible to overwrite previously set class modifiers. * * @return void - * @expectedException BadMethodCallException */ public function testSetModifiersThrowsExpectedExceptionOnOverwrite() { + $this->expectException('BadMethodCallException'); $class = new ASTClass(__CLASS__); $class->setModifiers(State::IS_FINAL); $class->setModifiers(State::IS_FINAL); @@ -1391,10 +1391,10 @@ class ASTClassTest extends AbstractASTArtifactTest * * @return void * @covers \PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException - * @expectedException \PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException */ public function testGetParentClassThrowsExpectedExceptionWhenBothAreTheSame() { + $this->expectException('\PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException'); $this->parseCodeResourceForTest() ->current() ->getClasses() @@ -1461,10 +1461,10 @@ class ASTClassTest extends AbstractASTArtifactTest * * @return void * @covers \PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException - * @expectedException \PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException */ public function testGetParentClassesThrowsExpectedExceptionForRecursiveInheritanceHierarchy() { + $this->expectException('\PDepend\Source\AST\ASTClassOrInterfaceRecursiveInheritanceException'); $this->parseCodeResourceForTest() ->current() ->getClasses() diff --git a/src/test/php/PDepend/Source/AST/ASTCompoundVariableTest.php b/src/test/php/PDepend/Source/AST/ASTCompoundVariableTest.php index c2fbc30..1a75ed3 100644 --- a/src/test/php/PDepend/Source/AST/ASTCompoundVariableTest.php +++ b/src/test/php/PDepend/Source/AST/ASTCompoundVariableTest.php @@ -116,10 +116,10 @@ class ASTCompoundVariableTest extends ASTNodeTest * Tests that an invalid compound variable results in the expected exception. * * @return void - * @expectedException \PDepend\Source\Parser\TokenStreamEndException */ public function testUnclosedCompoundVariableThrowsExpectedException() { + $this->expectException('\PDepend\Source\Parser\TokenStreamEndException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Source/AST/ASTForeachStatementTest.php b/src/test/php/PDepend/Source/AST/ASTForeachStatementTest.php index 9516b2c..1900c77 100644 --- a/src/test/php/PDepend/Source/AST/ASTForeachStatementTest.php +++ b/src/test/php/PDepend/Source/AST/ASTForeachStatementTest.php @@ -223,10 +223,10 @@ class ASTForeachStatementTest extends ASTNodeTest * testForeachStatementThrowsExpectedExceptionForKeyByReference * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testForeachStatementThrowsExpectedExceptionForKeyByReference() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->getFirstForeachStatementInFunction(__METHOD__); } diff --git a/src/test/php/PDepend/Source/AST/ASTIfStatementTest.php b/src/test/php/PDepend/Source/AST/ASTIfStatementTest.php index dda86a9..e3fed1d 100644 --- a/src/test/php/PDepend/Source/AST/ASTIfStatementTest.php +++ b/src/test/php/PDepend/Source/AST/ASTIfStatementTest.php @@ -135,10 +135,10 @@ class ASTIfStatementTest extends ASTNodeTest * testParserThrowsExpectedExceptionWhenIfStatementHasNoBody * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionWhenIfStatementHasNoBody() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->getFirstIfStatementInFunction(__METHOD__); } diff --git a/src/test/php/PDepend/Source/AST/ASTInterfaceTest.php b/src/test/php/PDepend/Source/AST/ASTInterfaceTest.php index 025c0e2..1d24975 100644 --- a/src/test/php/PDepend/Source/AST/ASTInterfaceTest.php +++ b/src/test/php/PDepend/Source/AST/ASTInterfaceTest.php @@ -370,10 +370,10 @@ class ASTInterfaceTest extends AbstractASTArtifactTest * setParentClassReference() method and throws an exception. * * @return void - * @expectedException BadMethodCallException */ public function testInterfaceThrowsExpectedExceptionOnSetParentClassReference() { + $this->expectException('BadMethodCallException'); $interface = $this->createItem(); $reference = $this->getMockBuilder('\\PDepend\\Source\\AST\\ASTClassReference') diff --git a/src/test/php/PDepend/Source/AST/ASTLiteralTest.php b/src/test/php/PDepend/Source/AST/ASTLiteralTest.php index 2ec4fa5..a197194 100644 --- a/src/test/php/PDepend/Source/AST/ASTLiteralTest.php +++ b/src/test/php/PDepend/Source/AST/ASTLiteralTest.php @@ -233,10 +233,10 @@ class ASTLiteralTest extends ASTNodeTest * Tests that an invalid literal results in the expected exception. * * @return void - * @expectedException \PDepend\Source\Parser\TokenStreamEndException */ public function testUnclosedDoubleQuoteStringResultsInExpectedException() { + $this->expectException('\PDepend\Source\Parser\TokenStreamEndException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Source/AST/ASTMethodTest.php b/src/test/php/PDepend/Source/AST/ASTMethodTest.php index 14e01e8..cbc2752 100644 --- a/src/test/php/PDepend/Source/AST/ASTMethodTest.php +++ b/src/test/php/PDepend/Source/AST/ASTMethodTest.php @@ -297,10 +297,10 @@ class ASTMethodTest extends AbstractASTArtifactTest * * @return void * @covers \PDepend\Source\AST\ASTCompilationUnitNotFoundException - * @expectedException \PDepend\Source\AST\ASTCompilationUnitNotFoundException */ public function testGetSourceFileThrowsExpectedExceptionWhenNoParentWasDefined() { + $this->expectException('\PDepend\Source\AST\ASTCompilationUnitNotFoundException'); $method = new ASTMethod('method'); $method->getCompilationUnit(); } diff --git a/src/test/php/PDepend/Source/AST/ASTNodeTest.php b/src/test/php/PDepend/Source/AST/ASTNodeTest.php index 28afa6f..e4b163b 100644 --- a/src/test/php/PDepend/Source/AST/ASTNodeTest.php +++ b/src/test/php/PDepend/Source/AST/ASTNodeTest.php @@ -237,11 +237,11 @@ abstract class ASTNodeTest extends AbstractTest * testGetChildThrowsExpectedExceptionForInvalidChildIndex * * @return void - * @expectedException OutOfBoundsException * @since 1.0.0 */ public function testGetChildThrowsExpectedExceptionForInvalidChildIndex() { + $this->expectException('OutOfBoundsException'); $node = $this->createNodeInstance(); $node->addChild($child0 = $this->getNodeMock()); $node->addChild($child1 = $this->getNodeMock()); @@ -754,10 +754,10 @@ abstract class ASTNodeTest extends AbstractTest * * @return void * @covers \PDepend\Source\AST\ASTNode - * @expectedException OutOfBoundsException */ public function testGetChildThrowsExpectedExceptionForUndefinedOffset() { + $this->expectException('OutOfBoundsException'); $node = $this->createNodeInstance(); $node->getChild(42); } diff --git a/src/test/php/PDepend/Source/AST/ASTParentReferenceTest.php b/src/test/php/PDepend/Source/AST/ASTParentReferenceTest.php index 94a8cdc..687179c 100644 --- a/src/test/php/PDepend/Source/AST/ASTParentReferenceTest.php +++ b/src/test/php/PDepend/Source/AST/ASTParentReferenceTest.php @@ -100,10 +100,10 @@ class ASTParentReferenceTest extends ASTNodeTest * testParentReferenceAllocationOutsideOfClassScopeThrowsExpectedException * * @return void - * @expectedException \PDepend\Source\Parser\InvalidStateException */ public function testParentReferenceAllocationOutsideOfClassScopeThrowsExpectedException() { + $this->expectException('\PDepend\Source\Parser\InvalidStateException'); $this->parseCodeResourceForTest(); } @@ -111,10 +111,10 @@ class ASTParentReferenceTest extends ASTNodeTest * testParentReferenceInClassWithoutParentThrowsException * * @return void - * @expectedException \PDepend\Source\Parser\InvalidStateException */ public function testParentReferenceInClassWithoutParentThrowsException() { + $this->expectException('\PDepend\Source\Parser\InvalidStateException'); $this->parseCodeResourceForTest(); } @@ -122,10 +122,10 @@ class ASTParentReferenceTest extends ASTNodeTest * testParentReferenceMemberPrimaryPrefixOutsideOfClassScopeThrowsExpectedException * * @return void - * @expectedException \PDepend\Source\Parser\InvalidStateException */ public function testParentReferenceMemberPrimaryPrefixOutsideOfClassScopeThrowsExpectedException() { + $this->expectException('\PDepend\Source\Parser\InvalidStateException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Source/AST/ASTPropertyPostfixTest.php b/src/test/php/PDepend/Source/AST/ASTPropertyPostfixTest.php index df7ba0d..5b64944 100644 --- a/src/test/php/PDepend/Source/AST/ASTPropertyPostfixTest.php +++ b/src/test/php/PDepend/Source/AST/ASTPropertyPostfixTest.php @@ -357,10 +357,10 @@ class ASTPropertyPostfixTest extends ASTNodeTest * Tests that a parsed property postfix has the expected object structure. * * @return void - * @expectedException \PDepend\Source\Parser\InvalidStateException */ public function testPropertyPostfixSelfVariableInFunctionThrowsExpectedException() { + $this->expectException('\PDepend\Source\Parser\InvalidStateException'); $this->parseCodeResourceForTest(); } @@ -368,10 +368,10 @@ class ASTPropertyPostfixTest extends ASTNodeTest * Tests that a parsed property postfix has the expected object structure. * * @return void - * @expectedException \PDepend\Source\Parser\InvalidStateException */ public function testPropertyPostfixParentVariableInFunctionThrowsExpectedException() { + $this->expectException('\PDepend\Source\Parser\InvalidStateException'); $this->parseCodeResourceForTest(); } @@ -379,10 +379,10 @@ class ASTPropertyPostfixTest extends ASTNodeTest * Tests that a parsed property postfix has the expected object structure. * * @return void - * @expectedException \PDepend\Source\Parser\InvalidStateException */ public function testPropertyPostfixParentVariableInClassWithoutParentThrowsExpectedException() { + $this->expectException('\PDepend\Source\Parser\InvalidStateException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Source/AST/ASTPropertyTest.php b/src/test/php/PDepend/Source/AST/ASTPropertyTest.php index 4eab7af..e47b730 100644 --- a/src/test/php/PDepend/Source/AST/ASTPropertyTest.php +++ b/src/test/php/PDepend/Source/AST/ASTPropertyTest.php @@ -279,7 +279,7 @@ class ASTPropertyTest extends AbstractTest public function testPropertyContainsExpectDefaultValueArray() { $property = $this->getFirstPropertyInClass(); - $this->assertInternalType('array', $property->getDefaultValue()); + $this->assertIsArray($property->getDefaultValue()); } /** @@ -290,7 +290,7 @@ class ASTPropertyTest extends AbstractTest public function testPropertyContainsExpectedDefaultValueFloat() { $property = $this->getFirstPropertyInClass(); - $this->assertEquals(3.14, $property->getDefaultValue(), '', 0.001); + $this->assertEqualsWithDelta(3.14, $property->getDefaultValue(), 0.001); } /** diff --git a/src/test/php/PDepend/Source/AST/ASTSelfReferenceTest.php b/src/test/php/PDepend/Source/AST/ASTSelfReferenceTest.php index c9d662c..5ae8d42 100644 --- a/src/test/php/PDepend/Source/AST/ASTSelfReferenceTest.php +++ b/src/test/php/PDepend/Source/AST/ASTSelfReferenceTest.php @@ -103,10 +103,10 @@ class ASTSelfReferenceTest extends ASTNodeTest * testSelfReferenceAllocationOutsideOfClassScopeThrowsExpectedException * * @return void - * @expectedException \PDepend\Source\Parser\InvalidStateException */ public function testSelfReferenceAllocationOutsideOfClassScopeThrowsExpectedException() { + $this->expectException('\PDepend\Source\Parser\InvalidStateException'); $this->parseCodeResourceForTest(); } @@ -114,10 +114,10 @@ class ASTSelfReferenceTest extends ASTNodeTest * testSelfReferenceMemberPrimaryPrefixOutsideOfClassScopeThrowsExpectedException * * @return void - * @expectedException \PDepend\Source\Parser\InvalidStateException */ public function testSelfReferenceMemberPrimaryPrefixOutsideOfClassScopeThrowsExpectedException() { + $this->expectException('\PDepend\Source\Parser\InvalidStateException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Source/AST/ASTStringTest.php b/src/test/php/PDepend/Source/AST/ASTStringTest.php index 8bacc47..ec28727 100644 --- a/src/test/php/PDepend/Source/AST/ASTStringTest.php +++ b/src/test/php/PDepend/Source/AST/ASTStringTest.php @@ -73,7 +73,7 @@ class ASTStringTest extends ASTNodeTest public function testDoubleQuoteStringContainsExpectedTextContent() { $string = $this->getFirstStringInFunction(__METHOD__); - $this->assertContains("Hello", $string->getChild(0)->getImage()); + $this->assertStringContainsString("Hello", $string->getChild(0)->getImage()); } /** @@ -213,10 +213,10 @@ class ASTStringTest extends ASTNodeTest * Tests that an invalid literal results in the expected exception. * * @return void - * @expectedException \PDepend\Source\Parser\TokenException */ public function testUnclosedDoubleQuoteStringResultsInExpectedException() { + $this->expectException('\PDepend\Source\Parser\TokenException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Source/AST/ASTSwitchLabelTest.php b/src/test/php/PDepend/Source/AST/ASTSwitchLabelTest.php index fced95f..a892788 100644 --- a/src/test/php/PDepend/Source/AST/ASTSwitchLabelTest.php +++ b/src/test/php/PDepend/Source/AST/ASTSwitchLabelTest.php @@ -440,10 +440,10 @@ class ASTSwitchLabelTest extends ASTNodeTest * testParserThrowsExceptionForUnclosedSwitchLabelBody * * @return void - * @expectedException \PDepend\Source\Parser\TokenStreamEndException */ public function testParserThrowsExceptionForUnclosedSwitchLabelBody() { + $this->expectException('\PDepend\Source\Parser\TokenStreamEndException'); $this->getFirstSwitchLabelInFunction(); } diff --git a/src/test/php/PDepend/Source/AST/ASTSwitchStatementTest.php b/src/test/php/PDepend/Source/AST/ASTSwitchStatementTest.php index 45ad48f..a98fff7 100644 --- a/src/test/php/PDepend/Source/AST/ASTSwitchStatementTest.php +++ b/src/test/php/PDepend/Source/AST/ASTSwitchStatementTest.php @@ -171,10 +171,10 @@ class ASTSwitchStatementTest extends ASTNodeTest * testInvalidStatementInSwitchStatementResultsInExpectedException * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testInvalidStatementInSwitchStatementResultsInExpectedException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->getFirstSwitchStatementInFunction(); } @@ -182,10 +182,10 @@ class ASTSwitchStatementTest extends ASTNodeTest * testUnclosedSwitchStatementResultsInExpectedException * * @return void - * @expectedException \PDepend\Source\Parser\TokenStreamEndException */ public function testUnclosedSwitchStatementResultsInExpectedException() { + $this->expectException('\PDepend\Source\Parser\TokenStreamEndException'); $this->getFirstSwitchStatementInFunction(); } diff --git a/src/test/php/PDepend/Source/AST/ASTTraitAdaptationPrecedenceTest.php b/src/test/php/PDepend/Source/AST/ASTTraitAdaptationPrecedenceTest.php index 8dc20ee..3536c8e 100644 --- a/src/test/php/PDepend/Source/AST/ASTTraitAdaptationPrecedenceTest.php +++ b/src/test/php/PDepend/Source/AST/ASTTraitAdaptationPrecedenceTest.php @@ -78,10 +78,10 @@ class ASTTraitAdaptationPrecedenceTest extends ASTNodeTest * testTraitAdaptationPrecedenceWithoutQualifiedReferenceThrowsExpectedException * * @return void - * @expectedException \PDepend\Source\Parser\InvalidStateException */ public function testTraitAdaptationPrecedenceWithoutQualifiedReferenceThrowsExpectedException() { + $this->expectException('\PDepend\Source\Parser\InvalidStateException'); $this->getFirstTraitAdaptationPrecedenceInClass(); } diff --git a/src/test/php/PDepend/Source/AST/ASTTraitTest.php b/src/test/php/PDepend/Source/AST/ASTTraitTest.php index dbf0498..12f2251 100644 --- a/src/test/php/PDepend/Source/AST/ASTTraitTest.php +++ b/src/test/php/PDepend/Source/AST/ASTTraitTest.php @@ -241,12 +241,12 @@ class ASTTraitTest extends AbstractASTArtifactTest * * @return void * @covers \PDepend\Source\AST\ASTTraitMethodCollisionException - * @expectedException \PDepend\Source\AST\ASTTraitMethodCollisionException * * @group issue-154 */ public function testGetAllMethodsWithMethodCollisionThrowsExpectedException() { + $this->expectException('\PDepend\Source\AST\ASTTraitMethodCollisionException'); $trait = $this->getFirstTraitForTest(); $trait->getAllMethods(); } diff --git a/src/test/php/PDepend/Source/AST/ASTTryStatementTest.php b/src/test/php/PDepend/Source/AST/ASTTryStatementTest.php index 00cb6aa..7b007a3 100644 --- a/src/test/php/PDepend/Source/AST/ASTTryStatementTest.php +++ b/src/test/php/PDepend/Source/AST/ASTTryStatementTest.php @@ -173,10 +173,10 @@ class ASTTryStatementTest extends ASTNodeTest * testParserThrowsExceptionWhenNoCatchStatementFollows * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExceptionWhenNoCatchStatementFollows() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->getFirstTryStatementInFunction(); } diff --git a/src/test/php/PDepend/Source/Language/PHP/Features/PHP80/ExplicitOctalNotationTest.php b/src/test/php/PDepend/Source/Language/PHP/Features/PHP80/ExplicitOctalNotationTest.php index f5f15ed..fcfd4bf 100644 --- a/src/test/php/PDepend/Source/Language/PHP/Features/PHP80/ExplicitOctalNotationTest.php +++ b/src/test/php/PDepend/Source/Language/PHP/Features/PHP80/ExplicitOctalNotationTest.php @@ -49,12 +49,10 @@ namespace PDepend\Source\Language\PHP\Features\PHP80; */ class ExplicitOctalNotationTest extends PHPParserVersion80Test { - /** - * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Invalid number 0o16 - */ public function testExplicitOctalNotation() { + $this->expectException('\InvalidArgumentException'); + $this->expectExceptionMessage('Invalid number 0o16'); $this->getFirstClassForTestCase(); } } diff --git a/src/test/php/PDepend/Source/Language/PHP/Features/PHP80/UnionTypesTest.php b/src/test/php/PDepend/Source/Language/PHP/Features/PHP80/UnionTypesTest.php index b225146..b5407aa 100644 --- a/src/test/php/PDepend/Source/Language/PHP/Features/PHP80/UnionTypesTest.php +++ b/src/test/php/PDepend/Source/Language/PHP/Features/PHP80/UnionTypesTest.php @@ -111,12 +111,10 @@ class UnionTypesTest extends PHPParserVersion80Test $this->assertSame('array|iterable', $return->getImage()); } - /** - * @expectedException \PDepend\Source\Parser\ParserException - * @expectedExceptionMessage null can not be used as a standalone type - */ public function testUnionTypesStandaloneNull() { + $this->expectException('\PDepend\Source\Parser\ParserException'); + $this->expectExceptionMessage('null can not be used as a standalone type'); $this->getFirstMethodForTestCase(); } } diff --git a/src/test/php/PDepend/Source/Language/PHP/Features/PHP81/IntersectionTypesTest.php b/src/test/php/PDepend/Source/Language/PHP/Features/PHP81/IntersectionTypesTest.php index e70e4ed..caab9bb 100644 --- a/src/test/php/PDepend/Source/Language/PHP/Features/PHP81/IntersectionTypesTest.php +++ b/src/test/php/PDepend/Source/Language/PHP/Features/PHP81/IntersectionTypesTest.php @@ -110,21 +110,17 @@ class IntersectionTypesTest extends PHPParserVersion81Test $this->assertSame('Iterator&\Countable&\ArrayAccess', $return->getImage()); } - /** - * @expectedException \PDepend\Source\Parser\ParserException - * @expectedExceptionMessage Unexpected token - */ public function testIntersectionTypesCantBeMixedWithUnionTypes() { + $this->expectException('\PDepend\Source\Parser\ParserException'); + $this->expectExceptionMessage('Unexpected token'); $this->getFirstMethodForTestCase(); } - /** - * @expectedException \PDepend\Source\Parser\ParserException - * @expectedExceptionMessage int can not be used in an intersection type - */ public function testIntersectionTypesCantBeScalar() { + $this->expectException('\PDepend\Source\Parser\ParserException'); + $this->expectExceptionMessage('int can not be used in an intersection type'); $this->getFirstMethodForTestCase(); } } diff --git a/src/test/php/PDepend/Source/Language/PHP/PHPParserGenericTest.php b/src/test/php/PDepend/Source/Language/PHP/PHPParserGenericTest.php index f11b00c..84fadfa 100644 --- a/src/test/php/PDepend/Source/Language/PHP/PHPParserGenericTest.php +++ b/src/test/php/PDepend/Source/Language/PHP/PHPParserGenericTest.php @@ -369,10 +369,10 @@ class PHPParserGenericTest extends AbstractTest * * @return void * @covers \PDepend\Source\Parser\TokenStreamEndException - * @expectedException \PDepend\Source\Parser\TokenStreamEndException */ public function testParserThrowsExpectedExceptionOnTokenStreamEnd() { + $this->expectException('\PDepend\Source\Parser\TokenStreamEndException'); $this->parseCodeResourceForTest(); } @@ -381,10 +381,10 @@ class PHPParserGenericTest extends AbstractTest * * @return void * @covers \PDepend\Source\Parser\UnexpectedTokenException - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForUnexpectedTokenType() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -599,10 +599,10 @@ class PHPParserGenericTest extends AbstractTest * testParserThrowsExpectedExceptionForInvalidToken * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForInvalidToken() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -610,10 +610,10 @@ class PHPParserGenericTest extends AbstractTest * testParserThrowsExpectedExceptionForTokenStreamEnd * * @return void - * @expectedException \PDepend\Source\Parser\TokenStreamEndException */ public function testParserThrowsExpectedExceptionForTokenStreamEnd() { + $this->expectException('\PDepend\Source\Parser\TokenStreamEndException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Source/Language/PHP/PHPParserGenericVersion70Test.php b/src/test/php/PDepend/Source/Language/PHP/PHPParserGenericVersion70Test.php index e4a3ffb..75da6f3 100644 --- a/src/test/php/PDepend/Source/Language/PHP/PHPParserGenericVersion70Test.php +++ b/src/test/php/PDepend/Source/Language/PHP/PHPParserGenericVersion70Test.php @@ -447,10 +447,10 @@ class PHPParserGenericVersion70Test extends AbstractTest /** * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testListKeywordAsFunctionNameThrowsException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion53Test.php b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion53Test.php index a87b779..13c0c47 100644 --- a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion53Test.php +++ b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion53Test.php @@ -64,10 +64,10 @@ class PHPParserVersion53Test extends AbstractTest * testParserThrowsExpectedExceptionForStaticMemberExpressionSyntax * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForStaticMemberExpressionSyntax() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -75,10 +75,10 @@ class PHPParserVersion53Test extends AbstractTest * testParserThrowsExceptionForParameterWithExpressionValue * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExceptionForParameterWithExpressionValue() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -95,19 +95,19 @@ class PHPParserVersion53Test extends AbstractTest /** * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testListKeywordAsMethodNameThrowsException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } /** * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testListKeywordAsFunctionNameThrowsException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion54Test.php b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion54Test.php index 81758a8..3083b80 100644 --- a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion54Test.php +++ b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion54Test.php @@ -90,10 +90,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForTraitAsClassName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForTraitAsClassName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -101,10 +101,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForTraitAsFunctionName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForTraitAsFunctionName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -112,10 +112,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForTraitAsInterfaceName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForTraitAsInterfaceName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -123,10 +123,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForTraitAsMethodName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForTraitAsMethodName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -134,10 +134,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForTraitAsNamespaceName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForTraitAsNamespaceName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -145,10 +145,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForTraitAsCalledFunction * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForTraitAsCalledFunction() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -156,10 +156,10 @@ class PHPParserVersion54Test extends AbstractTest * Tests that ::class is not allowed PHP < 5.5. * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testDoubleColonClass() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -167,10 +167,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForTraitAsCalledMethod * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForTraitAsCalledMethod() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -178,10 +178,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForTraitAsConstant * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForTraitAsConstant() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -189,10 +189,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForInsteadOfAsClassName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForInsteadOfAsClassName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -200,10 +200,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForInsteadOfAsFunctionName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForInsteadOfAsFunctionName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -211,10 +211,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForInsteadOfAsInterfaceName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForInsteadOfAsInterfaceName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -222,10 +222,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForInsteadOfAsMethodName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForInsteadOfAsMethodName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -233,10 +233,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForInsteadOfAsInterfaceName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForInsteadOfAsNamespaceName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -244,10 +244,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForInsteadOfAsCalledFunction * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForInsteadOfAsCalledFunction() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -255,10 +255,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForInsteadOfAsCalledMethod * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForInsteadOfAsCalledMethod() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -266,10 +266,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForInsteadOfAsConstant * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForInsteadOfAsConstant() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -277,10 +277,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForCallableAsClassName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForCallableAsClassName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -288,10 +288,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForCallableAsFunctionName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForCallableAsFunctionName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -299,10 +299,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForCallableAsInterfaceName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForCallableAsInterfaceName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -310,10 +310,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForCallableAsMethodName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForCallableAsMethodName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -321,10 +321,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForCallableAsInterfaceName * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForCallableAsNamespaceName() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -332,10 +332,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForCallableAsCalledFunction * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForCallableAsCalledFunction() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -343,10 +343,10 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExpectedExceptionForCallableAsConstant * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExpectedExceptionForCallableAsConstant() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -354,28 +354,28 @@ class PHPParserVersion54Test extends AbstractTest * testParserThrowsExceptionForParameterWithExpressionValue * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExceptionForParameterWithExpressionValue() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } /** * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testListKeywordAsMethodNameThrowsException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } /** * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testListKeywordAsFunctionNameThrowsException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion55Test.php b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion55Test.php index e711b1a..d96ce29 100644 --- a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion55Test.php +++ b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion55Test.php @@ -64,10 +64,10 @@ class PHPParserVersion55Test extends AbstractTest * testParserThrowsExceptionForParameterWithExpressionValue * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExceptionForParameterWithExpressionValue() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -75,10 +75,10 @@ class PHPParserVersion55Test extends AbstractTest * testParserThrowsExceptionForComplexExpressionInConstantDeclarator * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExceptionForComplexExpressionInConstantDeclarator() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } @@ -86,38 +86,38 @@ class PHPParserVersion55Test extends AbstractTest * testParserThrowsExceptionForComplexExpressionInFieldDeclaration * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testParserThrowsExceptionForComplexExpressionInFieldDeclaration() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } /** * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testListKeywordAsMethodNameThrowsException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } /** * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testListKeywordAsFunctionNameThrowsException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } /** * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException - * @expectedExceptionMessageRegExp (^Unexpected token: \.\.\., line: 6, col: 9, file: ) */ public function testEllipsisOperatorInFunctionCallThrowsException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); + $this->expectExceptionMessageMatches('(^Unexpected token: \.\.\., line: 6, col: 9, file: )'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion56Test.php b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion56Test.php index 2e48ec4..733d6b8 100644 --- a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion56Test.php +++ b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion56Test.php @@ -133,21 +133,21 @@ class PHPParserVersion56Test extends AbstractTest /** * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException - * @expectedExceptionMessageRegExp (Unexpected token: list, line: 4, col: 21, file: ) */ public function testListKeywordAsMethodNameThrowsException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); + $this->expectExceptionMessageMatches('(^Unexpected token: list, line: 4, col: 21, file: )'); $this->parseCodeResourceForTest(); } /** * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException - * @expectedExceptionMessageRegExp (Unexpected token: list, line: 2, col: 10, file: ) */ public function testListKeywordAsFunctionNameThrowsException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); + $this->expectExceptionMessageMatches('(^Unexpected token: list, line: 2, col: 10, file: )'); $this->parseCodeResourceForTest(); } @@ -161,21 +161,21 @@ class PHPParserVersion56Test extends AbstractTest /** * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException - * @expectedExceptionMessageRegExp (^Unexpected token: \{, line: 2, col: 24, file: ) */ public function testGroupUseStatementThrowsException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); + $this->expectExceptionMessageMatches('(^Unexpected token: \{, line: 2, col: 24, file: )'); $this->parseCodeResourceForTest(); } /** * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException - * @expectedExceptionMessageRegExp (^Unexpected token: ::, line: 8, col: 24, file: ) */ public function testUniformVariableSyntaxThrowsException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); + $this->expectExceptionMessageMatches('(^Unexpected token: ::, line: 8, col: 24, file: )'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion70Test.php b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion70Test.php index 8ae93b3..14cf1d5 100644 --- a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion70Test.php +++ b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion70Test.php @@ -426,10 +426,10 @@ class PHPParserVersion70Test extends AbstractTest /** * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testListKeywordAsFunctionNameThrowsException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion72Test.php b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion72Test.php index 31c4ef4..75622fe 100644 --- a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion72Test.php +++ b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion72Test.php @@ -127,12 +127,10 @@ class PHPParserVersion72Test extends AbstractTest ); } - /** - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException - * @expectedExceptionMessage Unexpected token: ), line: 4, col: 14 - */ public function testTrailingCommasInUnsetCall() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); + $this->expectExceptionMessage('Unexpected token: ), line: 4, col: 14'); $this->parseCodeResourceForTest(); } } diff --git a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion74Test.php b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion74Test.php index a2b155d..3bbc8c6 100644 --- a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion74Test.php +++ b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion74Test.php @@ -397,30 +397,24 @@ class PHPParserVersion74Test extends AbstractTest $this->assertFalse($this->parseCodeResourceForTest()->current()); } - /** - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException - * @expectedExceptionMessage Unexpected token: ), line: 8, col: 27 - */ public function testCatchWithoutVariable() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); + $this->expectExceptionMessage('Unexpected token: ), line: 8, col: 27'); $this->getFirstClassForTestCase(); } - /** - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException - * @expectedExceptionMessage Unexpected token: ), line: 5, col: 32 - */ public function testTrailingCommaInClosureUseListError() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); + $this->expectExceptionMessage('Unexpected token: ), line: 5, col: 32'); $this->parseCodeResourceForTest(); } - /** - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException - * @expectedExceptionMessage Unexpected token: ), line: 4, col: 43 - */ public function testTrailingCommaInParameterList() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); + $this->expectExceptionMessage('Unexpected token: ), line: 4, col: 43'); $this->getFirstMethodForTestCase(); } diff --git a/src/test/php/PDepend/Source/Parser/ASTArgumentsParsingTest.php b/src/test/php/PDepend/Source/Parser/ASTArgumentsParsingTest.php index 95367bf..4b7011c 100644 --- a/src/test/php/PDepend/Source/Parser/ASTArgumentsParsingTest.php +++ b/src/test/php/PDepend/Source/Parser/ASTArgumentsParsingTest.php @@ -227,10 +227,10 @@ class ASTArgumentsParsingTest extends AbstractParserTest * exception. * * @return void - * @expectedException \PDepend\Source\Parser\UnexpectedTokenException */ public function testUnclosedArgumentsExpressionThrowsExpectedException() { + $this->expectException('\PDepend\Source\Parser\UnexpectedTokenException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/Source/Parser/ASTFormalParameterParsingTest.php b/src/test/php/PDepend/Source/Parser/ASTFormalParameterParsingTest.php index 7619794..2a7f105 100644 --- a/src/test/php/PDepend/Source/Parser/ASTFormalParameterParsingTest.php +++ b/src/test/php/PDepend/Source/Parser/ASTFormalParameterParsingTest.php @@ -71,10 +71,10 @@ class ASTFormalParameterParsingTest extends AbstractParserTest * testWithParentTypeHintInFunctionThrowsExpectedException * * @return void - * @expectedException \PDepend\Source\Parser\InvalidStateException */ public function testWithParentTypeHintInFunctionThrowsExpectedException() { + $this->expectException('\PDepend\Source\Parser\InvalidStateException'); $this->parseCodeResourceForTest(); } @@ -82,10 +82,10 @@ class ASTFormalParameterParsingTest extends AbstractParserTest * testWithParentTypeHintInRootClassThrowsExpectedException * * @return void - * @expectedException \PDepend\Source\Parser\InvalidStateException */ public function testWithParentTypeHintInRootClassThrowsExpectedException() { + $this->expectException('\PDepend\Source\Parser\InvalidStateException'); $this->parseCodeResourceForTest(); } diff --git a/src/test/php/PDepend/TextUI/CommandTest.php b/src/test/php/PDepend/TextUI/CommandTest.php index 1acacc1..d905869 100644 --- a/src/test/php/PDepend/TextUI/CommandTest.php +++ b/src/test/php/PDepend/TextUI/CommandTest.php @@ -484,7 +484,7 @@ class CommandTest extends AbstractTest public function testTextUiCommandOutputContainsExpectedCoverageReportOption() { list(, $actual) = $this->executeCommand(array()); - $this->assertContains('--coverage-report=', $actual); + $this->assertStringContainsString('--coverage-report=', $actual); } /** @@ -538,7 +538,7 @@ class CommandTest extends AbstractTest list($exitCode, $actual) = $this->executeCommand($argv); $this->assertSame(Command::CLI_ERROR, $exitCode); - $this->assertContains( + $this->assertStringContainsString( sprintf('The configuration file "%s" doesn\'t exist.', $configFile), $actual ); diff --git a/src/test/php/PDepend/TextUI/RunnerTest.php b/src/test/php/PDepend/TextUI/RunnerTest.php index 88e86b7..9b9fac9 100644 --- a/src/test/php/PDepend/TextUI/RunnerTest.php +++ b/src/test/php/PDepend/TextUI/RunnerTest.php @@ -60,10 +60,10 @@ class RunnerTest extends AbstractTest * directory. * * @return void - * @expectedException \RuntimeException */ public function testRunnerThrowsRuntimeExceptionForInvalidSourceDirectory() { + $this->expectException('\RuntimeException'); $runner = $this->createTextUiRunner(); $runner->setSourceArguments(array('foo/bar')); $runner->run(); @@ -73,10 +73,10 @@ class RunnerTest extends AbstractTest * Tests that the runner stops processing if no logger is specified. * * @return void - * @expectedException \RuntimeException */ public function testRunnerThrowsRuntimeExceptionIfNoLoggerIsSpecified() { + $this->expectException('\RuntimeException'); $runner = $this->createTextUiRunner(); $runner->setSourceArguments(array($this->createCodeResourceUriForTest())); $runner->run(); @@ -236,17 +236,17 @@ class RunnerTest extends AbstractTest ob_end_clean(); $errors = $runner->getParseErrors(); - $this->assertContains('Unexpected token: }, line: 10, col: 1, file: ', $errors[0]); + $this->assertStringContainsString('Unexpected token: }, line: 10, col: 1, file: ', $errors[0]); } /** * testRunnerThrowsExceptionForUndefinedLoggerClass * * @return void - * @expectedException \RuntimeException */ public function testRunnerThrowsExceptionForUndefinedLoggerClass() { + $this->expectException('\RuntimeException'); $runner = $this->createTextUiRunner(); $runner->addReportGenerator('FooBarLogger', $this->createRunResourceURI()); $runner->run(); diff --git a/src/test/php/PDepend/Util/Cache/CacheFactoryTest.php b/src/test/php/PDepend/Util/Cache/CacheFactoryTest.php index 066cca5..ea70341 100644 --- a/src/test/php/PDepend/Util/Cache/CacheFactoryTest.php +++ b/src/test/php/PDepend/Util/Cache/CacheFactoryTest.php @@ -138,11 +138,11 @@ class CacheFactoryTest extends AbstractTest * testCreateThrowsExpectedExceptionForUnknownCacheDriver * * @return void - * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException - * @expectedExceptionMessage The value "fail" is not allowed for path "pdepend.cache.driver". Permissible values: "file", "memory" */ public function testCreateThrowsExpectedExceptionForUnknownCacheDriver() { + $this->expectException('\Symfony\Component\Config\Definition\Exception\InvalidConfigurationException'); + $this->expectExceptionMessage('The value "fail" is not allowed for path "pdepend.cache.driver". Permissible values: "file", "memory"'); $this->changeWorkingDirectory(); $factory = $this->createFactoryFixture(); diff --git a/src/test/php/PDepend/Util/ConfigurationTest.php b/src/test/php/PDepend/Util/ConfigurationTest.php index c88f791..5328ad4 100644 --- a/src/test/php/PDepend/Util/ConfigurationTest.php +++ b/src/test/php/PDepend/Util/ConfigurationTest.php @@ -76,10 +76,10 @@ class ConfigurationTest extends AbstractTest * testPropertyAccessForNotExistingValueThrowsExpectedException * * @return void - * @expectedException \OutOfRangeException */ public function testPropertyAccessForNotExistingValueThrowsExpectedException() { + $this->expectException('\OutOfRangeException'); $settings = new \stdClass(); $settings->foo = 42; @@ -91,10 +91,10 @@ class ConfigurationTest extends AbstractTest * testPropertiesAreNotWritableAndExpectedExceptionIsThrown * * @return void - * @expectedException \OutOfRangeException */ public function testPropertiesAreNotWritableAndExpectedExceptionIsThrown() { + $this->expectException('\OutOfRangeException'); $configuration = new Configuration(new \stdClass()); $configuration->foo = 42; } diff --git a/src/test/php/PDepend/Util/Coverage/FactoryTest.php b/src/test/php/PDepend/Util/Coverage/FactoryTest.php index 1773bf6..d5a24a7 100644 --- a/src/test/php/PDepend/Util/Coverage/FactoryTest.php +++ b/src/test/php/PDepend/Util/Coverage/FactoryTest.php @@ -72,10 +72,10 @@ class FactoryTest extends AbstractTest * testCreateMethodThrowsExceptionWhenFileDoesNotExist * * @return void - * @expectedException \RuntimeException */ public function testCreateMethodThrowsExceptionWhenFileDoesNotExist() { + $this->expectException('\RuntimeException'); $factory = new Factory(); $factory->create(__FUNCTION__); } @@ -84,10 +84,10 @@ class FactoryTest extends AbstractTest * testCreateMethodThrowsExceptionWhenFileIsNotValidXml * * @return void - * @expectedException \RuntimeException */ public function testCreateMethodThrowsExceptionWhenFileIsNotValidXml() { + $this->expectException('\RuntimeException'); $factory = new Factory(); $factory->create(__FILE__); } @@ -96,10 +96,10 @@ class FactoryTest extends AbstractTest * testCreateMethodThrowsExceptionForUnsupportedReportFormat * * @return void - * @expectedException \RuntimeException */ public function testCreateMethodThrowsExceptionForUnsupportedReportFormat() { + $this->expectException('\RuntimeException'); $factory = new Factory(); $factory->create(dirname(__FILE__) . '/_files/fail.xml'); }