Page MenuHomePhabricator
Files F13188815

D11231.diff
No OneTemporary
Actions

D11231.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
@@ -182,7 +182,6 @@
'PhutilIPAddress' => 'ip/PhutilIPAddress.php',
'PhutilIPAddressTestCase' => 'ip/__tests__/PhutilIPAddressTestCase.php',
'PhutilInRequestKeyValueCache' => 'cache/PhutilInRequestKeyValueCache.php',
- 'PhutilInfrastructureTestCase' => '__tests__/PhutilInfrastructureTestCase.php',
'PhutilInteractiveEditor' => 'console/PhutilInteractiveEditor.php',
'PhutilInvalidRuleParserGeneratorException' => 'parser/generator/exception/PhutilInvalidRuleParserGeneratorException.php',
'PhutilInvisibleSyntaxHighlighter' => 'markup/syntax/highlighter/PhutilInvisibleSyntaxHighlighter.php',
@@ -209,6 +208,7 @@
'PhutilLexerSyntaxHighlighter' => 'markup/syntax/highlighter/PhutilLexerSyntaxHighlighter.php',
'PhutilLibraryConflictException' => 'moduleutils/PhutilLibraryConflictException.php',
'PhutilLibraryMapBuilder' => 'moduleutils/PhutilLibraryMapBuilder.php',
+ 'PhutilLibraryTestCase' => '__tests__/PhutilLibraryTestCase.php',
'PhutilLipsumContextFreeGrammar' => 'grammar/PhutilLipsumContextFreeGrammar.php',
'PhutilLock' => 'filesystem/PhutilLock.php',
'PhutilLockException' => 'filesystem/PhutilLockException.php',
@@ -605,7 +605,6 @@
'PhutilIPAddress' => 'Phobject',
'PhutilIPAddressTestCase' => 'PhutilTestCase',
'PhutilInRequestKeyValueCache' => 'PhutilKeyValueCache',
- 'PhutilInfrastructureTestCase' => 'PhutilTestCase',
'PhutilInvalidRuleParserGeneratorException' => 'PhutilParserGeneratorException',
'PhutilIrreducibleRuleParserGeneratorException' => 'PhutilParserGeneratorException',
'PhutilJIRAAuthAdapter' => 'PhutilOAuth1AuthAdapter',
@@ -624,6 +623,7 @@
'PhutilLanguageGuesserTestCase' => 'PhutilTestCase',
'PhutilLexerSyntaxHighlighter' => 'PhutilSyntaxHighlighter',
'PhutilLibraryConflictException' => 'Exception',
+ 'PhutilLibraryTestCase' => 'PhutilTestCase',
'PhutilLipsumContextFreeGrammar' => 'PhutilContextFreeGrammar',
'PhutilLockException' => 'Exception',
'PhutilLogFileChannel' => 'PhutilChannelChannel',
diff --git a/src/__tests__/PhutilInfrastructureTestCase.php b/src/__tests__/PhutilLibraryTestCase.php
rename from src/__tests__/PhutilInfrastructureTestCase.php
rename to src/__tests__/PhutilLibraryTestCase.php
--- a/src/__tests__/PhutilInfrastructureTestCase.php
+++ b/src/__tests__/PhutilLibraryTestCase.php
@@ -1,6 +1,9 @@
<?php
-final class PhutilInfrastructureTestCase extends PhutilTestCase {
+/**
+ * @concrete-extensible
+ */
+class PhutilLibraryTestCase extends PhutilTestCase {
/**
* This is more of an acceptance test case instead of a unit test. It verifies
@@ -17,8 +20,8 @@
* that all the library map is up-to-date.
*/
public function testLibraryMap() {
- $library = phutil_get_current_library_name();
- $root = phutil_get_library_root($library);
+ $root = $this->getLibraryRoot();
+ $library = phutil_get_library_name_for_root($root);
$new_library_map = id(new PhutilLibraryMapBuilder($root))
->buildMap();
@@ -30,8 +33,18 @@
$this->assertEqual(
$new_library_map,
$old_library_map,
- 'The library map does not appear to be up-to-date. Try '.
- 'rebuilding the map with `arc liberate`.');
+ pht(
+ 'The library map does not appear to be up-to-date. Try '.
+ 'rebuilding the map with `%s`.',
+ 'arc liberate'));
+ }
+
+ /**
+ * Get the root directory for the library currently being tested.
+ */
+ protected function getLibraryRoot() {
+ $caller = id(new ReflectionClass($this))->getFileName();
+ return phutil_get_library_root_for_path($caller);
}
}

File Metadata

Mime Type
text/plain
Expires
Sun, May 12, 5:31 AM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6267430
Default Alt Text
D11231.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility