TestCase::run() does not accept arguments (BC break) [Closes nette#244]

src/Framework/TestCase.php

@@ -29,35 +29,30 @@ class TestCase
 	 * Runs the test case.
 	 * @return void
 	 */
-	public function run($method = NULL)
+	public function run()
 	{
-		$r = new \ReflectionObject($this);
+		if (func_num_args()) {
+			throw new \LogicException('Calling TestCase::run($method) is deprecated. Use TestCase::runTest($method) instead.');
+		}
+
 		$methods = array_values(preg_grep(self::METHOD_PATTERN, array_map(function (\ReflectionMethod $rm) {
 			return $rm->getName();
-		}, $r->getMethods())));
-
-		if (substr($method, 0, 2) === '--') { // back compatibility
-			$method = NULL;
-		}
+		}, (new \ReflectionObject($this))->getMethods())));
 
-		if ($method === NULL && isset($_SERVER['argv']) && ($tmp = preg_filter('#(--method=)?([\w-]+)$#Ai', '$2', $_SERVER['argv']))) {
+		if (isset($_SERVER['argv']) && ($tmp = preg_filter('#(--method=)?([\w-]+)$#Ai', '$2', $_SERVER['argv']))) {
 			$method = reset($tmp);
 			if ($method === self::LIST_METHODS) {
 				Environment::$checkAssertions = FALSE;
 				header('Content-Type: text/plain');
 				echo '[' . implode(',', $methods) . ']';
 				return;
 			}
-		}
+			$this->runTest($method);
 
-		if ($method === NULL) {
+		} else {
 			foreach ($methods as $method) {
 				$this->runTest($method);
 			}
-		} elseif (in_array($method, $methods, TRUE)) {
-			$this->runTest($method);
-		} else {
-			throw new TestCaseException("Method '$method' does not exist or it is not a testing method.");
 		}
 	}
 
@@ -70,6 +65,12 @@ public function run($method = NULL)
 	 */
 	public function runTest($method, array $args = NULL)
 	{
+		if (!method_exists($this, $method)) {
+			throw new TestCaseException("Method '$method' does not exist.");
+		} elseif (!preg_match(self::METHOD_PATTERN, $method)) {
+			throw new TestCaseException("Method '$method' is not a testing method.");
+		}
+
 		$method = new \ReflectionMethod($this, $method);
 		if (!$method->isPublic()) {
 			throw new TestCaseException("Method {$method->getName()} is not public. Make it public or rename it.");

tests/Framework/TestCase.annotationThrows.phpt

@@ -93,44 +93,44 @@ class MyTest extends Tester\TestCase
 
 
 $test = new MyTest;
-$test->run('testThrows');
-$test->run('testThrowsMessage');
+$test->runTest('testThrows');
+$test->runTest('testThrowsMessage');
 
 Assert::exception(function () use ($test) {
-	$test->run('testThrowsButDont');
+	$test->runTest('testThrowsButDont');
 }, 'Tester\AssertException', 'Exception was expected, but none was thrown in testThrowsButDont()');
 
 Assert::exception(function () use ($test) {
-	$test->run('testFailAssertPass');
+	$test->runTest('testFailAssertPass');
 }, 'Tester\AssertException', 'failed in testFailAssertPass()');
 
 Assert::exception(function () use ($test) {
-	$test->run('testThrowsBadClass');
+	$test->runTest('testThrowsBadClass');
 }, 'Tester\AssertException', 'MyException was expected but got Exception in testThrowsBadClass()');
 
 Assert::exception(function () use ($test) {
-	$test->run('testThrowsBadMessage');
+	$test->runTest('testThrowsBadMessage');
 }, 'Tester\AssertException', "Exception with a message matching 'With message' was expected but got 'Bad message' in testThrowsBadMessage()");
 
 Assert::exception(function () use ($test) {
-	$test->run('testWithoutThrows');
+	$test->runTest('testWithoutThrows');
 }, 'Exception');
 
 Assert::exception(function () use ($test) {
-	$test->run('testThrowsWithDataprovider');
+	$test->runTest('testThrowsWithDataprovider');
 }, 'Exception', 'Exception was expected, but none was thrown in testThrowsWithDataprovider(1)');
 
 Assert::exception(function () use ($test) {
-	$test->run('testUndefinedMethod');
-}, 'Tester\TestCaseException', "Method 'testUndefinedMethod' does not exist or it is not a testing method.");
+	$test->runTest('testUndefinedMethod');
+}, 'Tester\TestCaseException', "Method 'testUndefinedMethod' does not exist.");
 
