tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MINOR: Fixed test

This commit is contained in:
Sam Minnee 2012-05-28 16:20:28 +12:00
parent fb48ec54f4
commit 07c4860031
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/bootstrap.php
View File

@ -1,13 +1,15 @@
<?php
// Simulate an execution from framework/cli-script.php, Core.php has too many
// hardcoded assumptions about folder depth of the executing script.
/**
* This bootstraps the SilverStripe system so that phpunit can be run directly on SilverStripe tests.
*/
// Make sure display_errors is on
ini_set('display_errors', 1);
// Check we're using at least PHPUnit 3.6
if(version_compare(PHPUnit_Runner_Version::id(), '3.6', '<')) {
echo 'PHPUnit 3.6 required to run tests using bootstrap.php';
// Check we're using at least PHPUnit 3.5
if(version_compare(PHPUnit_Runner_Version::id(), '3.5', '<')) {
echo 'PHPUnit 3.5 required to run tests using bootstrap.php';
die();
}

2
tests/i18n/i18nTest.php
View File

@ -515,7 +515,7 @@ class i18nTest extends SapphireTest {
$this->assertEquals(
i18n::_t('i18nTestModule.ENTITY'),
'i18nTestModule.ENTITY OtherCustomAdapter (en)',
'i18nTestModule.ENTITY OtherCustomAdapter (en_US)',
'Adapter with higher priority wins'
);