Fix test failures caused by subsite filtering on fixture retrieval

tests/BaseSubsiteTest.php

@@ -0,0 +1,13 @@
+<?php
+class BaseSubsiteTest extends SapphireTest {
+	/**
+	 * Avoid subsites filtering on fixture fetching.
+	 */
+	function objFromFixture($class, $id) {
+		Subsite::disable_subsite_filter(true);
+		$obj = parent::objFromFixture($class, $id);
+		Subsite::disable_subsite_filter(false);		
+
+		return $obj;
+	}
+}

tests/FileSubsitesTest.php

@@ -1,6 +1,6 @@
 <?php
 
-class FileSubsitesTest extends SapphireTest {
+class FileSubsitesTest extends BaseSubsiteTest {
 	static $fixture_file = 'subsites/tests/SubsiteTest.yml';
 	
 	function testTrivialFeatures() {

tests/GroupSubsitesTest.php

@@ -1,6 +1,6 @@
 <?php
 
-class GroupSubsitesTest extends SapphireTest {
+class GroupSubsitesTest extends BaseSubsiteTest {
 	static $fixture_file = 'subsites/tests/SubsiteTest.yml';
 	
 	protected $requireDefaultRecordsFrom = array('GroupSubsites');

tests/LeftAndMainSubsitesTest.php

@@ -2,6 +2,17 @@
 class LeftAndMainSubsitesTest extends FunctionalTest {
 	
 	static $fixture_file = 'subsites/tests/SubsiteTest.yml';
+
+	/**
+	 * Avoid subsites filtering on fixture fetching.
+	 */
+	function objFromFixture($class, $id) {
+		Subsite::disable_subsite_filter(true);
+		$obj = parent::objFromFixture($class, $id);
+		Subsite::disable_subsite_filter(false);		
+
+		return $obj;
+	}
 	
 	function testAlternateAccessCheck() {
 		$admin = $this->objFromFixture("Member","admin");

tests/SiteConfigSubsitesTest.php

@@ -1,6 +1,6 @@
 <?php
 
-class SiteConfigSubsitesTest extends SapphireTest {
+class SiteConfigSubsitesTest extends BaseSubsiteTest {
 	static $fixture_file = 'subsites/tests/SubsiteTest.yml';
 	
 	function testEachSubsiteHasAUniqueSiteConfig() {

tests/SiteTreeSubsitesTest.php

@@ -1,6 +1,6 @@
 <?php
 
-class SiteTreeSubsitesTest extends SapphireTest {
+class SiteTreeSubsitesTest extends BaseSubsiteTest {
 
 	static $fixture_file = 'subsites/tests/SubsiteTest.yml';
 	

tests/SubsiteAdminTest.php

@@ -1,6 +1,6 @@
 <?php
 
-class SubsiteAdminTest extends SapphireTest {
+class SubsiteAdminTest extends BaseSubsiteTest {
 	static $fixture_file = 'subsites/tests/SubsiteTest.yml';
 
     function adminLoggedInSession() {

tests/SubsiteTest.php

@@ -1,6 +1,6 @@
 <?php
 
-class SubsiteTest extends SapphireTest {
+class SubsiteTest extends BaseSubsiteTest {
 
 	static $fixture_file = 'subsites/tests/SubsiteTest.yml';
 	

tests/SubsitesVirtualPageTest.php

@@ -1,6 +1,6 @@
 <?php
 
-class SubsitesVirtualPageTest extends SapphireTest {
+class SubsitesVirtualPageTest extends BaseSubsiteTest {
 	static $fixture_file = array(
 		'subsites/tests/SubsiteTest.yml',
 		'subsites/tests/SubsitesVirtualPageTest.yml',
@@ -14,6 +14,7 @@ class SubsitesVirtualPageTest extends SapphireTest {
 		fwrite($fh, str_repeat('x',1000000));
 		fclose($fh);
 	}
+
 	function tearDown() {
 		parent::tearDown();
 		$testFiles = array(