diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -12,7 +12,6 @@ 'ArcanistAliasWorkflow' => 'workflow/ArcanistAliasWorkflow.php', 'ArcanistAmendWorkflow' => 'workflow/ArcanistAmendWorkflow.php', 'ArcanistAnoidWorkflow' => 'workflow/ArcanistAnoidWorkflow.php', - 'ArcanistArcanistLinterTestCase' => 'lint/linter/__tests__/ArcanistArcanistLinterTestCase.php', 'ArcanistBackoutWorkflow' => 'workflow/ArcanistBackoutWorkflow.php', 'ArcanistBaseCommitParser' => 'parser/ArcanistBaseCommitParser.php', 'ArcanistBaseCommitParserTestCase' => 'parser/__tests__/ArcanistBaseCommitParserTestCase.php', @@ -223,7 +222,6 @@ 'ArcanistAliasWorkflow' => 'ArcanistWorkflow', 'ArcanistAmendWorkflow' => 'ArcanistWorkflow', 'ArcanistAnoidWorkflow' => 'ArcanistWorkflow', - 'ArcanistArcanistLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistBackoutWorkflow' => 'ArcanistWorkflow', 'ArcanistBaseCommitParserTestCase' => 'ArcanistTestCase', 'ArcanistBaseUnitTestEngine' => 'ArcanistUnitTestEngine', @@ -241,7 +239,7 @@ 'ArcanistCapabilityNotSupportedException' => 'Exception', 'ArcanistCheckstyleXMLLintRenderer' => 'ArcanistLintRenderer', 'ArcanistChmodLinter' => 'ArcanistLinter', - 'ArcanistChmodLinterTestCase' => 'ArcanistArcanistLinterTestCase', + 'ArcanistChmodLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistCloseRevisionWorkflow' => 'ArcanistWorkflow', 'ArcanistCloseWorkflow' => 'ArcanistWorkflow', 'ArcanistClosureLinter' => 'ArcanistExternalLinter', @@ -250,7 +248,7 @@ 'ArcanistCoffeeLintLinterTestCase' => 'ArcanistExternalLinterTestCase', 'ArcanistCommentRemoverTestCase' => 'ArcanistTestCase', 'ArcanistCommitLinter' => 'ArcanistLinter', - 'ArcanistCommitLinterTestCase' => 'ArcanistArcanistLinterTestCase', + 'ArcanistCommitLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistCommitWorkflow' => 'ArcanistWorkflow', 'ArcanistCompilerLikeLintRenderer' => 'ArcanistLintRenderer', 'ArcanistConduitLinter' => 'ArcanistLinter', @@ -273,13 +271,13 @@ 'ArcanistExternalLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistFeatureWorkflow' => 'ArcanistWorkflow', 'ArcanistFilenameLinter' => 'ArcanistLinter', - 'ArcanistFilenameLinterTestCase' => 'ArcanistArcanistLinterTestCase', + 'ArcanistFilenameLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistFlagWorkflow' => 'ArcanistWorkflow', 'ArcanistFlake8Linter' => 'ArcanistExternalLinter', 'ArcanistFlake8LinterTestCase' => 'ArcanistExternalLinterTestCase', 'ArcanistFutureLinter' => 'ArcanistLinter', 'ArcanistGeneratedLinter' => 'ArcanistLinter', - 'ArcanistGeneratedLinterTestCase' => 'ArcanistArcanistLinterTestCase', + 'ArcanistGeneratedLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistGetConfigWorkflow' => 'ArcanistWorkflow', 'ArcanistGitAPI' => 'ArcanistRepositoryAPI', 'ArcanistGitHookPreReceiveWorkflow' => 'ArcanistWorkflow', @@ -299,7 +297,7 @@ 'ArcanistJSONLintLinterTestCase' => 'ArcanistExternalLinterTestCase', 'ArcanistJSONLintRenderer' => 'ArcanistLintRenderer', 'ArcanistJSONLinter' => 'ArcanistLinter', - 'ArcanistJSONLinterTestCase' => 'ArcanistArcanistLinterTestCase', + 'ArcanistJSONLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistJscsLinter' => 'ArcanistExternalLinter', 'ArcanistJscsLinterTestCase' => 'ArcanistExternalLinterTestCase', 'ArcanistLandWorkflow' => 'ArcanistWorkflow', @@ -314,12 +312,12 @@ 'ArcanistMercurialAPI' => 'ArcanistRepositoryAPI', 'ArcanistMercurialParserTestCase' => 'ArcanistTestCase', 'ArcanistMergeConflictLinter' => 'ArcanistLinter', - 'ArcanistMergeConflictLinterTestCase' => 'ArcanistArcanistLinterTestCase', + 'ArcanistMergeConflictLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistMissingLinterException' => 'Exception', 'ArcanistNoEffectException' => 'ArcanistUsageException', 'ArcanistNoEngineException' => 'ArcanistUsageException', 'ArcanistNoLintLinter' => 'ArcanistLinter', - 'ArcanistNoLintLinterTestCase' => 'ArcanistArcanistLinterTestCase', + 'ArcanistNoLintLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistNoneLintRenderer' => 'ArcanistLintRenderer', 'ArcanistPEP8Linter' => 'ArcanistExternalLinter', 'ArcanistPEP8LinterTestCase' => 'ArcanistExternalLinterTestCase', @@ -336,7 +334,7 @@ 'ArcanistPhutilTestSkippedException' => 'Exception', 'ArcanistPhutilTestTerminatedException' => 'Exception', 'ArcanistPhutilXHPASTLinter' => 'ArcanistBaseXHPASTLinter', - 'ArcanistPhutilXHPASTLinterTestCase' => 'ArcanistArcanistLinterTestCase', + 'ArcanistPhutilXHPASTLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistPuppetLintLinter' => 'ArcanistExternalLinter', 'ArcanistPuppetLintLinterTestCase' => 'ArcanistExternalLinterTestCase', 'ArcanistPyFlakesLinter' => 'ArcanistExternalLinter', @@ -353,7 +351,7 @@ 'ArcanistShellCompleteWorkflow' => 'ArcanistWorkflow', 'ArcanistSingleLintEngine' => 'ArcanistLintEngine', 'ArcanistSpellingLinter' => 'ArcanistLinter', - 'ArcanistSpellingLinterTestCase' => 'ArcanistArcanistLinterTestCase', + 'ArcanistSpellingLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistStartWorkflow' => 'ArcanistPhrequentWorkflow', 'ArcanistStopWorkflow' => 'ArcanistPhrequentWorkflow', 'ArcanistSubversionAPI' => 'ArcanistRepositoryAPI', @@ -363,7 +361,7 @@ 'ArcanistTasksWorkflow' => 'ArcanistWorkflow', 'ArcanistTestCase' => 'ArcanistPhutilTestCase', 'ArcanistTextLinter' => 'ArcanistLinter', - 'ArcanistTextLinterTestCase' => 'ArcanistArcanistLinterTestCase', + 'ArcanistTextLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistTimeWorkflow' => 'ArcanistPhrequentWorkflow', 'ArcanistTodoWorkflow' => 'ArcanistWorkflow', 'ArcanistUncommittedChangesException' => 'ArcanistUsageException', @@ -380,9 +378,9 @@ 'ArcanistXHPASTLintNamingHookTestCase' => 'ArcanistTestCase', 'ArcanistXHPASTLintTestSwitchHook' => 'ArcanistXHPASTLintSwitchHook', 'ArcanistXHPASTLinter' => 'ArcanistBaseXHPASTLinter', - 'ArcanistXHPASTLinterTestCase' => 'ArcanistArcanistLinterTestCase', + 'ArcanistXHPASTLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistXMLLinter' => 'ArcanistLinter', - 'ArcanistXMLLinterTestCase' => 'ArcanistArcanistLinterTestCase', + 'ArcanistXMLLinterTestCase' => 'ArcanistLinterTestCase', 'CSharpToolsTestEngine' => 'XUnitTestEngine', 'ComprehensiveLintEngine' => 'ArcanistLintEngine', 'NoseTestEngine' => 'ArcanistUnitTestEngine', diff --git a/src/lint/linter/__tests__/ArcanistArcanistLinterTestCase.php b/src/lint/linter/__tests__/ArcanistArcanistLinterTestCase.php deleted file mode 100644 --- a/src/lint/linter/__tests__/ArcanistArcanistLinterTestCase.php +++ /dev/null @@ -1,14 +0,0 @@ -executeTestsInDirectory(dirname(__FILE__).'/chmod/'); diff --git a/src/lint/linter/__tests__/ArcanistCommitLinterTestCase.php b/src/lint/linter/__tests__/ArcanistCommitLinterTestCase.php --- a/src/lint/linter/__tests__/ArcanistCommitLinterTestCase.php +++ b/src/lint/linter/__tests__/ArcanistCommitLinterTestCase.php @@ -1,7 +1,6 @@ executeTestsInDirectory(dirname(__FILE__).'/commit/'); diff --git a/src/lint/linter/__tests__/ArcanistFilenameLinterTestCase.php b/src/lint/linter/__tests__/ArcanistFilenameLinterTestCase.php --- a/src/lint/linter/__tests__/ArcanistFilenameLinterTestCase.php +++ b/src/lint/linter/__tests__/ArcanistFilenameLinterTestCase.php @@ -1,7 +1,6 @@ executeTestsInDirectory(dirname(__FILE__).'/filename/'); diff --git a/src/lint/linter/__tests__/ArcanistGeneratedLinterTestCase.php b/src/lint/linter/__tests__/ArcanistGeneratedLinterTestCase.php --- a/src/lint/linter/__tests__/ArcanistGeneratedLinterTestCase.php +++ b/src/lint/linter/__tests__/ArcanistGeneratedLinterTestCase.php @@ -1,7 +1,6 @@ executeTestsInDirectory(dirname(__FILE__).'/generated/'); diff --git a/src/lint/linter/__tests__/ArcanistJSONLinterTestCase.php b/src/lint/linter/__tests__/ArcanistJSONLinterTestCase.php --- a/src/lint/linter/__tests__/ArcanistJSONLinterTestCase.php +++ b/src/lint/linter/__tests__/ArcanistJSONLinterTestCase.php @@ -1,6 +1,6 @@ executeTestsInDirectory(dirname(__FILE__).'/jsonlint/'); diff --git a/src/lint/linter/__tests__/ArcanistMergeConflictLinterTestCase.php b/src/lint/linter/__tests__/ArcanistMergeConflictLinterTestCase.php --- a/src/lint/linter/__tests__/ArcanistMergeConflictLinterTestCase.php +++ b/src/lint/linter/__tests__/ArcanistMergeConflictLinterTestCase.php @@ -1,7 +1,6 @@ executeTestsInDirectory(dirname(__FILE__).'/mergeconflict/'); diff --git a/src/lint/linter/__tests__/ArcanistNoLintLinterTestCase.php b/src/lint/linter/__tests__/ArcanistNoLintLinterTestCase.php --- a/src/lint/linter/__tests__/ArcanistNoLintLinterTestCase.php +++ b/src/lint/linter/__tests__/ArcanistNoLintLinterTestCase.php @@ -1,7 +1,6 @@ executeTestsInDirectory(dirname(__FILE__).'/nolint/'); diff --git a/src/lint/linter/__tests__/ArcanistPhutilXHPASTLinterTestCase.php b/src/lint/linter/__tests__/ArcanistPhutilXHPASTLinterTestCase.php --- a/src/lint/linter/__tests__/ArcanistPhutilXHPASTLinterTestCase.php +++ b/src/lint/linter/__tests__/ArcanistPhutilXHPASTLinterTestCase.php @@ -1,7 +1,6 @@ executeTestsInDirectory(dirname(__FILE__).'/text/'); diff --git a/src/lint/linter/__tests__/ArcanistXHPASTLinterTestCase.php b/src/lint/linter/__tests__/ArcanistXHPASTLinterTestCase.php --- a/src/lint/linter/__tests__/ArcanistXHPASTLinterTestCase.php +++ b/src/lint/linter/__tests__/ArcanistXHPASTLinterTestCase.php @@ -1,7 +1,6 @@ executeTestsInDirectory(dirname(__FILE__).'/xhpast/'); diff --git a/src/lint/linter/__tests__/ArcanistXMLLinterTestCase.php b/src/lint/linter/__tests__/ArcanistXMLLinterTestCase.php --- a/src/lint/linter/__tests__/ArcanistXMLLinterTestCase.php +++ b/src/lint/linter/__tests__/ArcanistXMLLinterTestCase.php @@ -4,7 +4,7 @@ * Test cases were mostly taken from * https://git.gnome.org/browse/libxml2/tree/test. */ -final class ArcanistXMLLinterTestCase extends ArcanistArcanistLinterTestCase { +final class ArcanistXMLLinterTestCase extends ArcanistLinterTestCase { public function testLinter() { $this->executeTestsInDirectory(dirname(__FILE__).'/xml/');