Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[Form] Hardened test suite for empty data (following for 3.4) #29180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[Form] Hardened test suite for empty data (following for 3.4) #29180

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5901e57
[Form] Hardened test suite for empty data
HeahDude Nov 11, 2018
0bccb16
[Form] Hardened test suite for empty data (following for 3.4)
HeahDude Nov 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[Form] Hardened test suite for empty data
  • Loading branch information
@HeahDude
HeahDude committed Nov 11, 2018
commit 5901e57fc0c99619b6c25daca2308f9ff504c0b0
39 changes: 39 additions & 0 deletions 39 src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1482,4 +1482,43 @@ public function testSetDataNonEmptyArraySubmitNullMultiple()
$this->assertEquals(array(), $form->getNormData());
$this->assertSame(array(), $form->getViewData(), 'View data is always an array');
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = null)
{
$emptyData = '1';
$entity1 = new SingleIntIdEntity(1, 'Foo');
$this->persist(array($entity1));

$form = $this->factory->create(static::TESTED_TYPE, null, array(
'em' => 'default',
'class' => self::SINGLE_IDENT_CLASS,
'empty_data' => $emptyData,
));
$form->submit(null);

$this->assertSame($emptyData, $form->getViewData());
$this->assertSame($entity1, $form->getNormData());
$this->assertSame($entity1, $form->getData());
}

public function testSubmitNullMultipleUsesDefaultEmptyData()
{
$emptyData = array('1');
$entity1 = new SingleIntIdEntity(1, 'Foo');
$this->persist(array($entity1));

$form = $this->factory->create(static::TESTED_TYPE, null, array(
'em' => 'default',
'class' => self::SINGLE_IDENT_CLASS,
'multiple' => true,
'empty_data' => $emptyData,
));
$form->submit(null);

$collection = new ArrayCollection(array($entity1));

$this->assertSame($emptyData, $form->getViewData());
$this->assertEquals($collection, $form->getNormData());
$this->assertEquals($collection, $form->getData());
}
}
22 changes: 22 additions & 0 deletions 22 src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,28 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
$this->assertSame($view, $form->getViewData());
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = null)
{
$builder = $this->factory->createBuilder($this->getTestedType());

if ($builder->getCompound()) {
$emptyData = array();
foreach ($builder as $field) {
// empty children should map null (model data) in the compound view data
$emptyData[$field->getName()] = null;
}
} else {
// simple fields share the view and the model format, unless they use a transformer
$expectedData = $emptyData;
}

$form = $builder->setEmptyData($emptyData)->getForm()->submit(null);

$this->assertSame($emptyData, $form->getViewData());
$this->assertSame($expectedData, $form->getNormData());
$this->assertSame($expectedData, $form->getData());
}

protected function getTestedType()
{
return static::TESTED_TYPE;
Expand Down
12 changes: 12 additions & 0 deletions 12 src/Symfony/Component/Form/Tests/Extension/Core/Type/ButtonTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,16 @@ public function testCreateButtonInstances()
{
$this->assertInstanceOf('Symfony\Component\Form\Button', $this->factory->create(static::TESTED_TYPE));
}

/**
* @expectedException \Symfony\Component\Form\Exception\BadMethodCallException
* @expectedExceptionMessage Buttons do not support empty data.
*
* @param string $emptyData
* @param null $expectedData
*/
public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = null)
{
parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
}
}
13 changes: 13 additions & 0 deletions 13 src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,17 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
{
parent::testSubmitNull(false, false, null);
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = true)
{
$form = $this->factory->create(static::TESTED_TYPE, null, array(
'empty_data' => $emptyData,
));
$form->submit(null);

// view data is transformed to the string true value
$this->assertSame('1', $form->getViewData());
$this->assertSame($expectedData, $form->getNormData());
$this->assertSame($expectedData, $form->getData());
}
}
9 changes: 5 additions & 4 deletions 9 src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,18 +584,19 @@ public function testSubmitSingleNonExpandedObjectChoices()
$this->assertTrue($form->isSynchronized());
}

public function testSubmitSingleChoiceWithEmptyData()
public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = null)
{
$form = $this->factory->create(static::TESTED_TYPE, null, array(
'multiple' => false,
'expanded' => false,
'choices' => array('test'),
'empty_data' => 'test',
// empty data must match string choice value
'choices' => array($emptyData),
'empty_data' => $emptyData,
));

$form->submit(null);

$this->assertSame('test', $form->getData());
$this->assertSame($emptyData, $form->getData());
}

public function testSubmitSingleChoiceWithEmptyDataAndInitialData()
Expand Down
6 changes: 6 additions & 0 deletions 6 src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,4 +408,10 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
{
parent::testSubmitNull(array(), array(), array());
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expectedData = array())
{
// resize form listener always set an empty array
parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
}
}
5 changes: 5 additions & 0 deletions 5 src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,9 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
{
parent::testSubmitNull($expected, $norm, '');
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = 'FR', $expectedData = 'FR')
{
parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
}
}
5 changes: 5 additions & 0 deletions 5 src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,9 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
{
parent::testSubmitNull($expected, $norm, '');
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = 'EUR', $expectedData = 'EUR')
{
parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
}
}
16 changes: 16 additions & 0 deletions 16 src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,4 +580,20 @@ public function testSubmitNullWithSingleText()
$this->assertNull($form->getNormData());
$this->assertSame('', $form->getViewData());
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expectedData = null)
{
$form = $this->factory->create(static::TESTED_TYPE, null, array(
'empty_data' => $emptyData,
));
$form->submit(null);

// view transformer writes back empty strings in the view data
$this->assertSame(
array('date' => array('year' => '', 'month' => '', 'day' => ''), 'time' => array('hour' => '', 'minute' => '')),
$form->getViewData()
);
$this->assertSame($expectedData, $form->getNormData());
$this->assertSame($expectedData, $form->getData());
}
}
29 changes: 29 additions & 0 deletions 29 src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,4 +975,33 @@ public function testSubmitNullWithSingleText()
$this->assertNull($form->getNormData());
$this->assertSame('', $form->getViewData());
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expectedData = null)
{
$form = $this->factory->create(static::TESTED_TYPE, null, array(
'empty_data' => $emptyData,
));
$form->submit(null);

// view transformer write back empty strings in the view data
$this->assertSame(array('year' => '', 'month' => '', 'day' => ''), $form->getViewData());
$this->assertSame($expectedData, $form->getNormData());
$this->assertSame($expectedData, $form->getData());
}

