Updated test-suite to use microformats/tests repo, included with comp…

…oser.

composer.json

@@ -9,9 +9,16 @@
             "homepage": "http://waterpigs.co.uk"
         }
     ],
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/microformats/tests"
+        }
+    ],
     "bin": ["bin/fetch-mf2", "bin/parse-mf2"],
     "require": {
-        "php": ">=5.4.0"
+        "php": ">=5.4.0",
+        "microformats/test": "@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*"

tests/test-suite/test-suite.php

@@ -1,25 +1,30 @@
 <?php
 
 /**
- * php-mf2 test suite
- * CLI usage from the tests/test-suite/ directory: php test-suite.php
- * @see https://github.com/tobiastom/tests
+ * microformats test suite for php-mf2
+ * 
+ * Before running this test suite, ensure that you run composer install
+ * to install the microformats/tests repository of tests.
+ * @see https://github.com/microformats/tests
  *
- * This will look through the specified directory for suite.json files
- * that represent a suite of tests. Then, for each suite the sub-directories
- * will be parsed for input.html, output.json, and test.json files. Each
- * test will then be executed. If a test fails, a message is displayed along
- * with the parsed output (array format) and the expected output (array format).
+ * CLI usage from library root directory: php ./tests/test-suite/test-suite.php
  *
- * Individual test suites may be run by calling TestSuite->runSuite($path)
- * where $path is the file path to the suite.json file.
+ * This will look through the test directories for .html files that
+ * represent a test and the corresponding .json file that represent
+ * the expected output. If a test fails, a message is displayed along
+ * with the parsed output and the expected output, both in array format.
+ *
+ * Individual test suites may be run by specifying the relative path within the repo.
+ * For example, to run only the 'microformats-v2' tests: 
+ *   php ./tests/test-suite/test-suite.php microformats-v2
  */
 
 namespace Mf2\Parser\TestSuite;
 
 use Mf2\Parser;
 use Mf2;
 
+error_reporting(E_ALL);
 require dirname(__DIR__) . '/../vendor/autoload.php';
 
 class TestSuite
@@ -39,8 +44,16 @@ class TestSuite
 	 * @param string $path: path to test-suite-data 
 	 * @access public
 	 */
-	public function __construct($path = './test-suite-data/')
+	public function __construct($path = '')
 	{
+		$path = './vendor/microformats/test/tests/' . $path;
+
+		if ( !file_exists($path) )
+		{
+			echo sprintf('Specified path was not found: %s', $path), "\n";
+			exit;
+		}
+
 		$this->path = $path;
 	} # end method __construct()
 
@@ -53,14 +66,13 @@ public function __construct($path = './test-suite-data/')
 	 */
 	public function start()
 	{
-		$directory = new \RecursiveDirectoryIterator($this->path);
+		$directory = new \RecursiveDirectoryIterator($this->path, \RecursiveDirectoryIterator::SKIP_DOTS);
 		$iterator = new \RecursiveIteratorIterator($directory);
-		$this->suites = new \RegexIterator($iterator, '/^.+suite\.json$/i', \RecursiveRegexIterator::GET_MATCH);
+		$this->suites = new \RegexIterator($iterator, '/^.+\.html$/i', \RecursiveRegexIterator::GET_MATCH);
 
 		foreach ( $this->suites as $suite )
 		{
-			$this->runSuite(reset($suite));
-			// echo "\n";
+			$this->runTest(reset($suite));
 		}
 
 		echo sprintf('Total tests: %d', $this->tests_total), "\n";
@@ -72,6 +84,115 @@ public function start()
 
 
 	/**
+	 * This method handles running a test
+	 * @param string $path: path to the test's HTML file
+	 * @access public
+	 * @return bool
+	 */
+	public function runTest($path)
+	{
+		$test_name = basename($path, '.html');
+		echo sprintf('Running test: %s.', $test_name), "\n";
+
+		$dirname = dirname($path);
+		$json_file = $dirname . '/' . $test_name . '.json';
+
+		if ( !file_exists($json_file) )
+		{
+			echo sprintf('Halting test: %s. No json file found.', $test_name), "\n";
+			return FALSE;
+		}
+
+		$input = file_get_contents($path);
+		$expected_output = json_decode(file_get_contents($json_file), TRUE);
+
+		$parser = new Parser($input, '', TRUE);
+		$output = $parser->parse(TRUE);
+
+		$test_differences = $this->array_diff_assoc_recursive($expected_output, $output);
+
+		# if: test passed
+		if ( empty($test_differences) )
+		{
+			$this->tests_passed++;
+		}
+		# else: test failed
+		else
+		{
+			echo sprintf('Test failed: %s', $test_name), "\n\n";
+			echo sprintf('Parsed: %s', print_r($output, TRUE)), "\n";
+			echo sprintf('Expected: %s', print_r($expected_output, TRUE)), "\n";
+			echo sprintf('Differences: %s', print_r($test_differences, TRUE)), "\n";
+			$this->tests_failed++;
+		} # end if
+
+		return TRUE;
+	} # end method runTest()
+
+
+	/**
+	 * This method recursively compares two arrays and returns the difference
+	 * @see http://us2.php.net/manual/en/function.array-diff-assoc.php
+	 * @param array $array1
+	 * @param array $array2
+	 * @access public
+	 * @return array
+	 */
+	public function array_diff_assoc_recursive($array1, $array2, $canonicalize = true)
+	{
+		$difference = array();
+
+		# loop: each key in first array
+		foreach ( $array1 as $key => $value )
+		{
+
+			# if: nested array
+			if ( is_array($value) )
+			{
+
+				# if: mis-match
+				if ( !isset($array2[$key]) || !is_array($array2[$key]) )
+				{
+					$difference[$key] = $value;
+				}
+				# else: recursive
+				else
+				{
+					$recursive_diff = $this->array_diff_assoc_recursive($value, $array2[$key]);
+
+					if ( !empty($recursive_diff) )
+					{
+						$difference[$key] = $recursive_diff;
+					}
+
+				}
+
+			}
+			# else if: numeric key, non-array value
+			else if ( is_numeric($key) && !is_array($value) )
+			{
+
+				# if: check for value anywhere in second array (JSON is orderless)
+				if ( !in_array($value, $array2) )
+				{
+					$difference[$key] = $value;
+				}
+
+			}
+			# else if: associative key
+			else if ( !array_key_exists($key, $array2) || $array2[$key] !== $value )
+			{
+				$difference[$key] = $value;
+			}
+
+		} # end loop
+
+		return $difference;
+	} # end method array_diff_assoc_recursive()
+
+
+	/**
+	 * DEPRECATED
 	 * This method handles running a test suite
 	 * @param string $path: path to the suite's JSON file 
 	 * @access public
@@ -126,8 +247,6 @@ public function runSuite($path)
 
 }
 
-$TestSuite = new TestSuite();
-$TestSuite->start(); # run all test suites
-
-// Alternately, run a specific suite
-// $TestSuite->runSuite('./test-suite-data/adr/suite.json');
+$path = ( empty($argv[1]) ) ? '' : $argv[1];
+$TestSuite = new TestSuite($path);
+$TestSuite->start(); # run tests