tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-26 14:39:25 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Fix tests to check against dynamic FRAMEWORK_DIR and $project

Browse Source 
instead of hardcoding these checks
This commit is contained in:
Sean Harvey 2012-04-14 13:25:40 +12:00
parent 6405c44bc2
commit c45027d247
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/dev/DeprecationTest.php
View File

@ -52,7 +52,8 @@ class DeprecationTest extends SapphireTest {
function testNonMatchingModuleNotifcationVersionDoesntAffectNotice() { function testNonMatchingModuleNotifcationVersionDoesntAffectNotice() {
Deprecation::notification_version('1.0.0'); Deprecation::notification_version('1.0.0');
Deprecation::notification_version('3.0.0', 'mysite'); global $project;
Deprecation::notification_version('3.0.0', $project);
$this->callThatOriginatesFromFramework(); $this->callThatOriginatesFromFramework();
} }
@ -61,12 +62,12 @@ class DeprecationTest extends SapphireTest {
*/ */
function testMatchingModuleNotifcationVersionAffectsNotice() { function testMatchingModuleNotifcationVersionAffectsNotice() {
Deprecation::notification_version('1.0.0'); Deprecation::notification_version('1.0.0');
Deprecation::notification_version('3.0.0', 'framework'); Deprecation::notification_version('3.0.0', FRAMEWORK_DIR);
$this->callThatOriginatesFromFramework(); $this->callThatOriginatesFromFramework();
} }
protected function callThatOriginatesFromFramework() { protected function callThatOriginatesFromFramework() {
$this->assertEquals(DeprecationTest_Deprecation::get_module(), 'framework'); $this->assertEquals(DeprecationTest_Deprecation::get_module(), FRAMEWORK_DIR);
Deprecation::notice('2.0', 'Deprecation test passed'); Deprecation::notice('2.0', 'Deprecation test passed');
} }