tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-06-28 23:49:22 +02:00
Code Issues Projects Releases Wiki Activity

Make sure test classes don't duplicate common class names

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/EditableFormFieldTest.php
View File

@ -9,8 +9,8 @@ class EditableFormFieldTest extends FunctionalTest {
static $fixture_file = 'userforms/tests/EditableFormFieldTest.yml'; static $fixture_file = 'userforms/tests/EditableFormFieldTest.yml';
protected $extraDataObjects = array( protected $extraDataObjects = array(
'ExtendedEditableFormField', 'ExtendedEditableFormFieldTestOnly',
'EditableFormFieldExtension' 'EditableFormFieldExtensionTestOnly'
); );
function testFormFieldPermissions() { function testFormFieldPermissions() {
@ -309,7 +309,7 @@ class EditableFormFieldTest extends FunctionalTest {
function testExtendedEditableFormField() { function testExtendedEditableFormField() {
/** @var ExtendedEditableFormField $field */ /** @var ExtendedEditableFormField $field */
$field = $this->objFromFixture('ExtendedEditableFormField', 'extended-field'); $field = $this->objFromFixture('ExtendedEditableFormFieldTestOnly', 'extended-field');
// Check db fields // Check db fields
$dbFields = $field->stat('db'); $dbFields = $field->stat('db');
@ -342,10 +342,10 @@ class EditableFormFieldTest extends FunctionalTest {
* A base EditableFormFieldClass that will be extended with {@link EditableFormFieldExtension} * A base EditableFormFieldClass that will be extended with {@link EditableFormFieldExtension}
* @mixin EditableFormFieldExtension * @mixin EditableFormFieldExtension
*/ */
class ExtendedEditableFormField extends EditableFormField implements TestOnly class ExtendedEditableFormFieldTestOnly extends EditableFormField implements TestOnly
{ {
private static $extensions = array( 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 * Used for testing extensions to EditableFormField and the extended Fields methods
* @property EditableFormField owner * @property EditableFormField owner
*/ */
class EditableFormFieldExtension extends DataExtension implements TestOnly class EditableFormFieldExtensionTestOnly extends DataExtension implements TestOnly
{ {
private static $db = array( private static $db = array(
'TestExtraField' => 'Varchar', 'TestExtraField' => 'Varchar',

4
tests/EditableFormFieldTest.yml
View File

@ -108,15 +108,13 @@ EditableFileField:
Name: file-uploader Name: file-uploader
Title: Set file Title: Set file
ExtendedEditableFormFieldTestOnly:
ExtendedEditableFormField:
extended-field: extended-field:
Name: extended-field Name: extended-field
Title: Extended Field Title: Extended Field
TestExtraField: Extra Field TestExtraField: Extra Field
TestValidationField: Extra Validation Field TestValidationField: Extra Validation Field
UserDefinedForm: UserDefinedForm:
basic-form-page: basic-form-page:
Title: User Defined Form Title: User Defined Form