Merge pull request microsoft#93 from mousetraps/api

remove dependence on index while iterating through test cases

Author: mousetraps

tests/LexicalGrammarTest.php

@@ -45,16 +45,15 @@ public function testOutputTokenClassificationAndLength($testCaseFile, $expectedT
 
     public function lexicalProvider() {
         $testCases = glob(__dir__ . "/cases/lexical/*.php");
-        $tokensExpected = glob(__dir__ . "/cases/lexical/*.php.tokens");
 
         $skipped = json_decode(file_get_contents(__DIR__ . "/skipped.json"));
 
         $testProviderArray = array();
-        foreach ($testCases as $index=>$testCase) {
+        foreach ($testCases as $testCase) {
             if (in_array(basename($testCase), $skipped)) {
                 continue;
             }
-            $testProviderArray[basename($testCase)] = [$testCase, $tokensExpected[$index]];
+            $testProviderArray[basename($testCase)] = [$testCase, $testCase . ".tokens"];
         }
 
         return $testProviderArray;

tests/ParserGrammarTest.php

@@ -51,15 +51,14 @@ public function testOutputTreeClassificationAndLength($testCaseFile, $expectedTo
 
     public function treeProvider() {
         $testCases = glob(self::FILE_PATTERN . ".php");
-        $tokensExpected = glob(self::FILE_PATTERN . ".php.tree");
         $skipped = json_decode(file_get_contents(__DIR__ . "/skipped.json"));
 
         $testProviderArray = array();
-        foreach ($testCases as $index=>$testCase) {
+        foreach ($testCases as $testCase) {
             if (in_array(basename($testCase), $skipped)) {
                 continue;
             }
-            $testProviderArray[basename($testCase)] = [$testCase, $tokensExpected[$index]];
+            $testProviderArray[basename($testCase)] = [$testCase, $testCase . ".tree"];
         }
 
         return $testProviderArray;