Dominic Grostate 10 лет назад
Родитель
Сommit
43dbd0cb5c
2 измененных файлов с 15 добавлено и 1 удалено
  1. 9 1
      Tests/Module/JobClassTest.php
  2. 6 0
      Tests/Module/WorkerClassTest.php

+ 9 - 1
Tests/Module/JobClassTest.php

@@ -71,7 +71,7 @@ class JobClassTest extends PHPUnit_Framework_TestCase
     private $defaultSettings = array(
         'method'                         => 'doHigh',
         'iterations'                     => 100,
-        'minimum_execution_time'         => null,
+        'minimumExecutionTime'           => null,
         'timeout'                        => null,
         'callbacks'                      => true,
         'jobPrefix'                      => null,
@@ -141,6 +141,8 @@ class JobClassTest extends PHPUnit_Framework_TestCase
             'realCallableNameNoPrefix' => str_replace('\\', '', $this->callableNameClass . '~' . $this->jobAnnotation->name),
             'description'              => $this->jobAnnotation->description,
             'iterations'               => $this->jobAnnotation->iterations,
+            'minimumExecutionTime'     => $this->jobAnnotation->minimumExecutionTime,
+            'timeout'                  => $this->jobAnnotation->timeout,
             'servers'                  => $this->jobAnnotation->servers,
             'defaultMethod'            => $this->jobAnnotation->defaultMethod,
         ));
@@ -178,6 +180,8 @@ class JobClassTest extends PHPUnit_Framework_TestCase
             'realCallableNameNoPrefix' => str_replace('\\', '', $this->callableNameClass . '~' . $this->methodName),
             'description'              => $jobClass::DEFAULT_DESCRIPTION,
             'iterations'               => $this->defaultSettings['iterations'],
+            'minimumExecutionTime'     => $this->defaultSettings['minimumExecutionTime'],
+            'timeout'                  => $this->defaultSettings['timeout'],
             'servers'                  => $this->servers,
             'defaultMethod'            => $this->defaultSettings['method'],
         ));
@@ -216,6 +220,8 @@ class JobClassTest extends PHPUnit_Framework_TestCase
             'realCallableNameNoPrefix' => str_replace('\\', '', $this->callableNameClass . '~' . $this->methodName),
             'description'              => $jobClass::DEFAULT_DESCRIPTION,
             'iterations'               => $this->defaultSettings['iterations'],
+            'minimumExecutionTime'     => $this->defaultSettings['minimumExecutionTime'],
+            'timeout'                  => $this->defaultSettings['timeout'],
             'servers'                  => array($this->jobAnnotation->servers),
             'defaultMethod'            => $this->defaultSettings['method'],
         ));
@@ -257,6 +263,8 @@ class JobClassTest extends PHPUnit_Framework_TestCase
             'realCallableNameNoPrefix' => str_replace('\\', '', $this->callableNameClass . '~' . $this->methodName),
             'description'              => $jobClass::DEFAULT_DESCRIPTION,
             'iterations'               => $this->defaultSettings['iterations'],
+            'minimumExecutionTime'     => $this->defaultSettings['minimumExecutionTime'],
+            'timeout'                  => $this->defaultSettings['timeout'],
             'servers'                  => array($this->jobAnnotation->servers),
             'defaultMethod'            => $this->defaultSettings['method'],
         ));

+ 6 - 0
Tests/Module/WorkerClassTest.php

@@ -191,6 +191,8 @@ class WorkerClassTest extends \PHPUnit_Framework_TestCase
             'service'               =>  $this->workAnnotation->service,
             'servers'               =>  $this->workAnnotation->servers,
             'iterations'            =>  $this->workAnnotation->iterations,
+            'minimumExecutionTime'  =>  $this->workAnnotation->minimumExecutionTime,
+            'timeout'               =>  $this->workAnnotation->timeout,
             'jobs'                  =>  array(),
         ));
     }
@@ -251,6 +253,8 @@ class WorkerClassTest extends \PHPUnit_Framework_TestCase
             'service'               =>  null,
             'servers'               =>  $this->servers,
             'iterations'            =>  $this->defaultSettings['iterations'],
+            'minimumExecutionTime'  =>  $this->defaultSettings['minimum_execution_time'],
+            'timeout'               =>  $this->defaultSettings['timeout'],
             'jobs'                  =>  array(),
         ));
     }
@@ -312,6 +316,8 @@ class WorkerClassTest extends \PHPUnit_Framework_TestCase
             'service'               =>  null,
             'servers'               =>  array($this->workAnnotation->servers),
             'iterations'            =>  $this->defaultSettings['iterations'],
+            'minimumExecutionTime'  =>  $this->defaultSettings['minimum_execution_time'],
+            'timeout'               =>  $this->defaultSettings['timeout'],
             'jobs'                  =>  array(),
         ));
     }