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
2024-11-25 08:12:40 +01:00 · 2015-01-04 18:38:32 +11:00 · 2015-01-04 18:38:32 +11:00 · f5db41917b
commit f5db41917b
parent a10002adec
27 changed files with 55 additions and 79 deletions
--- a/src/lint/linter/tests/ArcanistCSSLintLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistCSSLintLinterTestCase.php
@ -4,9 +4,7 @@ final class ArcanistCSSLintLinterTestCase
  extends ArcanistArcanistLinterTestCase {

  public function testCSSLintLinter() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/csslint/',
-      new ArcanistCSSLintLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/csslint/');
  }

 }
--- a/src/lint/linter/tests/ArcanistClosureLinterTestCase.php
+++ b/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(
-      dirname(__FILE__).'/gjslint/',
-      $linter);
+    $this->executeTestsInDirectory(dirname(__FILE__).'/gjslint/', $linter);
  }

 }
--- a/src/lint/linter/tests/ArcanistCoffeeLintLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistCoffeeLintLinterTestCase.php
@ -4,9 +4,7 @@ final class ArcanistCoffeeLintLinterTestCase
  extends ArcanistArcanistLinterTestCase {

  public function testCoffeeLintLinter() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/coffeelint/',
-      new ArcanistCoffeeLintLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/coffeelint/');
  }

 }
--- a/src/lint/linter/tests/ArcanistCommitLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistCommitLinterTestCase.php
@ -4,9 +4,7 @@ final class ArcanistCommitLinterTestCase
  extends ArcanistArcanistLinterTestCase {

  public function testCommitLint() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/commit/',
-      new ArcanistCommitLinter());
+    return $this->executeTestsInDirectory(dirname(__FILE__).'/commit/');
  }

 }
--- a/src/lint/linter/tests/ArcanistCppcheckLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistCppcheckLinterTestCase.php
@ -4,9 +4,7 @@ final class ArcanistCppcheckLinterTestCase
  extends ArcanistArcanistLinterTestCase {

  public function testCppcheckLint() {
-    return $this->executeTestsInDirectory(
-      dirname(__FILE__).'/cppcheck/',
-      new ArcanistCppcheckLinter());
+    return $this->executeTestsInDirectory(dirname(__FILE__).'/cppcheck/');
  }

 }
--- a/src/lint/linter/tests/ArcanistCpplintLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistCpplintLinterTestCase.php
@ -4,9 +4,7 @@ final class ArcanistCpplintLinterTestCase
  extends ArcanistArcanistLinterTestCase {

  public function testCpplintLint() {
-    return $this->executeTestsInDirectory(
-      dirname(__FILE__).'/cpplint/',
-      new ArcanistCpplintLinter());
+    return $this->executeTestsInDirectory(dirname(__FILE__).'/cpplint/');
  }

 }
--- a/src/lint/linter/tests/ArcanistFlake8LinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistFlake8LinterTestCase.php
@ -4,9 +4,7 @@ final class ArcanistFlake8LinterTestCase
  extends ArcanistArcanistLinterTestCase {

  public function testFlake8Lint() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/flake8/',
-      new ArcanistFlake8Linter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/flake8/');
  }

 }
--- a/src/lint/linter/tests/ArcanistGoLintLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistGoLintLinterTestCase.php
@ -4,9 +4,7 @@ final class ArcanistGoLintLinterTestCase
  extends ArcanistArcanistLinterTestCase {

  public function testGoLintLinter() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/golint/',
-      new ArcanistGoLintLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/golint/');
  }

 }
--- a/src/lint/linter/tests/ArcanistHLintLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistHLintLinterTestCase.php
@ -1,9 +1,9 @@
 <?php

 final class ArcanistHLintLinterTestCase extends ArcanistArcanistLinterTestCase {
+
  public function testHlintLinter() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/hlint/',
-      new ArcanistHLintLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/hlint/');
  }
+
 }
--- a/src/lint/linter/tests/ArcanistJSHintLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistJSHintLinterTestCase.php
@ -4,9 +4,7 @@ final class ArcanistJSHintLinterTestCase
  extends ArcanistArcanistLinterTestCase {

  public function testJSHintLinter() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/jshint/',
-      new ArcanistJSHintLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/jshint/');
  }

 }
--- a/src/lint/linter/tests/ArcanistJSONLintLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistJSONLintLinterTestCase.php
@ -4,9 +4,7 @@ final class ArcanistJSONLintLinterTestCase
  extends ArcanistArcanistLinterTestCase {

  public function testJSONLintLinter() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/jsonlint/',
-      new ArcanistJSONLintLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/jsonlint/');
  }

 }
--- a/src/lint/linter/tests/ArcanistJSONLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistJSONLinterTestCase.php
@ -3,9 +3,7 @@
 final class ArcanistJSONLinterTestCase extends ArcanistArcanistLinterTestCase {

  public function testJSONLinter() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/jsonlint/',
-      new ArcanistJSONLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/jsonlint/');
  }

 }
--- a/src/lint/linter/tests/ArcanistJscsLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistJscsLinterTestCase.php
@ -3,9 +3,7 @@
 final class ArcanistJscsLinterTestCase extends ArcanistArcanistLinterTestCase {

  public function testJscsLinter() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/jscs/',
-      new ArcanistJscsLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/jscs/');
  }

 }
