From ac71c8c9c081a742570e88770c8883f2cfa1fbad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 6 May 2019 09:10:34 +0200 Subject: [PATCH] Enhancement: Sort cases --- src/TextUI/Command.php | 24 ++++++++++++------------ src/Util/Configuration.php | 24 +++++++++++++++--------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/TextUI/Command.php b/src/TextUI/Command.php index de64025b6c9..8c895bb3fee 100644 --- a/src/TextUI/Command.php +++ b/src/TextUI/Command.php @@ -1267,16 +1267,6 @@ private function handleOrderByOption(string $value): void break; - case 'reverse': - $this->arguments['executionOrder'] = TestSuiteSorter::ORDER_REVERSED; - - break; - - case 'random': - $this->arguments['executionOrder'] = TestSuiteSorter::ORDER_RANDOMIZED; - - break; - case 'defects': $this->arguments['executionOrderDefects'] = TestSuiteSorter::ORDER_DEFECTS_FIRST; @@ -1287,13 +1277,23 @@ private function handleOrderByOption(string $value): void break; + case 'duration': + $this->arguments['executionOrder'] = TestSuiteSorter::ORDER_DURATION; + + break; + case 'no-depends': $this->arguments['resolveDependencies'] = false; break; - case 'duration': - $this->arguments['executionOrder'] = TestSuiteSorter::ORDER_DURATION; + case 'random': + $this->arguments['executionOrder'] = TestSuiteSorter::ORDER_RANDOMIZED; + + break; + + case 'reverse': + $this->arguments['executionOrder'] = TestSuiteSorter::ORDER_REVERSED; break; diff --git a/src/Util/Configuration.php b/src/Util/Configuration.php index 6b4db4faec9..3db2a5b85f1 100644 --- a/src/Util/Configuration.php +++ b/src/Util/Configuration.php @@ -834,28 +834,34 @@ public function getPHPUnitConfiguration(): array $result['resolveDependencies'] = false; break; - case 'reverse': - $result['executionOrder'] = TestSuiteSorter::ORDER_REVERSED; - - break; - case 'random': - $result['executionOrder'] = TestSuiteSorter::ORDER_RANDOMIZED; - break; case 'defects': $result['executionOrderDefects'] = TestSuiteSorter::ORDER_DEFECTS_FIRST; break; + case 'depends': $result['resolveDependencies'] = true; break; + + case 'duration': + $result['executionOrder'] = TestSuiteSorter::ORDER_DURATION; + + break; + case 'no-depends': $result['resolveDependencies'] = false; break; - case 'duration': - $result['executionOrder'] = TestSuiteSorter::ORDER_DURATION; + + case 'random': + $result['executionOrder'] = TestSuiteSorter::ORDER_RANDOMIZED; + + break; + + case 'reverse': + $result['executionOrder'] = TestSuiteSorter::ORDER_REVERSED; break; }