public function testSingleTextSubmitNullUsesDefaultEmptyData()
{
$emptyData = '2018-11-11';
$form = $this->factory->create(static::TESTED_TYPE, null, array(
'widget' => 'single_text',
'empty_data' => $emptyData,
));
$form->submit(null);

$date = new \DateTime($emptyData);

$this->assertSame($emptyData, $form->getViewData());
$this->assertEquals($date, $form->getNormData());
$this->assertEquals($date, $form->getData());
}
}
5 changes: 5 additions & 0 deletions 5 src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,11 @@ public function testDataClassMustBeValidClassOrInterface()
));
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expectedData = array())
{
parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
}

public function testSubmitWithEmptyDataCreatesObjectIfClassAvailable()
{
$form = $this->factory->createBuilder(static::TESTED_TYPE, null, array(
Expand Down
12 changes: 12 additions & 0 deletions 12 src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,16 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
{
parent::testSubmitNull($expected, $norm, '');
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = '10', $expectedData = 10)
{
$form = $this->factory->create(static::TESTED_TYPE, null, array(
'empty_data' => $emptyData,
));
$form->submit(null);

$this->assertSame($emptyData, $form->getViewData());
$this->assertSame($expectedData, $form->getNormData());
$this->assertSame($expectedData, $form->getData());
}
}
5 changes: 5 additions & 0 deletions 5 src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,9 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
{
parent::testSubmitNull($expected, $norm, '');
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = 'en', $expectedData = 'en')
{
parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
}
}
5 changes: 5 additions & 0 deletions 5 src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,9 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
{
parent::testSubmitNull($expected, $norm, '');
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = 'en', $expectedData = 'en')
{
parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
}
}
12 changes: 12 additions & 0 deletions 12 src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,16 @@ public function testMoneyPatternWithoutCurrency()

$this->assertSame('{{ widget }}', $view->vars['money_pattern']);
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = '10.00', $expectedData = 10.0)
{
$form = $this->factory->create(static::TESTED_TYPE, null, array(
'empty_data' => $emptyData,
));
$form->submit(null);

$this->assertSame($emptyData, $form->getViewData());
$this->assertSame($expectedData, $form->getNormData());
$this->assertSame($expectedData, $form->getData());
}
}
12 changes: 12 additions & 0 deletions 12 src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,16 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
{
parent::testSubmitNull($expected, $norm, '');
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = '10', $expectedData = 10.0)
{
$form = $this->factory->create(static::TESTED_TYPE, null, array(
'empty_data' => $emptyData,
));
$form->submit(null);

$this->assertSame($emptyData, $form->getViewData());
$this->assertSame($expectedData, $form->getNormData());
$this->assertSame($expectedData, $form->getData());
}
}
13 changes: 13 additions & 0 deletions 13 src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,4 +768,17 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)

parent::testSubmitNull($expected, $norm, $view);
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = array(), $expectedData = null)
{
$form = $this->factory->create(static::TESTED_TYPE, null, array(
'empty_data' => $emptyData,
));
$form->submit(null);

// view transformer write back empty strings in the view data
$this->assertSame(array('hour' => '', 'minute' => ''), $form->getViewData());
$this->assertSame($expectedData, $form->getNormData());
$this->assertSame($expectedData, $form->getData());
}
}
12 changes: 12 additions & 0 deletions 12 src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@ public function testSubmitNull($expected = null, $norm = null, $view = null)
parent::testSubmitNull($expected, $norm, '');
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = 'Africa/Kinshasa', $expectedData = 'Africa/Kinshasa')
{
$form = $this->factory->create(static::TESTED_TYPE, null, array(
'empty_data' => $emptyData,
));
$form->submit(null);

$this->assertSame($emptyData, $form->getViewData());
$this->assertSame($expectedData, $form->getNormData());
$this->assertSame($expectedData, $form->getData());
}

public function testDateTimeZoneInput()
{
$form = $this->factory->create(static::TESTED_TYPE, new \DateTimeZone('America/New_York'), array('input' => 'datetimezone'));
Expand Down
13 changes: 13 additions & 0 deletions 13 src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,17 @@ public function testSubmitWithNonStringDataDoesNotBreakTheFixUrlProtocolListener

$this->assertSame(array('domain.com', 'www.domain.com'), $form->getData());
}

public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = 'http://empty')
{
$form = $this->factory->create(static::TESTED_TYPE, null, array(
'empty_data' => $emptyData,
));
$form->submit(null);

// listener normalizes data on submit
$this->assertSame($expectedData, $form->getViewData());
$this->assertSame($expectedData, $form->getNormData());
$this->assertSame($expectedData, $form->getData());
}
}
Morty Proxy This is a proxified and sanitized view of the page, visit original site.