wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3961 from nextcloud/revert-2137-make-sure-tests-run-on-phpunit-4-again

Browse source 
Revert "Add a magic wrapper to allow phpunit4 to run the code again "
This commit is contained in:
Robin Appelman 2017-03-20 15:32:34 +01:00 committed by GitHub
commit be9ae45a4b
5 changed files with 5 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/autoloader.php
View file

@ -117,13 +117,6 @@ class Autoloader {
// This File is considered public API, so we make sure that the class
// can still be loaded, although the PSR-4 paths have not been loaded.
$paths[] = \OC::$SERVERROOT . '/tests/lib/TestCase.php';
} elseif ($class === 'Test\\TestCasePhpUnitCompatibility') {
$paths[] = \OC::$SERVERROOT . '/tests/lib/TestCasePhpUnitCompatibility.php';
} elseif ($class === 'Test\\TestCasePhpUnit5') {
$paths[] = \OC::$SERVERROOT . '/tests/lib/TestCasePhpUnit5.php';
} elseif ($class === 'Test\\TestCasePhpUnit4') {
$paths[] = \OC::$SERVERROOT . '/tests/lib/TestCasePhpUnit4.php';
}
return $paths;
}

7
tests/lib/TestCase.php
View file

@ -24,6 +24,7 @@ namespace Test;
use DOMDocument;
use DOMNode;
use OC\Cache\CappedMemoryCache;
use OC\Command\QueueBus;
use OC\Files\Filesystem;
use OC\Template\Base;
@ -33,7 +34,7 @@ use OCP\IDBConnection;
use OCP\IL10N;
use OCP\Security\ISecureRandom;
abstract class TestCase extends TestCasePhpUnitCompatibility {
abstract class TestCase extends \PHPUnit_Framework_TestCase {
/** @var \OC\Command\QueueBus */
private $commandBus;
@ -152,7 +153,7 @@ abstract class TestCase extends TestCasePhpUnitCompatibility {
}
}
protected function realOnNotSuccessfulTest() {
protected function onNotSuccessfulTest($e) {
$this->restoreAllServices();
// restore database connection
@ -161,6 +162,8 @@ abstract class TestCase extends TestCasePhpUnitCompatibility {
return self::$realDatabase;
});
}
parent::onNotSuccessfulTest($e);
}
protected function tearDown() {

37
tests/lib/TestCasePhpUnit4.php
View file

@ -1,37 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace Test;
/**
* FIXME Remove this once phpunit 5 is the lowest supported version, by reverting:
* https://github.com/nextcloud/server/pull/2137
*/
abstract class TestCasePhpUnit4 extends \PHPUnit_Framework_TestCase {
abstract protected function realOnNotSuccessfulTest();
protected function onNotSuccessfulTest(\Exception $e) {
$this->realOnNotSuccessfulTest();
parent::onNotSuccessfulTest($e);
}
}

37
tests/lib/TestCasePhpUnit5.php
View file

@ -1,37 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace Test;
/**
* FIXME Remove this once phpunit 5 is the lowest supported version, by reverting:
* https://github.com/nextcloud/server/pull/2137
*/
abstract class TestCasePhpUnit5 extends \PHPUnit_Framework_TestCase {
abstract protected function realOnNotSuccessfulTest();
protected function onNotSuccessfulTest($e) {
$this->realOnNotSuccessfulTest();
parent::onNotSuccessfulTest($e);
}
}

32
tests/lib/TestCasePhpUnitCompatibility.php
View file

@ -1,32 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace Test;
/**
* FIXME Remove this once phpunit 5 is the lowest supported version, by reverting:
* https://github.com/nextcloud/server/pull/2137
*/
if (version_compare(\PHPUnit_Runner_Version::id(), '5.0.0', '>=')) {
abstract class TestCasePhpUnitCompatibility extends TestCasePhpUnit5 {}
} else {
abstract class TestCasePhpUnitCompatibility extends TestCasePhpUnit4 {}
}