--- a/src/lint/linter/tests/ArcanistLesscLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistLesscLinterTestCase.php
@ -3,9 +3,7 @@
 final class ArcanistLesscLinterTestCase extends ArcanistArcanistLinterTestCase {

  public function testLesscLinter() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/lessc/',
-      new ArcanistLesscLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/lessc/');
  }

 }
--- a/src/lint/linter/tests/ArcanistLinterTestCase.php
+++ b/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')
--- a/src/lint/linter/tests/ArcanistMergeConflictLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistMergeConflictLinterTestCase.php
@ -4,9 +4,7 @@ final class ArcanistMergeConflictLinterTestCase
  extends ArcanistArcanistLinterTestCase {

  public function testMergeConflictLint() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/mergeconflict/',
-      new ArcanistMergeConflictLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/mergeconflict/');
  }

 }
--- a/src/lint/linter/tests/ArcanistPEP8LinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistPEP8LinterTestCase.php
@ -3,9 +3,7 @@
 final class ArcanistPEP8LinterTestCase extends ArcanistArcanistLinterTestCase {

  public function testPEP8Linter() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/pep8/',
-      new ArcanistPEP8Linter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/pep8/');
  }

 }
--- a/src/lint/linter/tests/ArcanistPhpLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistPhpLinterTestCase.php
@ -3,9 +3,7 @@
 final class ArcanistPhpLinterTestCase extends ArcanistArcanistLinterTestCase {

  public function testPHPLint() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/php/',
-      new ArcanistPhpLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/php/');
  }

 }
--- a/src/lint/linter/tests/ArcanistPhpcsLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistPhpcsLinterTestCase.php
@ -3,9 +3,7 @@
 final class ArcanistPhpcsLinterTestCase extends ArcanistArcanistLinterTestCase {

  public function testPHPCSLint() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/phpcs/',
-      new ArcanistPhpcsLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/phpcs/');
  }

 }
--- a/src/lint/linter/tests/ArcanistPhutilXHPASTLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistPhutilXHPASTLinterTestCase.php
@ -9,9 +9,7 @@ final class ArcanistPhutilXHPASTLinterTestCase
      'deprecated_function' => 'This function is most likely deprecated.',
    ));

-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/phlxhp/',
-      $linter);
+    $this->executeTestsInDirectory(dirname(__FILE__).'/phlxhp/', $linter);
  }

 }
--- a/src/lint/linter/tests/ArcanistPuppetLintLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistPuppetLintLinterTestCase.php
@ -4,9 +4,7 @@ final class ArcanistPuppetLintLinterTestCase
  extends ArcanistArcanistLinterTestCase {

  public function testPuppetLintLinter() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/puppet-lint/',
-      new ArcanistPuppetLintLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/puppet-lint/');
  }

 }
--- a/src/lint/linter/tests/ArcanistPyFlakesLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistPyFlakesLinterTestCase.php
@ -4,9 +4,7 @@ final class ArcanistPyFlakesLinterTestCase
  extends ArcanistArcanistLinterTestCase {

  public function testPyflakesLinter() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/pyflakes/',
-      new ArcanistPyFlakesLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/pyflakes/');
  }

 }
--- a/src/lint/linter/tests/ArcanistPyLintLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistPyLintLinterTestCase.php
@ -4,9 +4,7 @@ final class ArcanistPyLintLinterTestCase
  extends ArcanistArcanistLinterTestCase {

  public function testPyLintLinter() {
-    return $this->executeTestsInDirectory(
-      dirname(__FILE__).'/pylint/',
-      new ArcanistPyLintLinter());
+    return $this->executeTestsInDirectory(dirname(__FILE__).'/pylint/');
  }

 }
--- a/src/lint/linter/tests/ArcanistRubyLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistRubyLinterTestCase.php
@ -3,9 +3,7 @@
 final class ArcanistRubyLinterTestCase extends ArcanistArcanistLinterTestCase {

  public function testRubyLint() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/ruby/',
-      new ArcanistRubyLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/ruby/');
  }

 }
--- a/src/lint/linter/tests/ArcanistTextLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistTextLinterTestCase.php
@ -3,9 +3,7 @@
 final class ArcanistTextLinterTestCase extends ArcanistArcanistLinterTestCase {

  public function testTextLint() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/text/',
-      new ArcanistTextLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/text/');
  }

 }
--- a/src/lint/linter/tests/ArcanistXHPASTLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistXHPASTLinterTestCase.php
@ -4,9 +4,7 @@ final class ArcanistXHPASTLinterTestCase
  extends ArcanistArcanistLinterTestCase {

  public function testXHPASTLint() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/xhpast/',
-      new ArcanistXHPASTLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/xhpast/');
  }

 }
--- a/src/lint/linter/tests/ArcanistXMLLinterTestCase.php
+++ b/src/lint/linter/tests/ArcanistXMLLinterTestCase.php
@ -7,9 +7,7 @@
 final class ArcanistXMLLinterTestCase extends ArcanistArcanistLinterTestCase {

  public function testXMLLint() {
-    $this->executeTestsInDirectory(
-      dirname(__FILE__).'/xml/',
-      new ArcanistXMLLinter());
+    $this->executeTestsInDirectory(dirname(__FILE__).'/xml/');
  }

 }