From f547da23a326409c1d92686db36ebd5bd32fa3c0 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 30 Mar 2011 20:04:31 +1300
Subject: [PATCH] MINOR Relative $fixture_file links in cms/tests to facilitate
 moving files

---
 tests/controller/CMSMainTest.php               | 2 +-
 tests/controller/CMSSiteTreeFilterTest.php     | 2 +-
 tests/controller/ContentControllerTest.php     | 2 +-
 tests/controller/ModelAsControllerTest.php     | 2 +-
 tests/controller/RootURLControllerTest.php     | 2 +-
 tests/model/ErrorPageTest.php                  | 2 +-
 tests/model/FileLinkTrackingTest.php           | 2 +-
 tests/model/RedirectorPageTest.php             | 2 +-
 tests/model/SiteTreeActionsTest.php            | 2 +-
 tests/model/SiteTreeBacklinksTest.php          | 2 +-
 tests/model/SiteTreeBrokenLinksTest.php        | 2 +-
 tests/model/SiteTreeHTMLEditorFieldTest.php    | 2 +-
 tests/model/SiteTreePermissionsTest.php        | 2 +-
 tests/model/SiteTreeTest.php                   | 2 +-
 tests/model/VirtualPageTest.php                | 2 +-
 tests/reports/SideReportTest.php               | 4 +++-
 tests/search/CMSMainSearchFormTest.php         | 2 +-
 tests/search/SearchFormTest.php                | 2 +-
 tests/tasks/MigrateSiteTreeLinkingTaskTest.php | 2 +-
 tests/tasks/RemoveOrphanedPagesTaskTest.php    | 2 +-
 tests/widgets/WidgetControllerTest.php         | 2 +-
 21 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/tests/controller/CMSMainTest.php b/tests/controller/CMSMainTest.php
