From de7ed1aa3ab33dbc3e1c673dd309bd07598fbfa8 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 1 Nov 2008 13:40:00 +0000
Subject: [PATCH] BUGFIX Changed i18nTextCollectorTest to only trigger _t()
 calls in instance methods (they don't fully work in __construct()). Manually
 adding ClassInfo state for the fakewebroot needed to test textcollection -
 ManifestBuilder/ClassInfo currently don't support setting of other webroots,
 or flexible inclusion/exclusion of certain subfolders which would be
 necessary to do this without hacks.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65023 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .../_fakewebroot/i18ntestmodule/code/i18nTestModule.php   | 8 ++------
 tests/i18nTextCollectorTest.php                           | 4 ++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/code/i18nTestModule.php b/tests/i18n/_fakewebroot/i18ntestmodule/code/i18nTestModule.php
index 65c00ae70..3a4c2e16b 100644
--- a/tests/i18n/_fakewebroot/i18ntestmodule/code/i18nTestModule.php
+++ b/tests/i18n/_fakewebroot/i18ntestmodule/code/i18nTestModule.php
@@ -1,20 +1,16 @@
 <?php
 class i18nTestModule extends Object {
-	function __construct() {
+	function myMethod() {
 		_t(
 			'i18nTestModule.ENTITY', 
 			'Entity with "Double Quotes"', 
 			PR_LOW, 
 			'Comment for entity'
 		);
-		
-		parent::__construct();
 	}
 }
 class i18nTestModule_Addition extends Object {
-	function __construct() {
+	function myAdditionalMethod() {
 		_t('i18nTestModule.ADDITION','Addition');
-		
-		parent::__construct();
 	}
 }
\ No newline at end of file
diff --git a/tests/i18nTextCollectorTest.php b/tests/i18nTextCollectorTest.php
index 309bc7f44..4cf040b23 100644
--- a/tests/i18nTextCollectorTest.php
+++ b/tests/i18nTextCollectorTest.php
@@ -29,6 +29,10 @@ class i18nTextCollectorTest extends SapphireTest {
 		global $_CLASS_MANIFEST;
 		$_CLASS_MANIFEST['i18nTestModule'] = $this->alternateBasePath . '/i18ntestmodule/code/i18nTestModule.php';
 		$_CLASS_MANIFEST['i18nTestModule_Addition'] = $this->alternateBasePath . '/i18ntestmodule/code/i18nTestModule.php';
+		
+		global $_ALL_CLASSES;
+		$_ALL_CLASSES['parents']['i18nTestModule'] = array('Object'=>'Object');
+		$_ALL_CLASSES['parents']['i18nTestModule_Addition'] = array('Object'=>'Object');
 
 		global $_TEMPLATE_MANIFEST;
 		$_TEMPLATE_MANIFEST['i18nTestModule.ss'] = array(