Permalink
Browse files

Merge branch 'master' of github.com:sebastianbergmann/phpunit

  • Loading branch information...
sebastianbergmann committed Jul 27, 2010
2 parents 237c446 + c22c64b commit 32a7691d82c59ffa3278cb2f39f4fe9390f3419c
@@ -1,210 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * * Neither the name of Sebastian Bergmann nor the names of his
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category Testing
- * @package PHPUnit
- * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2002-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- * @link http://www.phpunit.de/
- * @since File available since Release 3.0.0
- */
-
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/Util/Filter.php';
-
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
-
-/**
- * A TestCase that expects a specified output.
- *
- * @category Testing
- * @package PHPUnit
- * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2002-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version Release: @package_version@
- * @link http://www.phpunit.de/
- * @since Class available since Release 3.0.0
- */
-abstract class PHPUnit_Extensions_OutputTestCase extends PHPUnit_Framework_TestCase
-{
- /**
- * @var string
- */
- protected $expectedRegex = NULL;
-
- /**
- * @var string
- */
- protected $expectedString = NULL;
-
- /**
- * @var string
- */
- protected $output = '';
-
- /**
- * @var boolean
- */
- protected $obActive = FALSE;
-
- /**
- * @var mixed
- */
- protected $outputCallback = FALSE;
-
- /**
- * @return bool
- */
- public function setOutputCallback($callback)
- {
- if (is_callable($callback)) {
- $this->outputCallback = $callback;
- $set = TRUE;
- } else {
- $set = FALSE;
- }
-
- return $set;
- }
-
- /**
- * @return string
- */
- public function normalizeOutput($buffer)
- {
- return str_replace("\r", '', $buffer);
- }
-
- /**
- * @return string
- */
- public function getActualOutput()
- {
- if (!$this->obActive) {
- return $this->output;
- } else {
- return ob_get_contents();
- }
- }
-
- /**
- * @return string
- */
- public function expectedRegex()
- {
- return $this->expectedRegex;
- }
-
- /**
- * @param string $expectedRegex
- */
- public function expectOutputRegex($expectedRegex)
- {
- if ($this->expectedString !== NULL) {
- throw new PHPUnit_Framework_Exception;
- }
-
- if (is_string($expectedRegex) || is_null($expectedRegex)) {
- $this->expectedRegex = $expectedRegex;
- }
- }
-
- /**
- * @return string
- */
- public function expectedString()
- {
- return $this->expectedOutput;
- }
-
- /**
- * @param string $expectedString
- */
- public function expectOutputString($expectedString)
- {
- if ($this->expectedRegex !== NULL) {
- throw new PHPUnit_Framework_Exception;
- }
-
- if (is_string($expectedString) || is_null($expectedString)) {
- $this->expectedString = $expectedString;
- }
- }
-
- /**
- * @return mixed
- * @throws RuntimeException
- */
- protected function runTest()
- {
- ob_start();
- $this->obActive = TRUE;
-
- try {
- $testResult = parent::runTest();
- }
-
- catch (Exception $e) {
- ob_end_clean();
- $this->obActive = FALSE;
- throw $e;
- }
-
- if ($this->outputCallback === FALSE) {
- $this->output = ob_get_contents();
- } else {
- $this->output = call_user_func_array($this->outputCallback, array(ob_get_contents()));
- }
-
- ob_end_clean();
- $this->obActive = FALSE;
-
- if ($this->expectedRegex !== NULL) {
- $this->assertRegExp($this->expectedRegex, $this->output);
- $this->expectedRegex = NULL;
- }
-
- else if ($this->expectedString !== NULL) {
- $this->assertEquals($this->expectedString, $this->output);
- $this->expectedString = NULL;
- }
-
- return $testResult;
- }
-}
-?>
@@ -1,158 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * * Neither the name of Sebastian Bergmann nor the names of his
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category Testing
- * @package PHPUnit
- * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2002-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- * @link http://www.phpunit.de/
- * @since File available since Release 2.0.0
- */
-
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/Extensions/TestDecorator.php';
-require_once 'PHPUnit/Util/Filter.php';
-
-PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
-
-/**
- * A Decorator that runs a test repeatedly.
- *
- * @category Testing
- * @package PHPUnit
- * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2002-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version Release: @package_version@
- * @link http://www.phpunit.de/
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_Extensions_RepeatedTest extends PHPUnit_Extensions_TestDecorator
-{
- /**
- * @var mixed
- */
- protected $filter = FALSE;
-
- /**
- * @var array
- */
- protected $groups = array();
-
- /**
- * @var array
- */
- protected $excludeGroups = array();
-
- /**
- * @var integer
- */
- protected $timesRepeat = 1;
-
- /**
- * Constructor.
- *
- * @param PHPUnit_Framework_Test $test
- * @param integer $timesRepeat
- * @param mixed $filter
- * @param array $groups
- * @param array $excludeGroups
- * @param boolean $processIsolation
- * @throws InvalidArgumentException
- */
- public function __construct(PHPUnit_Framework_Test $test, $timesRepeat = 1, $filter = FALSE, array $groups = array(), array $excludeGroups = array(), $processIsolation = FALSE)
- {
- parent::__construct($test);
-
- if (is_integer($timesRepeat) &&
- $timesRepeat >= 0) {
- $this->timesRepeat = $timesRepeat;
- } else {
- throw new InvalidArgumentException(
- 'Argument 2 must be a positive integer.'
- );
- }
-
- $this->filter = $filter;
- $this->groups = $groups;
- $this->excludeGroups = $excludeGroups;
- $this->processIsolation = $processIsolation;
- }
-
- /**
- * Counts the number of test cases that
- * will be run by this test.
- *
- * @return integer
- */
- public function count()
- {
- return $this->timesRepeat * count($this->test);
- }
-
- /**
- * Runs the decorated test and collects the
- * result in a TestResult.
- *
- * @param PHPUnit_Framework_TestResult $result
- * @return PHPUnit_Framework_TestResult
- * @throws InvalidArgumentException
- */
- public function run(PHPUnit_Framework_TestResult $result = NULL)
- {
- if ($result === NULL) {
- $result = $this->createResult();
- }
-
- for ($i = 0; $i < $this->timesRepeat && !$result->shouldStop(); $i++) {
- if ($this->test instanceof PHPUnit_Framework_TestSuite) {
- $this->test->run(
- $result,
- $this->filter,
- $this->groups,
- $this->excludeGroups,
- $this->processIsolation
- );
- } else {
- $this->test->run($result);
- }
- }
-
- return $result;
- }
-}
-?>
@@ -1,14 +0,0 @@
---- PHPUnit/Extensions/RepeatedTest.php
-+++ PHPUnit/Extensions/RepeatedTest.php
-@@ -73,6 +73,11 @@
- protected $excludeGroups = array();
-
- /**
-+ * @var boolean
-+ */
-+ protected $processIsolation = FALSE;
-+
-+ /**
- * @var integer
- */
- protected $timesRepeat = 1;
Oops, something went wrong.

0 comments on commit 32a7691

Please sign in to comment.