-$test->run('testNotice');
-$test->run('testNoticeMessage');
+$test->runTest('testNotice');
+$test->runTest('testNoticeMessage');
 
 Assert::exception(function () use ($test) {
-	$test->run('testBadError');
+	$test->runTest('testBadError');
 }, 'Tester\AssertException', 'E_WARNING was expected, but E_NOTICE (Undefined variable: a) was generated in %a%testBadError()');
 
 Assert::exception(function () use ($test) {
-	$test->run('testNoticeBadMessage');
+	$test->runTest('testNoticeBadMessage');
 }, 'Tester\AssertException', "E_NOTICE with a message matching 'With message' was expected but got 'Undefined variable: a' in testNoticeBadMessage()");

tests/Framework/TestCase.annotationThrows.syntax.phpt

@@ -27,9 +27,9 @@ class MyTest extends Tester\TestCase
 $test = new MyTest;
 
 Assert::exception(function () use ($test) {
-	$test->run('testThrowsNoClass');
+	$test->runTest('testThrowsNoClass');
 }, 'Tester\TestCaseException', 'Missing class name in @throws annotation for testThrowsNoClass().');
 
 Assert::exception(function () use ($test) {
-	$test->run('testThrowsMultiple');
+	$test->runTest('testThrowsMultiple');
 }, 'Tester\TestCaseException', 'Annotation @throws for testThrowsMultiple() can be specified only once.');

tests/Framework/TestCase.basic.phpt

@@ -24,7 +24,7 @@ class TestCaseTearDownException extends TestCaseTest
 
 Assert::exception(function () {
 	$test = new TestCaseTest;
-	$test->run('testAssertion');
+	$test->runTest('testAssertion');
 }, 'Tester\AssertException', 'FALSE should be TRUE in testAssertion()');
 
 
@@ -34,5 +34,5 @@ Assert::exception(function () use ($test) {
 }, 'RuntimeException');
 
 Assert::exception(function () use ($test) {
-	$test->run('testAssertion');
+	$test->runTest('testAssertion');
 }, 'Tester\AssertException', 'FALSE should be TRUE in testAssertion()');

tests/Framework/TestCase.dataProvider.generator.phpt

@@ -5,7 +5,6 @@
  */
 
 use Tester\Assert;
-use Tester\Environment;
 
 require __DIR__ . '/../bootstrap.php';
 
@@ -30,7 +29,7 @@ class MyTest extends Tester\TestCase
 
 
 $test = new MyTest;
