revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-22 06:42:41 +01:00
Code Issues Releases Wiki Activity

Improve test discovery with PhutilUnitTestEngine

Browse source 
Summary:
Ref T8042. Tests were not being discovered in two different scenarios:

  # Files modified at the same level as the library root directory.
  # "Normal" directories like `src/unit/engine`.

This regression was caused by D12689.

Test Plan: Added unit tests.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin, epriestley

Maniphest Tasks: T8042

Differential Revision: https://secure.phabricator.com/D13126
This commit is contained in:
Joshua Spence 2015-06-03 21:07:17 +10:00
parent 4754a3e156
commit 8c589f1f75
2 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/unit/engine/PhutilUnitTestEngine.php
View file

@ -197,12 +197,20 @@ final class PhutilUnitTestEngine extends ArcanistUnitTestEngine {
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;

31
src/unit/engine/__tests__/PhutilUnitTestEngineTestCase.php
View file

@ -122,29 +122,47 @@ final class PhutilUnitTestEngineTestCase extends PhutilTestCase {
public function testGetTestPaths() {
$tests = array(
array(
'empty' => array(
array(),
array(),
),
array(
'test file' => array(
array(__FILE__),
array(__FILE__),
),
'test directory' => array(
array(
array(dirname(__FILE__)),
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 @@ final class PhutilUnitTestEngineTestCase extends PhutilTestCase {
}
$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));
}
}