TestCase: support for @throws annotation [Closes nette#16]

Tester/Framework/TestCase.php

@@ -34,7 +34,16 @@ public function run($method = NULL)
 			}
 
 			$data = array();
-			$info = Helpers::parseDocComment($method->getDocComment()) + array('dataprovider' => NULL);
+			$info = Helpers::parseDocComment($method->getDocComment()) + array('dataprovider' => NULL, 'throws' => NULL);
+
+			if ($info['throws'] === TRUE) {
+				throw new TestCaseException("Missing class name in @throws annotation for {$method->getName()}().");
+			} elseif (is_array($info['throws'])) {
+				throw new TestCaseException("Annotation @throws for {$method->getName()}() can be specified only once.");
+			} else {
+				$throws = preg_split('#\s+#', $info['throws'], 2) + array(NULL, NULL);
+			}
+
 			foreach ((array) $info['dataprovider'] as $provider) {
 				$res = $this->getData($provider);
 				if (!is_array($res)) {
@@ -51,7 +60,17 @@ public function run($method = NULL)
 
 			foreach ($data as $key => $args) {
 				try {
-					$this->runTest($method->getName(), $args);
+					if ($info['throws']) {
+						$tmp = $this;
+						$e = Assert::error(function() use ($tmp, $method, $args) {
+							$tmp->runTest($method->getName(), $args);
+						}, $throws[0], $throws[1]);
+						if ($e instanceof AssertException) {
+							throw $e;
+						}
+					} else {
+						$this->runTest($method->getName(), $args);
+					}
 				} catch (AssertException $e) {
 					$e->message .= " in {$method->getName()}" . (substr(Dumper::toLine($args), 5));
 					throw $e;
@@ -90,7 +109,7 @@ protected function getData($provider)
 			return DataProvider::load(dirname($rc->getFileName()) . '/' . $file, $query);
 		} else {
 			return $this->$provider();
-	}
+		}
 	}
 
 

tests/TestCase.annotationThrows.phpt

@@ -0,0 +1,100 @@
+<?php
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+
+class MyException extends Exception
+{
+}
+
+class MyTest extends Tester\TestCase
+{
+	/** @throws Exception */
+	public function testThrows()
+	{
+		throw new Exception;
+	}
+
+	/** @throws Exception */
+	public function testThrowsButDont()
+	{
+	}
+
+	/** @throws Exception  With message */
+	public function testThrowsMessage()
+	{
+		throw new Exception('With message');
+	}
+
+	/** @throws Exception */
+	public function testFailAssertPass()
+	{
+		Assert::fail('failed');
+	}
+
+	/** @throws MyException */
+	public function testThrowsBadClass()
+	{
+		throw new Exception;
+	}
+
+	/** @throws Exception  With message */
+	public function testThrowsBadMessage()
+	{
+		throw new Exception('Bad message');
+	}
+
+	// Without @throws
+	public function testWithoutThrows()
+	{
+		throw new Exception;
+	}
+
+	public function dataProvider()
+	{
+		return array(array(1));
+	}
+
+	/**
+	 * @dataprovider dataProvider
+	 * @throws Exception
+	 */
+	public function testThrowsWithDataprovider($x)
+	{
+	}
+}
+
+
+$test = new MyTest;
+$test->run('testThrows');
+$test->run('testThrowsMessage');
+
+Assert::exception(function() use ($test) {
+	$test->run('testThrowsButDont');
+}, 'Tester\AssertException', 'Exception was expected, but none was thrown in testThrowsButDont()');
+
+Assert::exception(function() use ($test) {
+	$test->run('testFailAssertPass');
+}, 'Tester\AssertException', 'failed in testFailAssertPass()');
+
+Assert::exception(function() use ($test) {
+	$test->run('testThrowsBadClass');
+}, 'Tester\AssertException', 'MyException was expected but got Exception in testThrowsBadClass()');
+
+Assert::exception(function() use ($test) {
+	$test->run('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');
+}, 'Exception');
+
+Assert::exception(function() use ($test) {
+	$test->run('testThrowsWithDataprovider');
+}, 'Exception', 'Exception was expected, but none was thrown in testThrowsWithDataprovider(1)');
+
+Assert::exception(function() use ($test) {
+	$test->run('testUndefinedMethod');
+}, 'ReflectionException', 'Method testUndefinedMethod does not exist');

tests/TestCase.annotationThrows.syntax.phpt

@@ -0,0 +1,35 @@
+<?php
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+
+class MyTest extends Tester\TestCase
+{
+	/**
+	 * @throws
+	 */
+	public function testThrowsNoClass()
+	{
+	}
+
+	/**
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	public function testThrowsMultiple()
+	{
+	}
+
+}
+
+$test = new MyTest;
+
+Assert::exception(function() use ($test) {
+	$test->run('testThrowsNoClass');
+}, 'Tester\TestCaseException', 'Missing class name in @throws annotation for testThrowsNoClass().');
+
+Assert::exception(function() use ($test) {
+	$test->run('testThrowsMultiple');
+}, 'Tester\TestCaseException', 'Annotation @throws for testThrowsMultiple() can be specified only once.');