-$test->run('testDataProviderGenerator');
+$test->runTest('testDataProviderGenerator');
 Assert::same([
 	['MyTest::testDataProviderGenerator', [0]],
 	['MyTest::testDataProviderGenerator', [1]],

tests/Framework/TestCase.dataProvider.phpt

@@ -63,7 +63,7 @@ class MyTest extends Tester\TestCase
 
 
 $test = new MyTest;
-$test->run('testSingleDataProvider');
+$test->runTest('testSingleDataProvider');
 Assert::same([
 	'MyTest::dataProvider',
 	['MyTest::testSingleDataProvider', [1, 2]],
@@ -72,7 +72,7 @@ Assert::same([
 
 
 $test = new MyTest;
-$test->run('testMultipleDataProvider');
+$test->runTest('testMultipleDataProvider');
 Assert::same([
 	'MyTest::dataProvider',
 	'MyTest::dataProvider',
@@ -84,7 +84,7 @@ Assert::same([
 
 
 $test = new MyTest;
-$test->run('testIteratorDataProvider');
+$test->runTest('testIteratorDataProvider');
 Assert::same([
 	'MyTest::dataProviderIterator',
 	['MyTest::testIteratorDataProvider', [1, 2]],
@@ -93,7 +93,7 @@ Assert::same([
 
 
 $test = new MyTest;
-$test->run('testFileDataProvider');
+$test->runTest('testFileDataProvider');
 Assert::same([
 	['MyTest::testFileDataProvider', ['1', 'b']],
 	['MyTest::testFileDataProvider', ['a', '2']],
@@ -102,5 +102,5 @@ Assert::same([
 
 Assert::exception(function () {
 	$test = new MyTest;
-	$test->run('testAssertion');
+	$test->runTest('testAssertion');
 }, 'Tester\AssertException', 'FALSE should be TRUE in testAssertion(1, 2)');

tests/Framework/TestCase.invalidMethods.phpt

@@ -25,21 +25,21 @@ class MyTest extends Tester\TestCase
 $test = new MyTest;
 
 Assert::exception(function () use ($test) {
-	$test->run('testProtected');
+	$test->runTest('testProtected');
 }, 'Tester\TestCaseException', 'Method testProtected is not public. Make it public or rename it.');
 
 Assert::exception(function () use ($test) {
-	$test->run('testPrivate');
+	$test->runTest('testPrivate');
 }, 'Tester\TestCaseException', 'Method testPrivate is not public. Make it public or rename it.');
 
 Assert::exception(function () use ($test) {
-	$test->run('testUndefined');
-}, 'Tester\TestCaseException', "Method 'testUndefined' does not exist or it is not a testing method.");
+	$test->runTest('testUndefined');
+}, 'Tester\TestCaseException', "Method 'testUndefined' does not exist.");
 
 Assert::exception(function () use ($test) {
-	$test->run('notTesting');
-}, 'Tester\TestCaseException', "Method 'notTesting' does not exist or it is not a testing method.");
+	$test->runTest('notTesting');
+}, 'Tester\TestCaseException', "Method 'notTesting' is not a testing method.");
 
 Assert::exception(function () use ($test) {
-	$test->run('notTestingUndefined');
-}, 'Tester\TestCaseException', "Method 'notTestingUndefined' does not exist or it is not a testing method.");
+	$test->runTest('notTestingUndefined');
+}, 'Tester\TestCaseException', "Method 'notTestingUndefined' does not exist.");

tests/Framework/TestCase.invalidProvider.phpt

@@ -26,10 +26,10 @@ class InvalidProviderTest extends Tester\TestCase
 
 Assert::exception(function () {
 	$test = new InvalidProviderTest;
-	$test->run('testEmptyProvider');
+	$test->runTest('testEmptyProvider');
 }, 'Tester\TestCaseException', "Data provider invalidDataProvider() doesn't return array or Traversable.");
 
 Assert::exception(function () {
 	$test = new InvalidProviderTest;
-	$test->run('testMissingDataProvider');
+	$test->runTest('testMissingDataProvider');
 }, 'Tester\TestCaseException', 'Method testMissingDataProvider() has arguments, but @dataProvider is missing.');

tests/Framework/TestCase.order.phpt

@@ -76,11 +76,11 @@ class FailingTest extends Tester\TestCase
 $test = new FailingTest;
 
 Assert::exception(function () use ($test) {
-	$test->run('testPublic');
+	$test->runTest('testPublic');
 }, 'Tester\AssertException');
 
 Assert::exception(function () use ($test) {
-	$test->run('testPublicStatic');
+	$test->runTest('testPublicStatic');
 }, 'Tester\AssertException');