Make sure test classes don't duplicate common class names

This commit is contained in:
Will Rossiter 2015-08-03 17:03:36 +12:00
parent 007348df61
commit 8f92d75975
2 changed files with 7 additions and 9 deletions

View File

@ -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',

View File

@ -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