tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR altered skipTest to be a instance property rather than static

Browse Source
This commit is contained in:
Will Rossiter 2011-09-26 17:11:49 +13:00
parent 51affd2d63
commit 37d197c52f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/FunctionalTest.php
View File

@ -58,7 +58,7 @@ class FunctionalTest extends SapphireTest {
function setUp() { function setUp() {
// Skip calling FunctionalTest directly. // Skip calling FunctionalTest directly.
if(get_class($this) == "FunctionalTest") self::$skip_test = true; if(get_class($this) == "FunctionalTest") $this->skipTest = true;
parent::setUp(); parent::setUp();
$this->mainSession = new TestSession(); $this->mainSession = new TestSession();

7
dev/SapphireTest.php
View File

@ -24,7 +24,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
* *
* @var bool * @var bool
*/ */
private static $skip_test = false; protected $skipTest = false;
/** /**
* @var Boolean If set to TRUE, this will force a test database to be generated * @var Boolean If set to TRUE, this will force a test database to be generated
@ -124,10 +124,9 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
function setUp() { function setUp() {
// We cannot run the tests on this abstract class. // We cannot run the tests on this abstract class.
if(get_class($this) == "SapphireTest") self::$skip_test = true; if(get_class($this) == "SapphireTest") $this->skipTest = true;
// Ensure we are to run this test case if($this->skipTest) {
if(self::$skip_test) {
$this->markTestSkipped(sprintf( $this->markTestSkipped(sprintf(
'Skipping %s ', get_class($this) 'Skipping %s ', get_class($this)
)); ));