Page MenuHomePhabricator
Files F13236337

D12665.id30426.diff
No OneTemporary
Actions

D12665.id30426.diff
View Options

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
@@ -179,7 +179,6 @@
'ArcanistSummaryLintRenderer' => 'lint/renderer/ArcanistSummaryLintRenderer.php',
'ArcanistSvnHookPreCommitWorkflow' => 'workflow/ArcanistSvnHookPreCommitWorkflow.php',
'ArcanistTasksWorkflow' => 'workflow/ArcanistTasksWorkflow.php',
- 'ArcanistTestCase' => 'infrastructure/testing/ArcanistTestCase.php',
'ArcanistTestResultParser' => 'unit/parser/ArcanistTestResultParser.php',
'ArcanistTestXHPASTLintSwitchHook' => 'lint/linter/__tests__/ArcanistTestXHPASTLintSwitchHook.php',
'ArcanistTextLinter' => 'lint/linter/ArcanistTextLinter.php',
@@ -225,15 +224,15 @@
'ArcanistAmendWorkflow' => 'ArcanistWorkflow',
'ArcanistAnoidWorkflow' => 'ArcanistWorkflow',
'ArcanistBackoutWorkflow' => 'ArcanistWorkflow',
- 'ArcanistBaseCommitParserTestCase' => 'ArcanistTestCase',
+ 'ArcanistBaseCommitParserTestCase' => 'ArcanistPhutilTestCase',
'ArcanistBaseUnitTestEngine' => 'ArcanistUnitTestEngine',
'ArcanistBaseWorkflow' => 'ArcanistWorkflow',
'ArcanistBaseXHPASTLinter' => 'ArcanistFutureLinter',
'ArcanistBookmarkWorkflow' => 'ArcanistFeatureWorkflow',
'ArcanistBranchWorkflow' => 'ArcanistFeatureWorkflow',
- 'ArcanistBritishTestCase' => 'ArcanistTestCase',
+ 'ArcanistBritishTestCase' => 'ArcanistPhutilTestCase',
'ArcanistBrowseWorkflow' => 'ArcanistWorkflow',
- 'ArcanistBundleTestCase' => 'ArcanistTestCase',
+ 'ArcanistBundleTestCase' => 'ArcanistPhutilTestCase',
'ArcanistCSSLintLinter' => 'ArcanistExternalLinter',
'ArcanistCSSLintLinterTestCase' => 'ArcanistExternalLinterTestCase',
'ArcanistCSharpLinter' => 'ArcanistLinter',
@@ -248,7 +247,7 @@
'ArcanistClosureLinterTestCase' => 'ArcanistExternalLinterTestCase',
'ArcanistCoffeeLintLinter' => 'ArcanistExternalLinter',
'ArcanistCoffeeLintLinterTestCase' => 'ArcanistExternalLinterTestCase',
- 'ArcanistCommentRemoverTestCase' => 'ArcanistTestCase',
+ 'ArcanistCommentRemoverTestCase' => 'ArcanistPhutilTestCase',
'ArcanistCommitLinter' => 'ArcanistLinter',
'ArcanistCommitLinterTestCase' => 'ArcanistLinterTestCase',
'ArcanistCommitWorkflow' => 'ArcanistWorkflow',
@@ -262,8 +261,8 @@
'ArcanistCppcheckLinterTestCase' => 'ArcanistExternalLinterTestCase',
'ArcanistCpplintLinter' => 'ArcanistExternalLinter',
'ArcanistCpplintLinterTestCase' => 'ArcanistExternalLinterTestCase',
- 'ArcanistDiffParserTestCase' => 'ArcanistTestCase',
- 'ArcanistDiffUtilsTestCase' => 'ArcanistTestCase',
+ 'ArcanistDiffParserTestCase' => 'ArcanistPhutilTestCase',
+ 'ArcanistDiffUtilsTestCase' => 'ArcanistPhutilTestCase',
'ArcanistDiffWorkflow' => 'ArcanistWorkflow',
'ArcanistDifferentialCommitMessageParserException' => 'Exception',
'ArcanistDifferentialDependencyGraph' => 'AbstractDirectedGraph',
@@ -287,7 +286,7 @@
'ArcanistGoLintLinter' => 'ArcanistExternalLinter',
'ArcanistGoLintLinterTestCase' => 'ArcanistExternalLinterTestCase',
'ArcanistGoTestResultParser' => 'ArcanistTestResultParser',
- 'ArcanistGoTestResultParserTestCase' => 'ArcanistTestCase',
+ 'ArcanistGoTestResultParserTestCase' => 'ArcanistPhutilTestCase',
'ArcanistHLintLinter' => 'ArcanistExternalLinter',
'ArcanistHLintLinterTestCase' => 'ArcanistExternalLinterTestCase',
'ArcanistHelpWorkflow' => 'ArcanistWorkflow',
@@ -313,7 +312,7 @@
'ArcanistLintersWorkflow' => 'ArcanistWorkflow',
'ArcanistListWorkflow' => 'ArcanistWorkflow',
'ArcanistMercurialAPI' => 'ArcanistRepositoryAPI',
- 'ArcanistMercurialParserTestCase' => 'ArcanistTestCase',
+ 'ArcanistMercurialParserTestCase' => 'ArcanistPhutilTestCase',
'ArcanistMergeConflictLinter' => 'ArcanistLinter',
'ArcanistMergeConflictLinterTestCase' => 'ArcanistLinterTestCase',
'ArcanistMissingLinterException' => 'Exception',
@@ -344,8 +343,8 @@
'ArcanistPyFlakesLinterTestCase' => 'ArcanistExternalLinterTestCase',
'ArcanistPyLintLinter' => 'ArcanistLinter',
'ArcanistPyLintLinterTestCase' => 'ArcanistExternalLinterTestCase',
- 'ArcanistRepositoryAPIMiscTestCase' => 'ArcanistTestCase',
- 'ArcanistRepositoryAPIStateTestCase' => 'ArcanistTestCase',
+ 'ArcanistRepositoryAPIMiscTestCase' => 'ArcanistPhutilTestCase',
+ 'ArcanistRepositoryAPIStateTestCase' => 'ArcanistPhutilTestCase',
'ArcanistRevertWorkflow' => 'ArcanistWorkflow',
'ArcanistRuboCopLinter' => 'ArcanistExternalLinter',
'ArcanistRuboCopLinterTestCase' => 'ArcanistExternalLinterTestCase',
@@ -364,7 +363,6 @@
'ArcanistSummaryLintRenderer' => 'ArcanistLintRenderer',
'ArcanistSvnHookPreCommitWorkflow' => 'ArcanistWorkflow',
'ArcanistTasksWorkflow' => 'ArcanistWorkflow',
- 'ArcanistTestCase' => 'ArcanistPhutilTestCase',
'ArcanistTestXHPASTLintSwitchHook' => 'ArcanistXHPASTLintSwitchHook',
'ArcanistTextLinter' => 'ArcanistLinter',
'ArcanistTextLinterTestCase' => 'ArcanistLinterTestCase',
@@ -381,7 +379,7 @@
'ArcanistVersionWorkflow' => 'ArcanistWorkflow',
'ArcanistWhichWorkflow' => 'ArcanistWorkflow',
'ArcanistWorkflow' => 'Phobject',
- 'ArcanistXHPASTLintNamingHookTestCase' => 'ArcanistTestCase',
+ 'ArcanistXHPASTLintNamingHookTestCase' => 'ArcanistPhutilTestCase',
'ArcanistXHPASTLinter' => 'ArcanistBaseXHPASTLinter',
'ArcanistXHPASTLinterTestCase' => 'ArcanistLinterTestCase',
'ArcanistXMLLinter' => 'ArcanistLinter',
@@ -389,11 +387,11 @@
'CSharpToolsTestEngine' => 'XUnitTestEngine',
'NoseTestEngine' => 'ArcanistUnitTestEngine',
'PhpunitTestEngine' => 'ArcanistUnitTestEngine',
- 'PhpunitTestEngineTestCase' => 'ArcanistTestCase',
+ 'PhpunitTestEngineTestCase' => 'ArcanistPhutilTestCase',
'PhutilUnitTestEngine' => 'ArcanistUnitTestEngine',
- 'PhutilUnitTestEngineTestCase' => 'ArcanistTestCase',
+ 'PhutilUnitTestEngineTestCase' => 'ArcanistPhutilTestCase',
'PytestTestEngine' => 'ArcanistUnitTestEngine',
'XUnitTestEngine' => 'ArcanistUnitTestEngine',
- 'XUnitTestResultParserTestCase' => 'ArcanistTestCase',
+ 'XUnitTestResultParserTestCase' => 'ArcanistPhutilTestCase',
),
));
diff --git a/src/configuration/__tests__/ArcanistBritishTestCase.php b/src/configuration/__tests__/ArcanistBritishTestCase.php
--- a/src/configuration/__tests__/ArcanistBritishTestCase.php
+++ b/src/configuration/__tests__/ArcanistBritishTestCase.php
@@ -1,6 +1,6 @@
<?php
-final class ArcanistBritishTestCase extends ArcanistTestCase {
+final class ArcanistBritishTestCase extends ArcanistPhutilTestCase {
public function testCommandCompletion() {
$this->assertCommandCompletion(
diff --git a/src/difference/__tests__/ArcanistDiffUtilsTestCase.php b/src/difference/__tests__/ArcanistDiffUtilsTestCase.php
--- a/src/difference/__tests__/ArcanistDiffUtilsTestCase.php
+++ b/src/difference/__tests__/ArcanistDiffUtilsTestCase.php
@@ -3,7 +3,7 @@
/**
* Test cases for @{class:ArcanistDiffUtils}.
*/
-final class ArcanistDiffUtilsTestCase extends ArcanistTestCase {
+final class ArcanistDiffUtilsTestCase extends ArcanistPhutilTestCase {
public function testLevenshtein() {
$tests = array(
diff --git a/src/infrastructure/testing/ArcanistTestCase.php b/src/infrastructure/testing/ArcanistTestCase.php
deleted file mode 100644
--- a/src/infrastructure/testing/ArcanistTestCase.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-abstract class ArcanistTestCase extends ArcanistPhutilTestCase {}
diff --git a/src/lint/linter/xhpast/__tests__/ArcanistXHPASTLintNamingHookTestCase.php b/src/lint/linter/xhpast/__tests__/ArcanistXHPASTLintNamingHookTestCase.php
--- a/src/lint/linter/xhpast/__tests__/ArcanistXHPASTLintNamingHookTestCase.php
+++ b/src/lint/linter/xhpast/__tests__/ArcanistXHPASTLintNamingHookTestCase.php
@@ -3,7 +3,8 @@
/**
* Test cases for @{class:ArcanistXHPASTLintNamingHook}.
*/
-final class ArcanistXHPASTLintNamingHookTestCase extends ArcanistTestCase {
+final class ArcanistXHPASTLintNamingHookTestCase
+ extends ArcanistPhutilTestCase {
public function testCaseUtilities() {
$tests = array(
diff --git a/src/parser/__tests__/ArcanistBaseCommitParserTestCase.php b/src/parser/__tests__/ArcanistBaseCommitParserTestCase.php
--- a/src/parser/__tests__/ArcanistBaseCommitParserTestCase.php
+++ b/src/parser/__tests__/ArcanistBaseCommitParserTestCase.php
@@ -1,6 +1,6 @@
<?php
-final class ArcanistBaseCommitParserTestCase extends ArcanistTestCase {
+final class ArcanistBaseCommitParserTestCase extends ArcanistPhutilTestCase {
public function testBasics() {
// Verify that the very basics of base commit resolution work.
diff --git a/src/parser/__tests__/ArcanistBundleTestCase.php b/src/parser/__tests__/ArcanistBundleTestCase.php
--- a/src/parser/__tests__/ArcanistBundleTestCase.php
+++ b/src/parser/__tests__/ArcanistBundleTestCase.php
@@ -1,6 +1,6 @@
<?php
-final class ArcanistBundleTestCase extends ArcanistTestCase {
+final class ArcanistBundleTestCase extends ArcanistPhutilTestCase {
private function loadResource($name) {
return Filesystem::readFile($this->getResourcePath($name));
diff --git a/src/parser/__tests__/ArcanistCommentRemoverTestCase.php b/src/parser/__tests__/ArcanistCommentRemoverTestCase.php
--- a/src/parser/__tests__/ArcanistCommentRemoverTestCase.php
+++ b/src/parser/__tests__/ArcanistCommentRemoverTestCase.php
@@ -1,6 +1,6 @@
<?php
-final class ArcanistCommentRemoverTestCase extends ArcanistTestCase {
+final class ArcanistCommentRemoverTestCase extends ArcanistPhutilTestCase {
public function testRemover() {
$test = <<<EOTEXT
diff --git a/src/parser/__tests__/ArcanistDiffParserTestCase.php b/src/parser/__tests__/ArcanistDiffParserTestCase.php
--- a/src/parser/__tests__/ArcanistDiffParserTestCase.php
+++ b/src/parser/__tests__/ArcanistDiffParserTestCase.php
@@ -3,7 +3,7 @@
/**
* Test cases for @{class:ArcanistDiffParser}.
*/
-final class ArcanistDiffParserTestCase extends ArcanistTestCase {
+final class ArcanistDiffParserTestCase extends ArcanistPhutilTestCase {
public function testParser() {
$root = dirname(__FILE__).'/diff/';
diff --git a/src/repository/api/__tests__/ArcanistRepositoryAPIMiscTestCase.php b/src/repository/api/__tests__/ArcanistRepositoryAPIMiscTestCase.php
--- a/src/repository/api/__tests__/ArcanistRepositoryAPIMiscTestCase.php
+++ b/src/repository/api/__tests__/ArcanistRepositoryAPIMiscTestCase.php
@@ -1,6 +1,6 @@
<?php
-final class ArcanistRepositoryAPIMiscTestCase extends ArcanistTestCase {
+final class ArcanistRepositoryAPIMiscTestCase extends ArcanistPhutilTestCase {
public function testSVNFileEscapes() {
$input = array(
diff --git a/src/repository/api/__tests__/ArcanistRepositoryAPIStateTestCase.php b/src/repository/api/__tests__/ArcanistRepositoryAPIStateTestCase.php
--- a/src/repository/api/__tests__/ArcanistRepositoryAPIStateTestCase.php
+++ b/src/repository/api/__tests__/ArcanistRepositoryAPIStateTestCase.php
@@ -1,6 +1,6 @@
<?php
-final class ArcanistRepositoryAPIStateTestCase extends ArcanistTestCase {
+final class ArcanistRepositoryAPIStateTestCase extends ArcanistPhutilTestCase {
public function testGitStateParsing() {
if (Filesystem::binaryExists('git')) {
diff --git a/src/repository/parser/__tests__/ArcanistMercurialParserTestCase.php b/src/repository/parser/__tests__/ArcanistMercurialParserTestCase.php
--- a/src/repository/parser/__tests__/ArcanistMercurialParserTestCase.php
+++ b/src/repository/parser/__tests__/ArcanistMercurialParserTestCase.php
@@ -1,6 +1,6 @@
<?php
-final class ArcanistMercurialParserTestCase extends ArcanistTestCase {
+final class ArcanistMercurialParserTestCase extends ArcanistPhutilTestCase {
public function testParseAll() {
$root = dirname(__FILE__).'/mercurial/';
diff --git a/src/unit/engine/PhutilUnitTestEngine.php b/src/unit/engine/PhutilUnitTestEngine.php
--- a/src/unit/engine/PhutilUnitTestEngine.php
+++ b/src/unit/engine/PhutilUnitTestEngine.php
@@ -154,7 +154,7 @@
}
}
- // Look for any class that extends PhutilTestCase inside a
+ // Look for any class that extends ArcanistPhutilTestCase inside a
// __tests__ directory in any parent directory of every affected file.
//
// The idea is that "infrastructure/__tests__/" tests defines general tests
diff --git a/src/unit/engine/__tests__/PhpunitTestEngineTestCase.php b/src/unit/engine/__tests__/PhpunitTestEngineTestCase.php
--- a/src/unit/engine/__tests__/PhpunitTestEngineTestCase.php
+++ b/src/unit/engine/__tests__/PhpunitTestEngineTestCase.php
@@ -3,7 +3,7 @@
/**
* Tests for @{class:PhpunitTestEngine}.
*/
-final class PhpunitTestEngineTestCase extends ArcanistTestCase {
+final class PhpunitTestEngineTestCase extends ArcanistPhutilTestCase {
public function testSearchLocations() {
$path = '/path/to/some/file/X.php';
diff --git a/src/unit/engine/__tests__/PhutilUnitTestEngineTestCase.php b/src/unit/engine/__tests__/PhutilUnitTestEngineTestCase.php
--- a/src/unit/engine/__tests__/PhutilUnitTestEngineTestCase.php
+++ b/src/unit/engine/__tests__/PhutilUnitTestEngineTestCase.php
@@ -3,7 +3,7 @@
/**
* Very meta test for @{class:PhutilUnitTestEngine}.
*/
-final class PhutilUnitTestEngineTestCase extends ArcanistTestCase {
+final class PhutilUnitTestEngineTestCase extends ArcanistPhutilTestCase {
private static $allTestsCounter = 0;
private static $oneTestCounter = 0;
diff --git a/src/unit/parser/__tests__/ArcanistGoTestResultParserTestCase.php b/src/unit/parser/__tests__/ArcanistGoTestResultParserTestCase.php
--- a/src/unit/parser/__tests__/ArcanistGoTestResultParserTestCase.php
+++ b/src/unit/parser/__tests__/ArcanistGoTestResultParserTestCase.php
@@ -3,7 +3,7 @@
/**
* Test for @{class:ArcanistGoTestResultParser}.
*/
-final class ArcanistGoTestResultParserTestCase extends ArcanistTestCase {
+final class ArcanistGoTestResultParserTestCase extends ArcanistPhutilTestCase {
public function testSingleTestCaseSuccessful() {
$stubbed_results = Filesystem::readFile(
diff --git a/src/unit/parser/__tests__/XUnitTestResultParserTestCase.php b/src/unit/parser/__tests__/XUnitTestResultParserTestCase.php
--- a/src/unit/parser/__tests__/XUnitTestResultParserTestCase.php
+++ b/src/unit/parser/__tests__/XUnitTestResultParserTestCase.php
@@ -3,7 +3,7 @@
/**
* Test for @{class:ArcanistXUnitTestResultParser}.
*/
-final class XUnitTestResultParserTestCase extends ArcanistTestCase {
+final class XUnitTestResultParserTestCase extends ArcanistPhutilTestCase {
public function testAcceptsNoTestsInput() {
$stubbed_results = Filesystem::readFile(

File Metadata

Mime Type
text/plain
Expires
Wed, May 22, 9:15 AM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6292254
Default Alt Text
D12665.id30426.diff (14 KB)

Event Timeline

Phabricator · Built by Phacility