Page MenuHomePhabricator
Files F15447427

D13126.diff
No OneTemporary
Actions

D13126.diff
View Options

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
@@ -197,12 +197,20 @@
continue;
}
- while (($library_path = dirname($library_path)) != '.') {
+ if ($path == $library_root) {
+ $paths[$library_name.':.'] = array(
+ 'library' => $library_name,
+ 'path' => '__tests__/',
+ );
+ continue;
+ }
+
+ do {
$paths[$library_name.':'.$library_path] = array(
'library' => $library_name,
'path' => $library_path.'/__tests__/',
);
- }
+ } while (($library_path = dirname($library_path)) != '.');
}
return $paths;
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
@@ -122,29 +122,47 @@
public function testGetTestPaths() {
$tests = array(
- array(
+ 'empty' => array(
array(),
array(),
),
- array(
+ 'test file' => array(
array(__FILE__),
array(__FILE__),
),
- array(
- array(dirname(__FILE__)),
+ 'test directory' => array(
+ array(
+ dirname(__FILE__),
+ ),
+ array(
+ // This is odd, but harmless.
+ dirname(dirname(__FILE__)).'/__tests__/__tests__/',
+
+ dirname(dirname(__FILE__)).'/__tests__/',
+ dirname(dirname(dirname(__FILE__))).'/__tests__/',
+ ),
+ ),
+ 'normal directory' => array(
+ array(
+ dirname(dirname(__FILE__)),
+ ),
array(
dirname(dirname(__FILE__)).'/__tests__/',
dirname(dirname(dirname(__FILE__))).'/__tests__/',
),
),
+ 'library root' => array(
+ array(phutil_get_library_root()),
+ array(phutil_get_library_root().'/__tests__/'),
+ ),
);
$test_engine = id(new PhutilUnitTestEngine())
->setWorkingCopy($this->getWorkingCopy());
- foreach ($tests as $test) {
+ foreach ($tests as $name => $test) {
list($paths, $tests) = $test;
$expected = array();
@@ -159,7 +177,10 @@
}
$test_engine->setPaths($paths);
- $this->assertEqual($expected, array_values($test_engine->getTestPaths()));
+ $this->assertEqual(
+ $expected,
+ array_values($test_engine->getTestPaths()),
+ pht('Test paths for: "%s"', $name));
}
}

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 28, 11:49 PM (1 w, 3 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7579957
Default Alt Text
D13126.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility