Basic config infrastructure to support #2085

sebastianbergmann · Sep 8, 2018 · 48bb51b · 48bb51b
1 parent 2918e4f
commit 48bb51b
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 0 deletions.
diff --git a/phpunit.xsd b/phpunit.xsd
@@ -260,6 +260,7 @@
         <xs:attribute name="beStrictAboutTestsThatDoNotTestAnything" type="xs:boolean" default="true"/>
         <xs:attribute name="beStrictAboutTodoAnnotatedTests" type="xs:boolean" default="false"/>
         <xs:attribute name="beStrictAboutCoversAnnotation" type="xs:boolean" default="false"/>
+        <xs:attribute name="defaultTimeLimit" type="xs:integer" default="1"/>
         <xs:attribute name="enforceTimeLimit" type="xs:boolean" default="false"/>
         <xs:attribute name="ignoreDeprecatedCodeUnitsFromCodeCoverage" type="xs:boolean" default="false"/>
         <xs:attribute name="timeoutForSmallTests" type="xs:integer" default="1"/>

diff --git a/src/Framework/TestResult.php b/src/Framework/TestResult.php
@@ -139,6 +139,11 @@ class TestResult implements Countable
      */
     protected $beStrictAboutResourceUsageDuringSmallTests = false;
 
+    /**
+     * @var int
+     */
+    protected $defaultTimeLimit = 1;
+
     /**
      * @var bool
      */
@@ -1061,6 +1066,14 @@ public function wasSuccessful(): bool
         return empty($this->errors) && empty($this->failures) && empty($this->warnings);
     }
 
+    /**
+     * Sets the default timeout for tests
+     */
+    public function setDefaultTimeLimit(int $timeout): void
+    {
+        $this->defaultTimeLimit = $timeout;
+    }
+
     /**
      * Sets the timeout for small tests.
      */
@@ -1085,6 +1098,14 @@ public function setTimeoutForLargeTests(int $timeout): void
         $this->timeoutForLargeTests = $timeout;
     }
 
+    /**
+     * Returns the set timeout for large tests.
+     */
+    public function getDefaultTimeoutTests(): int
+    {
+        return $this->defaultTimeLimit;
+    }
+
     /**
      * Returns the set timeout for large tests.
      */

diff --git a/src/TextUI/Command.php b/src/TextUI/Command.php
@@ -84,6 +84,7 @@ class Command
         'disallow-test-output'      => null,
         'disallow-resource-usage'   => null,
         'disallow-todo-tests'       => null,
+        'default-time-limit='       => null,
         'enforce-time-limit'        => null,
         'exclude-group='            => null,
         'filter='                   => null,
@@ -692,6 +693,11 @@ protected function handleArguments(array $argv): void
 
                     break;
 
+                case '--default-time-limit':
+                    $this->arguments['defaultTimeLimit'] = (int) $option[1];
+
+                    break;
+
                 case '--enforce-time-limit':
                     $this->arguments['enforceTimeLimit'] = true;
 

diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
@@ -583,6 +583,7 @@ public function doRun(Test $suite, array $arguments = [], bool $exit = true): Te
         $result->beStrictAboutTodoAnnotatedTests($arguments['disallowTodoAnnotatedTests']);
         $result->beStrictAboutResourceUsageDuringSmallTests($arguments['beStrictAboutResourceUsageDuringSmallTests']);
         $result->enforceTimeLimit($arguments['enforceTimeLimit']);
+        $result->setDefaultTimeLimit($arguments['defaultTimeLimit']);
         $result->setTimeoutForSmallTests($arguments['timeoutForSmallTests']);
         $result->setTimeoutForMediumTests($arguments['timeoutForMediumTests']);
         $result->setTimeoutForLargeTests($arguments['timeoutForLargeTests']);
@@ -945,6 +946,10 @@ protected function handleConfiguration(array &$arguments): void
                 $arguments['disallowTestOutput'] = $phpunitConfiguration['disallowTestOutput'];
             }
 
