Make spec test failure messages more readable.

test/MustacheSpecTest.php

@@ -25,7 +25,7 @@ class MustacheSpecTest extends PHPUnit_Framework_TestCase {
 	 * @group comments
 	 * @dataProvider loadCommentSpec
 	 */
-	public function testCommentSpec($template, $data, $partials, $expected, $desc) {
+	public function testCommentSpec($desc, $template, $data, $partials, $expected) {
 		$m = new Mustache($template, $data, $partials);
 		$this->assertEquals($expected, $m->render(), $desc);
 	}
@@ -34,7 +34,7 @@ class MustacheSpecTest extends PHPUnit_Framework_TestCase {
 	 * @group delimiters
 	 * @dataProvider loadDelimitersSpec
 	 */
-	public function testDelimitersSpec($template, $data, $partials, $expected, $desc) {
+	public function testDelimitersSpec($desc, $template, $data, $partials, $expected) {
 		$m = new Mustache($template, $data, $partials);
 		$this->assertEquals($expected, $m->render(), $desc);
 	}
@@ -43,7 +43,7 @@ class MustacheSpecTest extends PHPUnit_Framework_TestCase {
 	 * @group interpolation
 	 * @dataProvider loadInterpolationSpec
 	 */
-	public function testInterpolationSpec($template, $data, $partials, $expected, $desc) {
+	public function testInterpolationSpec($desc, $template, $data, $partials, $expected) {
 		$m = new Mustache($template, $data, $partials);
 		$this->assertEquals($expected, $m->render(), $desc);
 	}
@@ -52,7 +52,7 @@ class MustacheSpecTest extends PHPUnit_Framework_TestCase {
 	 * @group inverted-sections
 	 * @dataProvider loadInvertedSpec
 	 */
-	public function testInvertedSpec($template, $data, $partials, $expected, $desc) {
+	public function testInvertedSpec($desc, $template, $data, $partials, $expected) {
 		$m = new Mustache($template, $data, $partials);
 		$this->assertEquals($expected, $m->render(), $desc);
 	}
@@ -61,7 +61,7 @@ class MustacheSpecTest extends PHPUnit_Framework_TestCase {
 	//  * @group lambdas
 	//  * @dataProvider loadLambdasSpec
 	//  */
-	// public function testLambdasSpec($template, $data, $partials, $expected, $desc) {
+	// public function testLambdasSpec($desc, $template, $data, $partials, $expected) {
 	// 	$this->markTestSkipped("Lambdas for PHP haven't made it into the spec yet, so we'll skip them to avoid a bajillion failed tests.");
 	//
 	// 	if (!version_compare(PHP_VERSION, '5.3.0', '>=')) {
@@ -76,7 +76,7 @@ class MustacheSpecTest extends PHPUnit_Framework_TestCase {
 	 * @group partials
 	 * @dataProvider loadPartialsSpec
 	 */
-	public function testPartialsSpec($template, $data, $partials, $expected, $desc) {
+	public function testPartialsSpec($desc, $template, $data, $partials, $expected) {
 		$m = new Mustache($template, $data, $partials);
 		$this->assertEquals($expected, $m->render(), $desc);
 	}
@@ -85,7 +85,7 @@ class MustacheSpecTest extends PHPUnit_Framework_TestCase {
 	 * @group sections
 	 * @dataProvider loadSectionsSpec
 	 */
-	public function testSectionsSpec($template, $data, $partials, $expected, $desc) {
+	public function testSectionsSpec($desc, $template, $data, $partials, $expected) {
 		$m = new Mustache($template, $data, $partials);
 		$this->assertEquals($expected, $m->render(), $desc);
 	}
@@ -138,7 +138,7 @@ class MustacheSpecTest extends PHPUnit_Framework_TestCase {
 
 		$spec = $yaml->parse(file_get_contents($filename));
 		foreach ($spec['tests'] as $test) {
-			$data[] = array($test['template'], $test['data'], isset($test['partials']) ? $test['partials'] : array(), $test['expected'], $test['desc']);
+			$data[] = array($test['name'] . ': ' . $test['desc'], $test['template'], $test['data'], isset($test['partials']) ? $test['partials'] : array(), $test['expected']);
 		}
 		return $data;
 	}