From f1e1cbe09b8f55e0d712bf49721733b415162f19 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 22 Mar 2011 22:47:26 +1300
Subject: [PATCH] MINOR Fixed test fixture paths and @package from 'sapphire'
 to 'cms'

---
 code/CurrentPageIdentifier.php             | 2 +-
 code/FolderUnusedAssetsField.php           | 2 +-
 code/HTMLCleaner.php                       | 2 +-
 code/Widget.php                            | 6 +++---
 code/WidgetArea.php                        | 2 +-
 tests/ContentControllerPermissionsTest.php | 2 +-
 tests/ContentControllerTest.php            | 4 ++--
 tests/ErrorPageTest.php                    | 2 +-
 tests/MigrateSiteTreeLinkingTaskTest.php   | 2 +-
 tests/ModelAsControllerTest.php            | 4 ++--
 tests/RedirectorPageTest.php               | 2 +-
 tests/RemoveOrphanedPagesTaskTest.php      | 4 ++--
 tests/RootURLControllerTest.php            | 4 ++--
 tests/SearchFormTest.php                   | 4 ++--
 tests/SiteConfigTest.php                   | 2 +-
 tests/SiteTreeActionsTest.php              | 2 +-
 tests/SiteTreeBrokenLinksTest.php          | 2 +-
 tests/SiteTreePermissionsTest.php          | 2 +-
 tests/SiteTreeTest.php                     | 2 +-
 tests/VirtualPageTest.php                  | 2 +-
 tests/WidgetControllerTest.php             | 8 ++++----
 tests/WidgetControllerTestPage.php         | 4 ++--
 22 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/code/CurrentPageIdentifier.php b/code/CurrentPageIdentifier.php
