tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-03 01:49:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3088 from tractorcow/pulls/3.1-phpunit

Browse Source 
BUG Allow PHPUnit installation with composer / Fix travis
This commit is contained in:
Hamish Friedlander 2014-05-02 18:37:59 +12:00
commit d5b76a87d0
6 changed files with 97 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -41,7 +41,7 @@ before_script:
- php ~/travis-support/travis_setup_php54_webserver.php --if-env BEHAT_TEST
script:
- "if [ \"$BEHAT_TEST\" = \"\" ]; then phpunit framework/tests; fi"
- "if [ \"$BEHAT_TEST\" = \"\" ]; then vendor/bin/phpunit framework/tests; fi"
- "if [ \"$BEHAT_TEST\" = \"1\" ]; then vendor/bin/behat @framework; fi"
after_failure:

3
composer.json
View File

@ -19,6 +19,9 @@
"php": ">=5.3.2",
"composer/installers": "*"
},
"require-dev": {
"phpunit/PHPUnit": "~3.7"
},
"autoload": {
"classmap": ["tests/behat/features/bootstrap"]
},

20
dev/phpunit/PhpUnitWrapper.php
View File

@ -138,14 +138,22 @@ class PhpUnitWrapper implements IPhpUnitWrapper {
public static function inst() {
if (self::$phpunit_wrapper == null) {
if (fileExistsInIncludePath("/PHPUnit/Autoload.php")) {
// Loaded via autoloader, composer or other generic
if (class_exists('PHPUnit_Runner_Version')) {
self::$phpunit_wrapper = new PhpUnitWrapper_Generic();
}
// 3.5 detection
else if (fileExistsInIncludePath("/PHPUnit/Autoload.php")) {
self::$phpunit_wrapper = new PhpUnitWrapper_3_5();
} else
if (fileExistsInIncludePath("/PHPUnit/Framework.php")) {
}
// 3.4 detection
else if (fileExistsInIncludePath("/PHPUnit/Framework.php")) {
self::$phpunit_wrapper = new PhpUnitWrapper_3_4();
} else {
}
// No version found - will lead to an error
else {
self::$phpunit_wrapper = new PhpUnitWrapper();
}
}
self::$phpunit_wrapper->init();
}
@ -209,7 +217,7 @@ class PhpUnitWrapper implements IPhpUnitWrapper {
$this->beforeRunTests();
$this->getSuite()->run($this->getFrameworkTestResults());
$this->aferRunTests();
$this->afterRunTests();
}
/**

8
dev/phpunit/PhpUnitWrapper_3_4.php
View File

@ -9,7 +9,9 @@
*/
class PhpUnitWrapper_3_4 extends PhpUnitWrapper {
protected $version = 'PhpUnit V3.4';
public function getVersion() {
return 'PhpUnit V3.4';
}
/**
* Initialise the wrapper class.
@ -46,10 +48,10 @@ class PhpUnitWrapper_3_4 extends PhpUnitWrapper {
}
/**
* Overwrites aferRunTests. Creates coverage report and clover report
* Overwrites afterRunTests. Creates coverage report and clover report
* if required.
*/
protected function aferRunTests() {
protected function afterRunTests() {
if($this->getCoverageStatus()) {

59
dev/phpunit/PhpUnitWrapper_3_5.php
View File

@ -4,16 +4,10 @@
* @subpackage dev
*/
class PhpUnitWrapper_3_5 extends PhpUnitWrapper {
class PhpUnitWrapper_3_5 extends PhpUnitWrapper_Generic {
protected $version = 'PhpUnit V3.5';
protected $coverage = null;
protected static $test_name = 'SapphireTest';
public static function get_test_name() {
return self::$test_name;
public function getVersion() {
return 'PhpUnit V3.5';
}
/**
@ -23,56 +17,9 @@ class PhpUnitWrapper_3_5 extends PhpUnitWrapper {
if(!class_exists('PHPUnit_Framework_TestCase')) {
require_once 'PHP/CodeCoverage.php';
require_once 'PHP/CodeCoverage/Report/HTML.php';
require_once 'PHPUnit/Autoload.php';
require_once 'PHP/CodeCoverage/Filter.php';
}
}
/**
* Overwrites beforeRunTests. Initiates coverage-report generation if
* $coverage has been set to true (@see setCoverageStatus).
*/
protected function beforeRunTests() {
if($this->getCoverageStatus()) {
$this->coverage = new PHP_CodeCoverage();
$coverage = $this->coverage;
$filter = $coverage->filter();
$modules = $this->moduleDirectories();
foreach(TestRunner::config()->coverage_filter_dirs as $dir) {
if($dir[0] == '*') {
$dir = substr($dir, 1);
foreach ($modules as $module) {
$filter->addDirectoryToBlacklist(BASE_PATH . "/$module/$dir");
}
} else {
$filter->addDirectoryToBlacklist(BASE_PATH . '/' . $dir);
}
}
$filter->addFileToBlacklist(__FILE__, 'PHPUNIT');
$coverage->start(self::get_test_name());
}
}
/**
* Overwrites aferRunTests. Creates coverage report and clover report
* if required.
*/
protected function aferRunTests() {
if($this->getCoverageStatus()) {
$coverage = $this->coverage;
$coverage->stop();
$writer = new PHP_CodeCoverage_Report_HTML();
$writer->process($coverage, ASSETS_PATH.'/code-coverage-report');
}
}
}

71
dev/phpunit/PhpUnitWrapper_Generic.php Normal file
View File

@ -0,0 +1,71 @@
<?php
/**
* Generic PhpUnitWrapper.
* Originally intended for use with Composer based installations, but will work
* with any fully functional autoloader.
*/
class PhpUnitWrapper_Generic extends PhpUnitWrapper {
/**
* Returns a version string, like 3.7.34 or 4.2-dev.
* @return string
*/
public function getVersion() {
return PHPUnit_Runner_Version::id();
}
protected $coverage = null;
protected static $test_name = 'SapphireTest';
public static function get_test_name() {
return static::$test_name;
}
/**
* Overwrites beforeRunTests. Initiates coverage-report generation if
* $coverage has been set to true (@see setCoverageStatus).
*/
protected function beforeRunTests() {
if($this->getCoverageStatus()) {
$this->coverage = new PHP_CodeCoverage();
$coverage = $this->coverage;
$filter = $coverage->filter();
$modules = $this->moduleDirectories();
foreach(TestRunner::config()->coverage_filter_dirs as $dir) {
if($dir[0] == '*') {
$dir = substr($dir, 1);
foreach ($modules as $module) {
$filter->addDirectoryToBlacklist(BASE_PATH . "/$module/$dir");
}
} else {
$filter->addDirectoryToBlacklist(BASE_PATH . '/' . $dir);
}
}
$filter->addFileToBlacklist(__FILE__, 'PHPUNIT');
$coverage->start(self::get_test_name());
}
}
/**
* Overwrites afterRunTests. Creates coverage report and clover report
* if required.
*/
protected function afterRunTests() {
if($this->getCoverageStatus()) {
$coverage = $this->coverage;
$coverage->stop();
$writer = new PHP_CodeCoverage_Report_HTML();
$writer->process($coverage, ASSETS_PATH.'/code-coverage-report');
}
}
}