Page MenuHomePhabricator

D11662.id28100.diff
No OneTemporary

D11662.id28100.diff

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 @@
-<?php
-
-abstract class ArcanistArcanistLinterTestCase extends ArcanistLinterTestCase {
-
- protected function getLink($method) {
- // This could be converted to trait from ArcanistTestCase.
- $arcanist_project = 'PHID-APRJ-703e0b140530f17ede30';
- return
- 'https://secure.phabricator.com/diffusion/symbol/'.$method.
- '/?lang=php&projects='.$arcanist_project.
- '&jump=true&context='.get_class($this);
- }
-
-}
diff --git a/src/lint/linter/__tests__/ArcanistChmodLinterTestCase.php b/src/lint/linter/__tests__/ArcanistChmodLinterTestCase.php
--- a/src/lint/linter/__tests__/ArcanistChmodLinterTestCase.php
+++ b/src/lint/linter/__tests__/ArcanistChmodLinterTestCase.php
@@ -1,6 +1,6 @@
<?php
-final class ArcanistChmodLinterTestCase extends ArcanistArcanistLinterTestCase {
+final class ArcanistChmodLinterTestCase extends ArcanistLinterTestCase {
public function testLinter() {
$this->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 @@
<?php
-final class ArcanistCommitLinterTestCase
- extends ArcanistArcanistLinterTestCase {
+final class ArcanistCommitLinterTestCase extends ArcanistLinterTestCase {
public function testLinter() {
return $this->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 @@
<?php
-final class ArcanistFilenameLinterTestCase
- extends ArcanistArcanistLinterTestCase {
+final class ArcanistFilenameLinterTestCase extends ArcanistLinterTestCase {
public function testLinter() {
$this->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 @@
<?php
-final class ArcanistGeneratedLinterTestCase
- extends ArcanistArcanistLinterTestCase {
+final class ArcanistGeneratedLinterTestCase extends ArcanistLinterTestCase {
public function testLinter() {
return $this->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 @@
<?php
-final class ArcanistJSONLinterTestCase extends ArcanistArcanistLinterTestCase {
+final class ArcanistJSONLinterTestCase extends ArcanistLinterTestCase {
public function testLinter() {
$this->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 @@
<?php
-final class ArcanistMergeConflictLinterTestCase
- extends ArcanistArcanistLinterTestCase {
+final class ArcanistMergeConflictLinterTestCase extends ArcanistLinterTestCase {
public function testLinter() {
$this->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 @@
<?php
-final class ArcanistNoLintLinterTestCase
- extends ArcanistArcanistLinterTestCase {
+final class ArcanistNoLintLinterTestCase extends ArcanistLinterTestCase {
public function testLinter() {
return $this->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 @@
<?php
-final class ArcanistPhutilXHPASTLinterTestCase
- extends ArcanistArcanistLinterTestCase {
+final class ArcanistPhutilXHPASTLinterTestCase extends ArcanistLinterTestCase {
public function testLinter() {
$linter = new ArcanistPhutilXHPASTLinter();
diff --git a/src/lint/linter/__tests__/ArcanistSpellingLinterTestCase.php b/src/lint/linter/__tests__/ArcanistSpellingLinterTestCase.php
--- a/src/lint/linter/__tests__/ArcanistSpellingLinterTestCase.php
+++ b/src/lint/linter/__tests__/ArcanistSpellingLinterTestCase.php
@@ -1,7 +1,6 @@
<?php
-final class ArcanistSpellingLinterTestCase
- extends ArcanistArcanistLinterTestCase {
+final class ArcanistSpellingLinterTestCase extends ArcanistLinterTestCase {
public function testLinter() {
$linter = new ArcanistSpellingLinter();
diff --git a/src/lint/linter/__tests__/ArcanistTextLinterTestCase.php b/src/lint/linter/__tests__/ArcanistTextLinterTestCase.php
--- a/src/lint/linter/__tests__/ArcanistTextLinterTestCase.php
+++ b/src/lint/linter/__tests__/ArcanistTextLinterTestCase.php
@@ -1,6 +1,6 @@
<?php
-final class ArcanistTextLinterTestCase extends ArcanistArcanistLinterTestCase {
+final class ArcanistTextLinterTestCase extends ArcanistLinterTestCase {
public function testLinter() {
$this->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 @@
<?php
-final class ArcanistXHPASTLinterTestCase
- extends ArcanistArcanistLinterTestCase {
+final class ArcanistXHPASTLinterTestCase extends ArcanistLinterTestCase {
public function testLinter() {
$this->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/');

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 9, 2:24 PM (3 w, 8 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7389226
Default Alt Text
D11662.id28100.diff (13 KB)

Event Timeline