index a1dc1bed..1a0fe1c2 100644
--- a/code/CurrentPageIdentifier.php
+++ b/code/CurrentPageIdentifier.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * This interface lets us set up objects that will tell us what the current page is.
- * @package sapphire
+ * @package cms
  * @subpackage model
  */
 interface CurrentPageIdentifier {
diff --git a/code/FolderUnusedAssetsField.php b/code/FolderUnusedAssetsField.php
index 0d2b430a..543d4665 100644
--- a/code/FolderUnusedAssetsField.php
+++ b/code/FolderUnusedAssetsField.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @package sapphire
+ * @package cms
  * @subpackage filesystem
  */
 class Folder_UnusedAssetsField extends CompositeField {
diff --git a/code/HTMLCleaner.php b/code/HTMLCleaner.php
index d6ce300b..8c5d815c 100644
--- a/code/HTMLCleaner.php
+++ b/code/HTMLCleaner.php
@@ -2,7 +2,7 @@
 /**
  * Base class for HTML cleaning classes.
  * 
- * @package sapphire
+ * @package cms
  * @subpackage misc
  */
 abstract class HTMLCleaner  extends Object {
diff --git a/code/Widget.php b/code/Widget.php
index aaddd2af..25104d19 100755
--- a/code/Widget.php
+++ b/code/Widget.php
@@ -7,7 +7,7 @@
  * You can use forms in widgets by implementing a {@link Widget_Controller}.
  * See {@link Widget_Controller} for more information.
  * 
- * @package sapphire
+ * @package cms
  * @subpackage widgets
  */
 class Widget extends DataObject {
@@ -140,7 +140,7 @@ class Widget extends DataObject {
  * because the logic is implemented in {@link ContentController->handleWidget()}.
  * Copy this logic and the URL rules to enable it for other controllers.
  * 
- * @package sapphire
+ * @package cms
  * @subpackage widgets
  */
 class Widget_Controller extends Controller {
@@ -222,7 +222,7 @@ class Widget_Controller extends Controller {
 }
 
 /**
- * @package sapphire
+ * @package cms
  * @subpackage widgets
  */
 class Widget_TreeDropdownField extends TreeDropdownField {
diff --git a/code/WidgetArea.php b/code/WidgetArea.php
index 14075d25..710da822 100644
--- a/code/WidgetArea.php
+++ b/code/WidgetArea.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Represents a set of widgets shown on a page.
- * @package sapphire
+ * @package cms
  * @subpackage widgets
  */
 class WidgetArea extends DataObject {
diff --git a/tests/ContentControllerPermissionsTest.php b/tests/ContentControllerPermissionsTest.php
index 96625371..48f0e0c1 100644
--- a/tests/ContentControllerPermissionsTest.php
+++ b/tests/ContentControllerPermissionsTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @package sapphire
+ * @package cms
  * @subpackage tests
  */
 class ContentControllerPermissionTest extends FunctionalTest {
diff --git a/tests/ContentControllerTest.php b/tests/ContentControllerTest.php
index 287e96b5..7d1d46f8 100755
--- a/tests/ContentControllerTest.php
+++ b/tests/ContentControllerTest.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * @package sapphire
+ * @package cms
  * @subpackage tests
  */
 class ContentControllerTest extends FunctionalTest {
 	
-	public static $fixture_file = 'sapphire/tests/control/ContentControllerTest.yml';
+	public static $fixture_file = 'cms/tests/ContentControllerTest.yml';
 	
 	public static $use_draft_site = true;
 	
diff --git a/tests/ErrorPageTest.php b/tests/ErrorPageTest.php
index 70f523c8..98f3b1f5 100644
--- a/tests/ErrorPageTest.php
+++ b/tests/ErrorPageTest.php
@@ -5,7 +5,7 @@
  */
 class ErrorPageTest extends FunctionalTest {
 	
-	static $fixture_file = 'sapphire/tests/ErrorPageTest.yml';
+	static $fixture_file = 'cms/tests/ErrorPageTest.yml';
 	
 	protected $orig = array();
 	
diff --git a/tests/MigrateSiteTreeLinkingTaskTest.php b/tests/MigrateSiteTreeLinkingTaskTest.php
index f27efbcc..902b3cbe 100755
--- a/tests/MigrateSiteTreeLinkingTaskTest.php
+++ b/tests/MigrateSiteTreeLinkingTaskTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @package sapphire
+ * @package cms
  * @subpackage tests
  */
 class MigrateSiteTreeLinkingTaskTest extends SapphireTest {
diff --git a/tests/ModelAsControllerTest.php b/tests/ModelAsControllerTest.php
index fd780b5a..f9467b73 100644
--- a/tests/ModelAsControllerTest.php
+++ b/tests/ModelAsControllerTest.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * @package sapphire
+ * @package cms
  * @subpackage tests
  */
 class ModelAsControllerTest extends FunctionalTest {
 	
 	protected $usesDatabase = true;
 	
-	static $fixture_file = 'sapphire/tests/ModelAsControllerTest.yml';
+	static $fixture_file = 'cms/tests/ModelAsControllerTest.yml';
 	
 	protected $autoFollowRedirection = false;
 
diff --git a/tests/RedirectorPageTest.php b/tests/RedirectorPageTest.php
index c24edd2c..bb369803 100644
--- a/tests/RedirectorPageTest.php
+++ b/tests/RedirectorPageTest.php
@@ -1,7 +1,7 @@
 <?php
 
 class RedirectorPageTest extends FunctionalTest {
-	static $fixture_file = 'sapphire/tests/RedirectorPageTest.yml';
+	static $fixture_file = 'cms/tests/RedirectorPageTest.yml';
 	static $use_draft_site = true;
 	
 	function testGoodRedirectors() {
diff --git a/tests/RemoveOrphanedPagesTaskTest.php b/tests/RemoveOrphanedPagesTaskTest.php
index bd56308b..abd8e47d 100644
--- a/tests/RemoveOrphanedPagesTaskTest.php
+++ b/tests/RemoveOrphanedPagesTaskTest.php
@@ -27,12 +27,12 @@
  * 
  * @author Ingo Schommer (<firstname>@silverstripe.com), SilverStripe Ltd.
  * 
- * @package sapphire
+ * @package cms
  * @subpackage tests
  */
 class RemoveOrphanedPagesTaskTest extends FunctionalTest {
 	
-	static $fixture_file = 'sapphire/tests/tasks/RemoveOrphanedPagesTaskTest.yml';
+	static $fixture_file = 'cms/tests/RemoveOrphanedPagesTaskTest.yml';
 	
 	static $use_draft_site = false;
 	
diff --git a/tests/RootURLControllerTest.php b/tests/RootURLControllerTest.php
index 921277f4..1edd63d0 100755
--- a/tests/RootURLControllerTest.php
+++ b/tests/RootURLControllerTest.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * @package sapphire
+ * @package cms
  * @subpackage tests
  */
 class RootURLControllerTest extends SapphireTest {
-	static $fixture_file = 'sapphire/tests/control/RootURLControllerTest.yml';
+	static $fixture_file = 'cms/tests/RootURLControllerTest.yml';
 	
 	function testHomepageForDomain() {
 		$originalHost = $_SERVER['HTTP_HOST'];
diff --git a/tests/SearchFormTest.php b/tests/SearchFormTest.php
index a3b392d0..2e5a077b 100644
--- a/tests/SearchFormTest.php
+++ b/tests/SearchFormTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @package sapphire
+ * @package cms
  * @subpackage testing
  * 
  * @todo Fix unpublished pages check in testPublishedPagesMatchedByTitle()
@@ -8,7 +8,7 @@
  */
 class SearchFormTest extends FunctionalTest {
 	
-	static $fixture_file = 'sapphire/tests/search/SearchFormTest.yml';
+	static $fixture_file = 'cms/tests/SearchFormTest.yml';
 	
 	protected $mockController;
 	
diff --git a/tests/SiteConfigTest.php b/tests/SiteConfigTest.php
index 36391ceb..25858694 100644
--- a/tests/SiteConfigTest.php
+++ b/tests/SiteConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @package sapphire
+ * @package cms
  * @subpackage tests
  * 
  * Note: Most of the permission-related SiteConfig tests are located in 
diff --git a/tests/SiteTreeActionsTest.php b/tests/SiteTreeActionsTest.php
index 1e458b80..733cc2f5 100644
--- a/tests/SiteTreeActionsTest.php
+++ b/tests/SiteTreeActionsTest.php
@@ -9,7 +9,7 @@
  * - action_rollback
  * - action_revert
  * 
- * @package sapphire
+ * @package cms
  * @subpackage tests
  */
 class SiteTreeActionsTest extends FunctionalTest {
diff --git a/tests/SiteTreeBrokenLinksTest.php b/tests/SiteTreeBrokenLinksTest.php
index a9e069cd..b9c8f161 100644
--- a/tests/SiteTreeBrokenLinksTest.php
+++ b/tests/SiteTreeBrokenLinksTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @package sapphire
+ * @package cms
  * @subpackage tests
  */
 class SiteTreeBrokenLinksTest extends SapphireTest {
diff --git a/tests/SiteTreePermissionsTest.php b/tests/SiteTreePermissionsTest.php
index 3584cb6b..54135755 100755
--- a/tests/SiteTreePermissionsTest.php
+++ b/tests/SiteTreePermissionsTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @package sapphire
+ * @package cms
  * @subpackage tests
  * 
  * @todo Test canAddChildren()
diff --git a/tests/SiteTreeTest.php b/tests/SiteTreeTest.php
index 50ea18a6..8851a7a3 100755
--- a/tests/SiteTreeTest.php
+++ b/tests/SiteTreeTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @package sapphire
+ * @package cms
  * @subpackage tests
  */
 class SiteTreeTest extends SapphireTest {
diff --git a/tests/VirtualPageTest.php b/tests/VirtualPageTest.php
index a8942cde..dff56fb1 100644
--- a/tests/VirtualPageTest.php
+++ b/tests/VirtualPageTest.php
@@ -1,7 +1,7 @@
 <?php
 
 class VirtualPageTest extends SapphireTest {
-	static $fixture_file = 'sapphire/tests/model/VirtualPageTest.yml';
+	static $fixture_file = 'cms/tests/VirtualPageTest.yml';
 	
 	/**
 	 * Test that, after you update the source page of a virtual page, all the virtual pages
diff --git a/tests/WidgetControllerTest.php b/tests/WidgetControllerTest.php
index d7dac820..95cd59e3 100644
--- a/tests/WidgetControllerTest.php
+++ b/tests/WidgetControllerTest.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * @package sapphire
+ * @package cms
  * @subpackage tests
  */
 class WidgetControllerTest extends FunctionalTest {
-	static $fixture_file = 'sapphire/tests/widgets/WidgetControllerTest.yml';
+	static $fixture_file = 'cms/tests/WidgetControllerTest.yml';
 
 	protected $extraDataObjects = array(
 		'WidgetControllerTestPage',
@@ -50,7 +50,7 @@ class WidgetControllerTest extends FunctionalTest {
 }
 
 /**
- * @package sapphire
+ * @package cms
  * @subpackage tests
  */
 class WidgetControllerTest_Widget extends Widget implements TestOnly {
@@ -60,7 +60,7 @@ class WidgetControllerTest_Widget extends Widget implements TestOnly {
 }
 
 /**
- * @package sapphire
+ * @package cms
  * @subpackage tests
  */
 class WidgetControllerTest_Widget_Controller extends Widget_Controller implements TestOnly {
diff --git a/tests/WidgetControllerTestPage.php b/tests/WidgetControllerTestPage.php
index 8900e6ae..b72ef07f 100644
--- a/tests/WidgetControllerTestPage.php
+++ b/tests/WidgetControllerTestPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @package sapphire
+ * @package cms
  * @subpackage tests
  */
 class WidgetControllerTestPage extends Page implements TestOnly {
@@ -10,7 +10,7 @@ class WidgetControllerTestPage extends Page implements TestOnly {
 }
 
 /**
- * @package sapphire
+ * @package cms
  * @subpackage tests
  */
 class WidgetControllerTestPage_Controller extends Page_Controller implements TestOnly {