Reduce boilerplate code in ArcanistLinterTestCase subclasses

Summary: This is a bit magical and is maybe a terrible idea, but it seems okayish.

Test Plan: `arc unit`

Reviewers: chad, #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D11172

src/lint/linter/__tests__/ArcanistCSSLintLinterTestCase.php

@@ -4,9 +4,7 @@ final class ArcanistCSSLintLinterTestCase
   extends ArcanistArcanistLinterTestCase {
 
   public function testCSSLintLinter() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/csslint/');
-      dirname(__FILE__).'/csslint/',
-      new ArcanistCSSLintLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistClosureLinterTestCase.php

@@ -7,9 +7,7 @@ final class ArcanistClosureLinterTestCase
     $linter = new ArcanistClosureLinter();
     $linter->setFlags(array('--additional_extensions=lint-test'));
 
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/gjslint/', $linter);
-      dirname(__FILE__).'/gjslint/',
-      $linter);
   }
 
 }

src/lint/linter/__tests__/ArcanistCoffeeLintLinterTestCase.php

@@ -4,9 +4,7 @@ final class ArcanistCoffeeLintLinterTestCase
   extends ArcanistArcanistLinterTestCase {
 
   public function testCoffeeLintLinter() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/coffeelint/');
-      dirname(__FILE__).'/coffeelint/',
-      new ArcanistCoffeeLintLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistCommitLinterTestCase.php

@@ -4,9 +4,7 @@ final class ArcanistCommitLinterTestCase
   extends ArcanistArcanistLinterTestCase {
 
   public function testCommitLint() {
-    $this->executeTestsInDirectory(
+    return $this->executeTestsInDirectory(dirname(__FILE__).'/commit/');
-      dirname(__FILE__).'/commit/',
-      new ArcanistCommitLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistCppcheckLinterTestCase.php

@@ -4,9 +4,7 @@ final class ArcanistCppcheckLinterTestCase
   extends ArcanistArcanistLinterTestCase {
 
   public function testCppcheckLint() {
-    return $this->executeTestsInDirectory(
+    return $this->executeTestsInDirectory(dirname(__FILE__).'/cppcheck/');
-      dirname(__FILE__).'/cppcheck/',
-      new ArcanistCppcheckLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistCpplintLinterTestCase.php

@@ -4,9 +4,7 @@ final class ArcanistCpplintLinterTestCase
   extends ArcanistArcanistLinterTestCase {
 
   public function testCpplintLint() {
-    return $this->executeTestsInDirectory(
+    return $this->executeTestsInDirectory(dirname(__FILE__).'/cpplint/');
-      dirname(__FILE__).'/cpplint/',
-      new ArcanistCpplintLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistFlake8LinterTestCase.php

@@ -4,9 +4,7 @@ final class ArcanistFlake8LinterTestCase
   extends ArcanistArcanistLinterTestCase {
 
   public function testFlake8Lint() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/flake8/');
-      dirname(__FILE__).'/flake8/',
-      new ArcanistFlake8Linter());
   }
 
 }

src/lint/linter/__tests__/ArcanistGoLintLinterTestCase.php

@@ -4,9 +4,7 @@ final class ArcanistGoLintLinterTestCase
   extends ArcanistArcanistLinterTestCase {
 
   public function testGoLintLinter() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/golint/');
-      dirname(__FILE__).'/golint/',
-      new ArcanistGoLintLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistHLintLinterTestCase.php

@@ -1,9 +1,9 @@
 <?php
 
 final class ArcanistHLintLinterTestCase extends ArcanistArcanistLinterTestCase {
+
   public function testHlintLinter() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/hlint/');
-      dirname(__FILE__).'/hlint/',
-      new ArcanistHLintLinter());
   }
+
 }

src/lint/linter/__tests__/ArcanistJSHintLinterTestCase.php

@@ -4,9 +4,7 @@ final class ArcanistJSHintLinterTestCase
   extends ArcanistArcanistLinterTestCase {
 
   public function testJSHintLinter() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/jshint/');
-      dirname(__FILE__).'/jshint/',
-      new ArcanistJSHintLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistJSONLintLinterTestCase.php

@@ -4,9 +4,7 @@ final class ArcanistJSONLintLinterTestCase
   extends ArcanistArcanistLinterTestCase {
 
   public function testJSONLintLinter() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/jsonlint/');
-      dirname(__FILE__).'/jsonlint/',
-      new ArcanistJSONLintLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistJSONLinterTestCase.php

@@ -3,9 +3,7 @@
 final class ArcanistJSONLinterTestCase extends ArcanistArcanistLinterTestCase {
 
   public function testJSONLinter() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/jsonlint/');
-      dirname(__FILE__).'/jsonlint/',
-      new ArcanistJSONLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistJscsLinterTestCase.php

@@ -3,9 +3,7 @@
 final class ArcanistJscsLinterTestCase extends ArcanistArcanistLinterTestCase {
 
   public function testJscsLinter() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/jscs/');
-      dirname(__FILE__).'/jscs/',
-      new ArcanistJscsLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistLesscLinterTestCase.php

@@ -3,9 +3,7 @@
 final class ArcanistLesscLinterTestCase extends ArcanistArcanistLinterTestCase {
 
   public function testLesscLinter() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/lessc/');
-      dirname(__FILE__).'/lessc/',
-      new ArcanistLesscLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistLinterTestCase.php

@@ -5,7 +5,33 @@
  */
 abstract class ArcanistLinterTestCase extends ArcanistPhutilTestCase {
 
-  public function executeTestsInDirectory($root, ArcanistLinter $linter) {
+  /**
+   * Executes all tests from the specified subdirectory. If a linter is not
+   * explicitly specified, it will be inferred from the name of the test class.
+   */
+  public function executeTestsInDirectory(
+    $root,
+    ArcanistLinter $linter = null) {
+
+    if (!$linter) {
+      // Infer the linter from the class name. This is a little magical, but
+      // reduces the amount of boiler plate code.
+      $count = 0;
+      $linter_name = preg_replace(
+        '/^(\w+Linter)TestCase$/',
+        '$1',
+        get_class($this),
+        1,
+        $count);
+
+      if (!$count) {
+        throw new Exception(pht('Unable to infer linter class name.'));
+      }
+
+      $linter = id(new ReflectionClass($linter_name))
+        ->newInstanceWithoutConstructor();
+    }
+
     $files = id(new FileFinder($root))
       ->withType('f')
       ->withSuffix('lint-test')

src/lint/linter/__tests__/ArcanistMergeConflictLinterTestCase.php

@@ -4,9 +4,7 @@ final class ArcanistMergeConflictLinterTestCase
   extends ArcanistArcanistLinterTestCase {
 
   public function testMergeConflictLint() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/mergeconflict/');
-      dirname(__FILE__).'/mergeconflict/',
-      new ArcanistMergeConflictLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistPEP8LinterTestCase.php

@@ -3,9 +3,7 @@
 final class ArcanistPEP8LinterTestCase extends ArcanistArcanistLinterTestCase {
 
   public function testPEP8Linter() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/pep8/');
-      dirname(__FILE__).'/pep8/',
-      new ArcanistPEP8Linter());
   }
 
 }

src/lint/linter/__tests__/ArcanistPhpLinterTestCase.php

@@ -3,9 +3,7 @@
 final class ArcanistPhpLinterTestCase extends ArcanistArcanistLinterTestCase {
 
   public function testPHPLint() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/php/');
-      dirname(__FILE__).'/php/',
-      new ArcanistPhpLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistPhpcsLinterTestCase.php

@@ -3,9 +3,7 @@
 final class ArcanistPhpcsLinterTestCase extends ArcanistArcanistLinterTestCase {
 
   public function testPHPCSLint() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/phpcs/');
-      dirname(__FILE__).'/phpcs/',
-      new ArcanistPhpcsLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistPhutilXHPASTLinterTestCase.php

@@ -9,9 +9,7 @@ final class ArcanistPhutilXHPASTLinterTestCase
       'deprecated_function' => 'This function is most likely deprecated.',
     ));
 
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/phlxhp/', $linter);
-      dirname(__FILE__).'/phlxhp/',
-      $linter);
   }
 
 }

src/lint/linter/__tests__/ArcanistPuppetLintLinterTestCase.php

@@ -4,9 +4,7 @@ final class ArcanistPuppetLintLinterTestCase
   extends ArcanistArcanistLinterTestCase {
 
   public function testPuppetLintLinter() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/puppet-lint/');
-      dirname(__FILE__).'/puppet-lint/',
-      new ArcanistPuppetLintLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistPyFlakesLinterTestCase.php

@@ -4,9 +4,7 @@ final class ArcanistPyFlakesLinterTestCase
   extends ArcanistArcanistLinterTestCase {
 
   public function testPyflakesLinter() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/pyflakes/');
-      dirname(__FILE__).'/pyflakes/',
-      new ArcanistPyFlakesLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistPyLintLinterTestCase.php

@@ -4,9 +4,7 @@ final class ArcanistPyLintLinterTestCase
   extends ArcanistArcanistLinterTestCase {
 
   public function testPyLintLinter() {
-    return $this->executeTestsInDirectory(
+    return $this->executeTestsInDirectory(dirname(__FILE__).'/pylint/');
-      dirname(__FILE__).'/pylint/',
-      new ArcanistPyLintLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistRubyLinterTestCase.php

@@ -3,9 +3,7 @@
 final class ArcanistRubyLinterTestCase extends ArcanistArcanistLinterTestCase {
 
   public function testRubyLint() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/ruby/');
-      dirname(__FILE__).'/ruby/',
-      new ArcanistRubyLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistTextLinterTestCase.php

@@ -3,9 +3,7 @@
 final class ArcanistTextLinterTestCase extends ArcanistArcanistLinterTestCase {
 
   public function testTextLint() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/text/');
-      dirname(__FILE__).'/text/',
-      new ArcanistTextLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistXHPASTLinterTestCase.php

@@ -4,9 +4,7 @@ final class ArcanistXHPASTLinterTestCase
   extends ArcanistArcanistLinterTestCase {
 
   public function testXHPASTLint() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/xhpast/');
-      dirname(__FILE__).'/xhpast/',
-      new ArcanistXHPASTLinter());
   }
 
 }

src/lint/linter/__tests__/ArcanistXMLLinterTestCase.php

@@ -7,9 +7,7 @@
 final class ArcanistXMLLinterTestCase extends ArcanistArcanistLinterTestCase {
 
   public function testXMLLint() {
-    $this->executeTestsInDirectory(
+    $this->executeTestsInDirectory(dirname(__FILE__).'/xml/');
-      dirname(__FILE__).'/xml/',
-      new ArcanistXMLLinter());
   }
 
 }