From 07c486003123d7fd3c95ef3370525dc44c74152b Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Mon, 28 May 2012 16:20:28 +1200
Subject: [PATCH] MINOR: Fixed test

---
 tests/bootstrap.php     | 12 +++++++-----
 tests/i18n/i18nTest.php |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 0091c2fc8..199b9821c 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -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();
 }
 
diff --git a/tests/i18n/i18nTest.php b/tests/i18n/i18nTest.php
index 401ea8ff8..6f69a0360 100644
--- a/tests/i18n/i18nTest.php
+++ b/tests/i18n/i18nTest.php
@@ -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'
 		);