From 52abae49ca50415c567c710d389d984b36a2305f Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Thu, 21 Jul 2016 12:55:03 +0100
Subject: [PATCH] Test tidy up

---
 tests/GridFieldAddNewMultiClassTest.php |  6 +++---
 tests/GridFieldOrderableRowsTest.php    | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tests/GridFieldAddNewMultiClassTest.php b/tests/GridFieldAddNewMultiClassTest.php
index 9882e0b..b5b35b2 100644
--- a/tests/GridFieldAddNewMultiClassTest.php
+++ b/tests/GridFieldAddNewMultiClassTest.php
@@ -41,7 +41,7 @@ class GridFieldAddNewMultiClassTest extends SapphireTest {
  * @ignore
  */
 
-class GridFieldAddNewMultiClassTest_A {
+class GridFieldAddNewMultiClassTest_A implements TestOnly {
 	public function i18n_singular_name() {
 		$class = get_class($this);
 		return substr($class, strpos($class, '_') + 1);
@@ -52,7 +52,7 @@ class GridFieldAddNewMultiClassTest_A {
 	}
 }
 
-class GridFieldAddNewMultiClassTest_B extends GridFieldAddNewMultiClassTest_A {}
-class GridFieldAddNewMultiClassTest_C extends GridFieldAddNewMultiClassTest_A {}
+class GridFieldAddNewMultiClassTest_B extends GridFieldAddNewMultiClassTest_A implements TestOnly {}
+class GridFieldAddNewMultiClassTest_C extends GridFieldAddNewMultiClassTest_A implements TestOnly {}
 
 /**#@-*/
diff --git a/tests/GridFieldOrderableRowsTest.php b/tests/GridFieldOrderableRowsTest.php
index 3a6eddc..c954dcd 100644
--- a/tests/GridFieldOrderableRowsTest.php
+++ b/tests/GridFieldOrderableRowsTest.php
@@ -6,6 +6,12 @@ class GridFieldOrderableRowsTest extends SapphireTest {
 
 	protected $usesDatabase = true;
 
+	protected $extraDataObjects = array(
+		'GridFieldOrderableRowsTest_Parent',
+		'GridFieldOrderableRowsTest_Ordered',
+		'GridFieldOrderableRowsTest_Subclass',
+	);
+
 	/**
 	 * @covers GridFieldOrderableRows::getSortTable
 	 */
@@ -42,7 +48,7 @@ class GridFieldOrderableRowsTest extends SapphireTest {
  * @ignore
  */
 
-class GridFieldOrderableRowsTest_Parent extends DataObject {
+class GridFieldOrderableRowsTest_Parent extends DataObject implements TestOnly {
 
 	private static $has_many = array(
 		'MyHasMany' => 'GridFieldOrderableRowsTest_Ordered',
@@ -59,7 +65,7 @@ class GridFieldOrderableRowsTest_Parent extends DataObject {
 
 }
 
-class GridFieldOrderableRowsTest_Ordered extends DataObject {
+class GridFieldOrderableRowsTest_Ordered extends DataObject implements TestOnly {
 
 	private static $db = array(
 		'Sort' => 'Int'
@@ -69,9 +75,13 @@ class GridFieldOrderableRowsTest_Ordered extends DataObject {
 		'Parent' => 'GridFieldOrderableRowsTest_Parent'
 	);
 
+	private static $belongs_many_many =array(
+		'MyManyMany' => 'GridFieldOrderableRowsTest_Parent',
+	);
+
 }
 
-class GridFieldOrderableRowsTest_Subclass extends GridFieldOrderableRowsTest_Ordered {
+class GridFieldOrderableRowsTest_Subclass extends GridFieldOrderableRowsTest_Ordered implements TestOnly {
 }
 
 /**#@-*/