6543/CommunityID
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

import v2.0.0.0_RC3 | 2012-07-01

Browse Source 
https://github.com/lucanos/CommunityID -> http://www.itadmins.net/archives/357
This commit is contained in:
6543
2019-07-17 22:31:04 +02:00
parent 38c146901c
commit 2f397f01f7
2677 changed files with 296182 additions and 45159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libs/Zend/Test/PHPUnit/ControllerTestCase.php
View File

@ -16,7 +16,7 @@
* @package Zend_Test
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: ControllerTestCase.php 16874 2009-07-20 12:46:00Z mikaelkael $
* @version $Id: ControllerTestCase.php 18605 2009-10-16 20:23:09Z matthew $
*/
/** PHPUnit_Framework_TestCase */
@ -141,7 +141,10 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te
{
$this->reset();
if (null !== $this->bootstrap) {
if (is_callable($this->bootstrap)) {
if ($this->bootstrap instanceof Zend_Application) {
$this->bootstrap->bootstrap();
$this->_frontController = $this->bootstrap->getBootstrap()->getResource('frontcontroller');
} elseif (is_callable($this->bootstrap)) {
call_user_func($this->bootstrap);
} elseif (is_string($this->bootstrap)) {
require_once 'Zend/Loader.php';
@ -242,6 +245,10 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te
*/
public function resetRequest()
{
if ($this->_request instanceof Zend_Controller_Request_HttpTestCase) {
$this->_request->clearQuery()
->clearPost();
}
$this->_request = null;
return $this;
}
@ -905,7 +912,10 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te
{
$this->_incrementAssertionCount();
if ($module != $this->request->getModuleName()) {
$msg = sprintf('Failed asserting last module used was "%s"', $module);
$msg = sprintf('Failed asserting last module used <"%s"> was "%s"',
$this->request->getModuleName(),
$module
);
if (!empty($message)) {
$msg = $message . "\n" . $msg;
}
@ -943,7 +953,10 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te
{
$this->_incrementAssertionCount();
if ($controller != $this->request->getControllerName()) {
$msg = sprintf('Failed asserting last controller used was "%s"', $controller);
$msg = sprintf('Failed asserting last controller used <"%s"> was "%s"',
$this->request->getControllerName(),
$controller
);
if (!empty($message)) {
$msg = $message . "\n" . $msg;
}
@ -962,7 +975,10 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te
{
$this->_incrementAssertionCount();
if ($controller == $this->request->getControllerName()) {
$msg = sprintf('Failed asserting last controller used was NOT "%s"', $controller);
$msg = sprintf('Failed asserting last controller used <"%s"> was NOT "%s"',
$this->request->getControllerName(),
$controller
);
if (!empty($message)) {
$msg = $message . "\n" . $msg;
}
@ -981,7 +997,7 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te
{
$this->_incrementAssertionCount();
if ($action != $this->request->getActionName()) {
$msg = sprintf('Failed asserting last action used was "%s"', $action);
$msg = sprintf('Failed asserting last action used <"%s"> was "%s"', $this->request->getActionName(), $action);
if (!empty($message)) {
$msg = $message . "\n" . $msg;
}
@ -1000,7 +1016,7 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te
{
$this->_incrementAssertionCount();
if ($action == $this->request->getActionName()) {
$msg = sprintf('Failed asserting last action used was NOT "%s"', $action);
$msg = sprintf('Failed asserting last action used <"%s"> was NOT "%s"', $this->request->getActionName(), $action);
if (!empty($message)) {
$msg = $message . "\n" . $msg;
}
@ -1020,7 +1036,10 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te
$this->_incrementAssertionCount();
$router = $this->frontController->getRouter();
if ($route != $router->getCurrentRouteName()) {
$msg = sprintf('Failed asserting route matched was "%s"', $route);
$msg = sprintf('Failed asserting matched route was "%s", actual route is %s',
$route,
$router->getCurrentRouteName()
);
if (!empty($message)) {
$msg = $message . "\n" . $msg;
}