From 8f92d7597546c8b13b8f7593e01876fd8ee1d09d Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@fullscreen.io>
Date: Mon, 3 Aug 2015 17:03:36 +1200
Subject: [PATCH] Make sure test classes don't duplicate common class names

---
 tests/EditableFormFieldTest.php | 12 ++++++------
 tests/EditableFormFieldTest.yml |  4 +---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/EditableFormFieldTest.php b/tests/EditableFormFieldTest.php
index 6fdfe1c..17490fe 100644
--- a/tests/EditableFormFieldTest.php
+++ b/tests/EditableFormFieldTest.php
@@ -9,8 +9,8 @@ class EditableFormFieldTest extends FunctionalTest {
 	static $fixture_file = 'userforms/tests/EditableFormFieldTest.yml';
 
 	protected $extraDataObjects = array(
-		'ExtendedEditableFormField',
-		'EditableFormFieldExtension'
+		'ExtendedEditableFormFieldTestOnly',
+		'EditableFormFieldExtensionTestOnly'
 	);
 	
 	function testFormFieldPermissions() {
@@ -309,7 +309,7 @@ class EditableFormFieldTest extends FunctionalTest {
 
     function testExtendedEditableFormField() {
         /** @var ExtendedEditableFormField $field */
-        $field = $this->objFromFixture('ExtendedEditableFormField', 'extended-field');
+        $field = $this->objFromFixture('ExtendedEditableFormFieldTestOnly', 'extended-field');
 
         // Check db fields
         $dbFields = $field->stat('db');
@@ -342,10 +342,10 @@ class EditableFormFieldTest extends FunctionalTest {
  * A base EditableFormFieldClass that will be extended with {@link EditableFormFieldExtension}
  * @mixin EditableFormFieldExtension
  */
-class ExtendedEditableFormField extends EditableFormField implements TestOnly
+class ExtendedEditableFormFieldTestOnly extends EditableFormField implements TestOnly
 {
     private static $extensions = array(
-        'EditableFormFieldExtension'
+        'EditableFormFieldExtensionTestOnly'
     );
 }
 
@@ -354,7 +354,7 @@ class ExtendedEditableFormField extends EditableFormField implements TestOnly
  * Used for testing extensions to EditableFormField and the extended Fields methods
  * @property EditableFormField owner
  */
-class EditableFormFieldExtension extends DataExtension implements TestOnly
+class EditableFormFieldExtensionTestOnly extends DataExtension implements TestOnly
 {
     private static $db = array(
         'TestExtraField'      => 'Varchar',
diff --git a/tests/EditableFormFieldTest.yml b/tests/EditableFormFieldTest.yml
index 19a75c5..f211d45 100644
--- a/tests/EditableFormFieldTest.yml
+++ b/tests/EditableFormFieldTest.yml
@@ -108,15 +108,13 @@ EditableFileField:
     Name: file-uploader
     Title: Set file
 
-
-ExtendedEditableFormField:
+ExtendedEditableFormFieldTestOnly:
   extended-field:
     Name: extended-field
     Title: Extended Field
     TestExtraField: Extra Field
     TestValidationField: Extra Validation Field
 
-
 UserDefinedForm:
   basic-form-page:
     Title: User Defined Form