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

BUG Fix deprecated use of statics in test cases

Browse Source
This commit is contained in:
Damian Mooyman 2014-05-12 08:42:41 +12:00
parent 21fef41c3f
commit 51c3346b46
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/core/ConfigTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
class ConfigTest_DefinesFoo extends Object { class ConfigTest_DefinesFoo extends Object implements TestOnly {
protected static $foo = 1; protected static $foo = 1;
} }
@ -13,11 +13,11 @@ class ConfigTest_DefinesFooAndBar extends ConfigTest_DefinesFoo {
public static $bar = 3; public static $bar = 3;
} }
class ConfigTest_DefinesFooDoesntExtendObject { class ConfigTest_DefinesFooDoesntExtendObject implements TestOnly {
protected static $foo = 4; protected static $foo = 4;
} }
class ConfigStaticTest_First extends Config { class ConfigStaticTest_First extends Config implements TestOnly {
/** @config */ /** @config */
private static $first = array('test_1'); private static $first = array('test_1');
/** @config */ /** @config */
@ -57,7 +57,7 @@ class ConfigStaticTest_Fourth extends ConfigStaticTest_Third {
public static $fourth = array('test_4'); public static $fourth = array('test_4');
} }
class ConfigStaticTest_Combined1 extends Config { class ConfigStaticTest_Combined1 extends Config implements TestOnly {
/** @config */ /** @config */
private static $first = array('test_1'); private static $first = array('test_1');
/** @config */ /** @config */
@ -74,28 +74,35 @@ class ConfigStaticTest_Combined3 extends ConfigStaticTest_Combined2 {
private static $second = array('test_3'); private static $second = array('test_3');
} }
class ConfigTest_TestNest extends Object implements TestOnly {
/** @config */
private static $foo = 3;
/** @config */
private static $bar = 5;
}
class ConfigTest extends SapphireTest { class ConfigTest extends SapphireTest {
public function testNest() { public function testNest() {
// Check basic config // Check basic config
$this->assertEquals(3, Config::inst()->get('ConfigTest_DefinesFooAndBar', 'foo')); $this->assertEquals(3, Config::inst()->get('ConfigTest_TestNest', 'foo'));
$this->assertEquals(3, Config::inst()->get('ConfigTest_DefinesFooAndBar', 'bar')); $this->assertEquals(5, Config::inst()->get('ConfigTest_TestNest', 'bar'));
// Test nest copies data // Test nest copies data
Config::nest(); Config::nest();
$this->assertEquals(3, Config::inst()->get('ConfigTest_DefinesFooAndBar', 'foo')); $this->assertEquals(3, Config::inst()->get('ConfigTest_TestNest', 'foo'));
$this->assertEquals(3, Config::inst()->get('ConfigTest_DefinesFooAndBar', 'bar')); $this->assertEquals(5, Config::inst()->get('ConfigTest_TestNest', 'bar'));
// Test nested data can be updated // Test nested data can be updated
Config::inst()->update('ConfigTest_DefinesFooAndBar', 'foo', 4); Config::inst()->update('ConfigTest_TestNest', 'foo', 4);
$this->assertEquals(4, Config::inst()->get('ConfigTest_DefinesFooAndBar', 'foo')); $this->assertEquals(4, Config::inst()->get('ConfigTest_TestNest', 'foo'));
$this->assertEquals(3, Config::inst()->get('ConfigTest_DefinesFooAndBar', 'bar')); $this->assertEquals(5, Config::inst()->get('ConfigTest_TestNest', 'bar'));
// Test unnest restores data // Test unnest restores data
Config::unnest(); Config::unnest();
$this->assertEquals(3, Config::inst()->get('ConfigTest_DefinesFooAndBar', 'foo')); $this->assertEquals(3, Config::inst()->get('ConfigTest_TestNest', 'foo'));
$this->assertEquals(3, Config::inst()->get('ConfigTest_DefinesFooAndBar', 'bar')); $this->assertEquals(5, Config::inst()->get('ConfigTest_TestNest', 'bar'));
} }
public function testUpdateStatic() { public function testUpdateStatic() {
@ -292,7 +299,7 @@ class ConfigTest extends SapphireTest {
} }
} }
class ConfigTest_Config_LRU extends Config_LRU { class ConfigTest_Config_LRU extends Config_LRU implements TestOnly {
public $cache; public $cache;
public $indexing; public $indexing;