index 3508ad8e..891371d3 100644
--- a/tests/controller/CMSMainTest.php
+++ b/tests/controller/CMSMainTest.php
@@ -4,7 +4,7 @@
  * @subpackage tests
  */
 class CMSMainTest extends FunctionalTest {
-	static $fixture_file = 'cms/tests/CMSMainTest.yml';
+	static $fixture_file = 'CMSMainTest.yml';
 	
 	protected $autoFollowRedirection = false;
 	
diff --git a/tests/controller/CMSSiteTreeFilterTest.php b/tests/controller/CMSSiteTreeFilterTest.php
index 106e2117..73bdaefd 100644
--- a/tests/controller/CMSSiteTreeFilterTest.php
+++ b/tests/controller/CMSSiteTreeFilterTest.php
@@ -1,7 +1,7 @@
 <?php
 class CMSSiteTreeFilterTest extends SapphireTest {
 
-	static $fixture_file = 'cms/tests/CMSSiteTreeFilterTest.yml';
+	static $fixture_file = 'CMSSiteTreeFilterTest.yml';
 	
 	function testSearchFilterEmpty() {
 		$page1 = $this->objFromFixture('Page', 'page1');
diff --git a/tests/controller/ContentControllerTest.php b/tests/controller/ContentControllerTest.php
index 7d1d46f8..a9b237f7 100755
--- a/tests/controller/ContentControllerTest.php
+++ b/tests/controller/ContentControllerTest.php
@@ -5,7 +5,7 @@
  */
 class ContentControllerTest extends FunctionalTest {
 	
-	public static $fixture_file = 'cms/tests/ContentControllerTest.yml';
+	public static $fixture_file = 'ContentControllerTest.yml';
 	
 	public static $use_draft_site = true;
 	
diff --git a/tests/controller/ModelAsControllerTest.php b/tests/controller/ModelAsControllerTest.php
index f9467b73..0260dd28 100644
--- a/tests/controller/ModelAsControllerTest.php
+++ b/tests/controller/ModelAsControllerTest.php
@@ -7,7 +7,7 @@ class ModelAsControllerTest extends FunctionalTest {
 	
 	protected $usesDatabase = true;
 	
-	static $fixture_file = 'cms/tests/ModelAsControllerTest.yml';
+	static $fixture_file = 'ModelAsControllerTest.yml';
 	
 	protected $autoFollowRedirection = false;
 
diff --git a/tests/controller/RootURLControllerTest.php b/tests/controller/RootURLControllerTest.php
index 1edd63d0..58b8cbfc 100755
--- a/tests/controller/RootURLControllerTest.php
+++ b/tests/controller/RootURLControllerTest.php
@@ -4,7 +4,7 @@
  * @subpackage tests
  */
 class RootURLControllerTest extends SapphireTest {
-	static $fixture_file = 'cms/tests/RootURLControllerTest.yml';
+	static $fixture_file = 'RootURLControllerTest.yml';
 	
 	function testHomepageForDomain() {
 		$originalHost = $_SERVER['HTTP_HOST'];
diff --git a/tests/model/ErrorPageTest.php b/tests/model/ErrorPageTest.php
index 98f3b1f5..c4a6c097 100644
--- a/tests/model/ErrorPageTest.php
+++ b/tests/model/ErrorPageTest.php
@@ -5,7 +5,7 @@
  */
 class ErrorPageTest extends FunctionalTest {
 	
-	static $fixture_file = 'cms/tests/ErrorPageTest.yml';
+	static $fixture_file = 'ErrorPageTest.yml';
 	
 	protected $orig = array();
 	
diff --git a/tests/model/FileLinkTrackingTest.php b/tests/model/FileLinkTrackingTest.php
index b847b786..02cca40f 100644
--- a/tests/model/FileLinkTrackingTest.php
+++ b/tests/model/FileLinkTrackingTest.php
@@ -4,7 +4,7 @@
  * Tests link tracking to files and images.
  */
 class FileLinkTrackingTest extends SapphireTest {
-	static $fixture_file = "cms/tests/FileLinkTrackingTest.yml";
+	static $fixture_file = "FileLinkTrackingTest.yml";
 	
 	function setUp() {
 		parent::setUp();
diff --git a/tests/model/RedirectorPageTest.php b/tests/model/RedirectorPageTest.php
index bb369803..bcb8d4ca 100644
--- a/tests/model/RedirectorPageTest.php
+++ b/tests/model/RedirectorPageTest.php
@@ -1,7 +1,7 @@
 <?php
 
 class RedirectorPageTest extends FunctionalTest {
-	static $fixture_file = 'cms/tests/RedirectorPageTest.yml';
+	static $fixture_file = 'RedirectorPageTest.yml';
 	static $use_draft_site = true;
 	
 	function testGoodRedirectors() {
diff --git a/tests/model/SiteTreeActionsTest.php b/tests/model/SiteTreeActionsTest.php
index 733cc2f5..888ed28f 100644
--- a/tests/model/SiteTreeActionsTest.php
+++ b/tests/model/SiteTreeActionsTest.php
@@ -14,7 +14,7 @@
  */
 class SiteTreeActionsTest extends FunctionalTest {
 
-	static $fixture_file = 'cms/tests/SiteTreeActionsTest.yml';
+	static $fixture_file = 'SiteTreeActionsTest.yml';
 	
 	static function set_up_once() {
 		SiteTreeTest::set_up_once();
diff --git a/tests/model/SiteTreeBacklinksTest.php b/tests/model/SiteTreeBacklinksTest.php
index dd39f770..60d849fb 100644
--- a/tests/model/SiteTreeBacklinksTest.php
+++ b/tests/model/SiteTreeBacklinksTest.php
@@ -1,7 +1,7 @@
 <?php
 
 class SiteTreeBacklinksTest extends SapphireTest {
-	static $fixture_file = "cms/tests/SiteTreeBacklinksTest.yml";
+	static $fixture_file = "SiteTreeBacklinksTest.yml";
 
 	protected $requiredExtensions = array(
 		'SiteTree' => array('SiteTreeBacklinksTest_DOD'),
diff --git a/tests/model/SiteTreeBrokenLinksTest.php b/tests/model/SiteTreeBrokenLinksTest.php
index b9c8f161..45cd73c5 100644
--- a/tests/model/SiteTreeBrokenLinksTest.php
+++ b/tests/model/SiteTreeBrokenLinksTest.php
@@ -4,7 +4,7 @@
  * @subpackage tests
  */
 class SiteTreeBrokenLinksTest extends SapphireTest {
-	static $fixture_file = 'cms/tests/SiteTreeBrokenLinksTest.yml';
+	static $fixture_file = 'SiteTreeBrokenLinksTest.yml';
 	
 	static function set_up_once() {
 		SiteTreeTest::set_up_once();
diff --git a/tests/model/SiteTreeHTMLEditorFieldTest.php b/tests/model/SiteTreeHTMLEditorFieldTest.php
index 52cb881b..d56f4189 100644
--- a/tests/model/SiteTreeHTMLEditorFieldTest.php
+++ b/tests/model/SiteTreeHTMLEditorFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 class SiteTreeHtmlEditorFieldTest extends FunctionalTest {
-	public static $fixture_file = 'cms/tests/SiteTreeHtmlEditorFieldTest.yml';
+	public static $fixture_file = 'SiteTreeHtmlEditorFieldTest.yml';
 
 	public static $use_draft_site = true;
 
diff --git a/tests/model/SiteTreePermissionsTest.php b/tests/model/SiteTreePermissionsTest.php
index 54135755..7f9a5f13 100755
--- a/tests/model/SiteTreePermissionsTest.php
+++ b/tests/model/SiteTreePermissionsTest.php
@@ -7,7 +7,7 @@
  * @todo Test canCreate()
  */
 class SiteTreePermissionsTest extends FunctionalTest {
-	static $fixture_file = "cms/tests/SiteTreePermissionsTest.yml";
+	static $fixture_file = "SiteTreePermissionsTest.yml";
 	
 	protected $illegalExtensions = array(
 		'SiteTree' => array('SiteTreeSubsites')
diff --git a/tests/model/SiteTreeTest.php b/tests/model/SiteTreeTest.php
index d0744c4c..8b2b0911 100755
--- a/tests/model/SiteTreeTest.php
+++ b/tests/model/SiteTreeTest.php
@@ -4,7 +4,7 @@
  * @subpackage tests
  */
 class SiteTreeTest extends SapphireTest {
-	static $fixture_file = 'cms/tests/SiteTreeTest.yml';
+	static $fixture_file = 'SiteTreeTest.yml';
 	
 	protected $illegalExtensions = array(
 		'SiteTree' => array('SiteTreeSubsites')
diff --git a/tests/model/VirtualPageTest.php b/tests/model/VirtualPageTest.php
index dff56fb1..91d8b747 100644
--- a/tests/model/VirtualPageTest.php
+++ b/tests/model/VirtualPageTest.php
@@ -1,7 +1,7 @@
 <?php
 
 class VirtualPageTest extends SapphireTest {
-	static $fixture_file = 'cms/tests/VirtualPageTest.yml';
+	static $fixture_file = 'VirtualPageTest.yml';
 	
 	/**
 	 * Test that, after you update the source page of a virtual page, all the virtual pages
diff --git a/tests/reports/SideReportTest.php b/tests/reports/SideReportTest.php
index 35b78135..b457a970 100755
--- a/tests/reports/SideReportTest.php
+++ b/tests/reports/SideReportTest.php
@@ -5,7 +5,9 @@
  */
 
 class SideReportTest extends SapphireTest {
-	static $fixture_file = 'cms/tests/SideReportTest.yml';
+
+	static $fixture_file = 'SideReportTest.yml';
+
 	static $daysAgo = 14;
 	
 	function setUp() {
diff --git a/tests/search/CMSMainSearchFormTest.php b/tests/search/CMSMainSearchFormTest.php
index b28c3042..24a535fd 100644
--- a/tests/search/CMSMainSearchFormTest.php
+++ b/tests/search/CMSMainSearchFormTest.php
@@ -1,7 +1,7 @@
 <?php
 class CMSMainSearchTreeFormTest extends FunctionalTest {
 	
-	static $fixture_file = 'cms/tests/CMSMainTest.yml';
+	static $fixture_file = '../controller/CMSMainTest.yml';
 	
 	protected $autoFollowRedirection = false;
 	
diff --git a/tests/search/SearchFormTest.php b/tests/search/SearchFormTest.php
index 2e5a077b..e56236e1 100644
--- a/tests/search/SearchFormTest.php
+++ b/tests/search/SearchFormTest.php
@@ -8,7 +8,7 @@
  */
 class SearchFormTest extends FunctionalTest {
 	
-	static $fixture_file = 'cms/tests/SearchFormTest.yml';
+	static $fixture_file = 'SearchFormTest.yml';
 	
 	protected $mockController;
 	
diff --git a/tests/tasks/MigrateSiteTreeLinkingTaskTest.php b/tests/tasks/MigrateSiteTreeLinkingTaskTest.php
index 902b3cbe..370e78be 100755
--- a/tests/tasks/MigrateSiteTreeLinkingTaskTest.php
+++ b/tests/tasks/MigrateSiteTreeLinkingTaskTest.php
@@ -5,7 +5,7 @@
  */
 class MigrateSiteTreeLinkingTaskTest extends SapphireTest {
 	
-	public static $fixture_file = 'cms/tests/MigrateSiteTreeLinkingTaskTest.yml';
+	public static $fixture_file = 'MigrateSiteTreeLinkingTaskTest.yml';
 	
 	public static $use_draft_site = true;
 	
diff --git a/tests/tasks/RemoveOrphanedPagesTaskTest.php b/tests/tasks/RemoveOrphanedPagesTaskTest.php
index abd8e47d..f608ed28 100644
--- a/tests/tasks/RemoveOrphanedPagesTaskTest.php
+++ b/tests/tasks/RemoveOrphanedPagesTaskTest.php
@@ -32,7 +32,7 @@
  */
 class RemoveOrphanedPagesTaskTest extends FunctionalTest {
 	
-	static $fixture_file = 'cms/tests/RemoveOrphanedPagesTaskTest.yml';
+	static $fixture_file = 'RemoveOrphanedPagesTaskTest.yml';
 	
 	static $use_draft_site = false;
 	
diff --git a/tests/widgets/WidgetControllerTest.php b/tests/widgets/WidgetControllerTest.php
index 95cd59e3..df695f59 100644
--- a/tests/widgets/WidgetControllerTest.php
+++ b/tests/widgets/WidgetControllerTest.php
@@ -4,7 +4,7 @@
  * @subpackage tests
  */
 class WidgetControllerTest extends FunctionalTest {
-	static $fixture_file = 'cms/tests/WidgetControllerTest.yml';
+	static $fixture_file = 'WidgetControllerTest.yml';
 
 	protected $extraDataObjects = array(
 		'WidgetControllerTestPage',