+            if (isset($phpunitConfiguration['defaultTimeLimit']) && !isset($arguments['defaultTimeLimit'])) {
+                $arguments['defaultTimeLimit'] = $phpunitConfiguration['defaultTimeLimit'];
+            }
+
             if (isset($phpunitConfiguration['enforceTimeLimit']) && !isset($arguments['enforceTimeLimit'])) {
                 $arguments['enforceTimeLimit'] = $phpunitConfiguration['enforceTimeLimit'];
             }
@@ -1182,6 +1187,7 @@ protected function handleConfiguration(array &$arguments): void
         $arguments['crap4jThreshold']                                 = $arguments['crap4jThreshold'] ?? 30;
         $arguments['disallowTestOutput']                              = $arguments['disallowTestOutput'] ?? false;
         $arguments['disallowTodoAnnotatedTests']                      = $arguments['disallowTodoAnnotatedTests'] ?? false;
+        $arguments['defaultTimeLimit']                                = $arguments['defaultTimeLimit'] ?? 1;
         $arguments['enforceTimeLimit']                                = $arguments['enforceTimeLimit'] ?? false;
         $arguments['excludeGroups']                                   = $arguments['excludeGroups'] ?? [];
         $arguments['failOnRisky']                                     = $arguments['failOnRisky'] ?? false;

diff --git a/src/Util/Configuration.php b/src/Util/Configuration.php
@@ -59,6 +59,7 @@
  *          beStrictAboutResourceUsageDuringSmallTests="false"
  *          beStrictAboutTestsThatDoNotTestAnything="false"
  *          beStrictAboutTodoAnnotatedTests="false"
+ *          defaultTimeLimit="1"
  *          enforceTimeLimit="false"
  *          ignoreDeprecatedCodeUnitsFromCodeCoverage="false"
  *          timeoutForSmallTests="1"
@@ -855,6 +856,13 @@ public function getPHPUnitConfiguration(): array
             );
         }
 
+        if ($root->hasAttribute('defaultTimeLimit')) {
+            $result['defaultTimeLimit'] = $this->getInteger(
+                (string) $root->getAttribute('defaultTimeLimit'),
+                1
+            );
+        }
+
         if ($root->hasAttribute('enforceTimeLimit')) {
             $result['enforceTimeLimit'] = $this->getBoolean(
                 (string) $root->getAttribute('enforceTimeLimit'),

diff --git a/tests/_files/configuration.xml b/tests/_files/configuration.xml
@@ -25,6 +25,7 @@
          beStrictAboutTestsThatDoNotTestAnything="false"
          beStrictAboutTodoAnnotatedTests="false"
          beStrictAboutCoversAnnotation="false"
+         defaultTimeLimit="123"
          enforceTimeLimit="false"
          ignoreDeprecatedCodeUnitsFromCodeCoverage="false"
          timeoutForSmallTests="1"

diff --git a/tests/_files/configuration_xinclude.xml b/tests/_files/configuration_xinclude.xml
@@ -26,6 +26,7 @@
          beStrictAboutTestsThatDoNotTestAnything="false"
          beStrictAboutTodoAnnotatedTests="false"
          beStrictAboutCoversAnnotation="false"
+         defaultTimeLimit="123"
          enforceTimeLimit="false"
          ignoreDeprecatedCodeUnitsFromCodeCoverage="false"
          timeoutForSmallTests="1"

diff --git a/tests/unit/Util/ConfigurationTest.php b/tests/unit/Util/ConfigurationTest.php
@@ -471,6 +471,7 @@ public function testPHPUnitConfigurationIsReadCorrectly(): void
                 'reportUselessTests'                         => false,
                 'strictCoverage'                             => false,
                 'disallowTestOutput'                         => false,
+                'defaultTimeLimit'                           => 123,
                 'enforceTimeLimit'                           => false,
                 'extensionsDirectory'                        => '/tmp',
                 'printerClass'                               => 'PHPUnit\TextUI\ResultPrinter',