Skip to content

Commit

Permalink
Patch by Oliver Schlicht <o.schlicht@bitExpert.de>. Closes #87.
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed Jan 19, 2007
1 parent d1c9810 commit 4c928ae
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 2 deletions.
1 change: 1 addition & 0 deletions PHPUnit/Framework/MockObject/Stub.php
Expand Up @@ -81,6 +81,7 @@ interface PHPUnit_Framework_MockObject_Stub extends PHPUnit_Framework_SelfDescri
public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation);
}

require_once 'PHPUnit/Framework/MockObject/Stub/Exception.php';
require_once 'PHPUnit/Framework/MockObject/Stub/MatcherCollection.php';
require_once 'PHPUnit/Framework/MockObject/Stub/Return.php';
?>
90 changes: 90 additions & 0 deletions PHPUnit/Framework/MockObject/Stub/Exception.php
@@ -0,0 +1,90 @@
<?php
/**
* PHPUnit
*
* Copyright (c) 2002-2007, 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, STRIC
* 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 Oliver Schlicht <o.schlicht@bitExpert.de>
* @author Sebastian Bergmann <sb@sebastian-bergmann.de>
* @copyright 2002-2007 Sebastian Bergmann <sb@sebastian-bergmann.de>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @version SVN: $Id$
* @link http://www.phpunit.de/
* @since File available since Release 3.1.0
*/

require_once 'PHPUnit/Util/Filter.php';
require_once 'PHPUnit/Framework/MockObject/Invocation.php';
require_once 'PHPUnit/Framework/MockObject/Stub.php';

PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');

/**
* Stubs a method by raising a user-defined exception.
*
* @category Testing
* @package PHPUnit
* @author Oliver Schlicht <o.schlicht@bitExpert.de>
* @author Sebastian Bergmann <sb@sebastian-bergmann.de>
* @copyright 2002-2007 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.1.0
*/
class PHPUnit_Framework_MockObject_Stub_Exception implements PHPUnit_Framework_MockObject_Stub
{
private $exception;

public function __construct(Exception $exception)
{
$this->exception = $exception;
}

public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
{
throw $this->exception;
}

public function toString()
{
return sprintf(
'raise user-specified exception %s',

PHPUnit_Util_Type::toString($this->exception)
);
}
}
?>
16 changes: 14 additions & 2 deletions PHPUnit/Framework/TestCase.php
Expand Up @@ -49,8 +49,7 @@
require_once 'PHPUnit/Framework/MockObject/Matcher/InvokedAtLeastOnce.php';
require_once 'PHPUnit/Framework/MockObject/Matcher/InvokedAtIndex.php';
require_once 'PHPUnit/Framework/MockObject/Matcher/InvokedCount.php';
require_once 'PHPUnit/Framework/MockObject/Stub/ConsecutiveCalls.php';
require_once 'PHPUnit/Framework/MockObject/Stub/Return.php';
require_once 'PHPUnit/Framework/MockObject/Stub.php';
require_once 'PHPUnit/Util/Filter.php';

PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
Expand Down Expand Up @@ -480,6 +479,19 @@ protected function returnValue($value)
return new PHPUnit_Framework_MockObject_Stub_Return($value);
}

/**
*
*
* @param Exception $exception
* @return PHPUnit_Framework_MockObject_Stub_Exception
* @access protected
* @since Method available since Release 3.1.0
*/
protected function throwException(Exception $exception)
{
return new PHPUnit_Framework_MockObject_Stub_Exception($exception);
}

/**
*
*
Expand Down
3 changes: 3 additions & 0 deletions package.xml
Expand Up @@ -182,6 +182,9 @@
</file>
</dir>
<dir name="Stub">
<file baseinstalldir="/" name="Exception.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file baseinstalldir="/" name="ConsecutiveCalls.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
Expand Down

0 comments on commit 4c928ae

Please sign in to comment.