Removed assertDateTimeEquals() methods.
This commit is contained in:
parent
4f47bb73a0
commit
5b73d1c1e6
@ -33,9 +33,4 @@ abstract class TypeTestCase extends FormIntegrationTestCase
|
||||
$this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
|
||||
$this->builder = new FormBuilder(null, null, $this->dispatcher, $this->factory);
|
||||
}
|
||||
|
||||
public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual)
|
||||
{
|
||||
self::assertEquals($expected->format('c'), $actual->format('c'));
|
||||
}
|
||||
}
|
||||
|
@ -1,22 +0,0 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
abstract class DateTimeTestCase extends TestCase
|
||||
{
|
||||
public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual)
|
||||
{
|
||||
self::assertEquals($expected->format('U'), $actual->format('U'));
|
||||
}
|
||||
}
|
@ -11,9 +11,10 @@
|
||||
|
||||
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToArrayTransformer;
|
||||
|
||||
class DateTimeToArrayTransformerTest extends DateTimeTestCase
|
||||
class DateTimeToArrayTransformerTest extends TestCase
|
||||
{
|
||||
public function testTransform()
|
||||
{
|
||||
@ -163,7 +164,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
|
||||
|
||||
$output = new \DateTime('2010-02-03 04:05:06 UTC');
|
||||
|
||||
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input));
|
||||
$this->assertEquals($output, $transformer->reverseTransform($input));
|
||||
}
|
||||
|
||||
public function testReverseTransformWithSomeZero()
|
||||
@ -181,7 +182,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
|
||||
|
||||
$output = new \DateTime('2010-02-03 04:00:00 UTC');
|
||||
|
||||
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input));
|
||||
$this->assertEquals($output, $transformer->reverseTransform($input));
|
||||
}
|
||||
|
||||
public function testReverseTransformCompletelyEmpty()
|
||||
@ -326,7 +327,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
|
||||
$output = new \DateTime('2010-02-03 04:05:06 Asia/Hong_Kong');
|
||||
$output->setTimezone(new \DateTimeZone('America/New_York'));
|
||||
|
||||
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input));
|
||||
$this->assertEquals($output, $transformer->reverseTransform($input));
|
||||
}
|
||||
|
||||
public function testReverseTransformToDifferentTimezone()
|
||||
@ -345,7 +346,7 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase
|
||||
$output = new \DateTime('2010-02-03 04:05:06 UTC');
|
||||
$output->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
|
||||
|
||||
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input));
|
||||
$this->assertEquals($output, $transformer->reverseTransform($input));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -11,10 +11,11 @@
|
||||
|
||||
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToLocalizedStringTransformer;
|
||||
use Symfony\Component\Intl\Util\IntlTestHelper;
|
||||
|
||||
class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
|
||||
class DateTimeToLocalizedStringTransformerTest extends TestCase
|
||||
{
|
||||
protected $dateTime;
|
||||
protected $dateTimeWithoutSeconds;
|
||||
@ -226,7 +227,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
|
||||
{
|
||||
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::FULL);
|
||||
|
||||
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010, 04:05:06 GMT+00:00'));
|
||||
$this->assertEquals($this->dateTime, $transformer->reverseTransform('03.02.2010, 04:05:06 GMT+00:00'));
|
||||
}
|
||||
|
||||
public function testReverseTransformFromDifferentLocale()
|
||||
@ -235,7 +236,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
|
||||
|
||||
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');
|
||||
|
||||
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Feb 3, 2010, 04:05 AM'));
|
||||
$this->assertEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Feb 3, 2010, 04:05 AM'));
|
||||
}
|
||||
|
||||
public function testReverseTransformWithDifferentTimezones()
|
||||
@ -245,7 +246,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
|
||||
$dateTime = new \DateTime('2010-02-03 04:05:00 Asia/Hong_Kong');
|
||||
$dateTime->setTimezone(new \DateTimeZone('America/New_York'));
|
||||
|
||||
$this->assertDateTimeEquals($dateTime, $transformer->reverseTransform('03.02.2010, 04:05'));
|
||||
$this->assertEquals($dateTime, $transformer->reverseTransform('03.02.2010, 04:05'));
|
||||
}
|
||||
|
||||
public function testReverseTransformOnlyDateWithDifferentTimezones()
|
||||
@ -254,21 +255,21 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
|
||||
|
||||
$dateTime = new \DateTime('2017-01-10 11:00', new \DateTimeZone('Europe/Berlin'));
|
||||
|
||||
$this->assertDateTimeEquals($dateTime, $transformer->reverseTransform('2017-01-10'));
|
||||
$this->assertEquals($dateTime, $transformer->reverseTransform('2017-01-10'));
|
||||
}
|
||||
|
||||
public function testReverseTransformWithDifferentPatterns()
|
||||
{
|
||||
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'MM*yyyy*dd HH|mm|ss');
|
||||
|
||||
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('02*2010*03 04|05|06'));
|
||||
$this->assertEquals($this->dateTime, $transformer->reverseTransform('02*2010*03 04|05|06'));
|
||||
}
|
||||
|
||||
public function testReverseTransformDateOnlyWithDstIssue()
|
||||
{
|
||||
$transformer = new DateTimeToLocalizedStringTransformer('Europe/Rome', 'Europe/Rome', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'dd/MM/yyyy');
|
||||
|
||||
$this->assertDateTimeEquals(
|
||||
$this->assertEquals(
|
||||
new \DateTime('1978-05-28', new \DateTimeZone('Europe/Rome')),
|
||||
$transformer->reverseTransform('28/05/1978')
|
||||
);
|
||||
@ -278,7 +279,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
|
||||
{
|
||||
$transformer = new DateTimeToLocalizedStringTransformer('Europe/Rome', 'Europe/Rome', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, "'day': dd 'month': MM 'year': yyyy");
|
||||
|
||||
$this->assertDateTimeEquals(
|
||||
$this->assertEquals(
|
||||
new \DateTime('1978-05-28', new \DateTimeZone('Europe/Rome')),
|
||||
$transformer->reverseTransform('day: 28 month: 05 year: 1978')
|
||||
);
|
||||
@ -332,7 +333,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
|
||||
{
|
||||
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::SHORT);
|
||||
|
||||
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('31.04.10 04:05'));
|
||||
$this->assertEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('31.04.10 04:05'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -11,9 +11,10 @@
|
||||
|
||||
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToRfc3339Transformer;
|
||||
|
||||
class DateTimeToRfc3339TransformerTest extends DateTimeTestCase
|
||||
class DateTimeToRfc3339TransformerTest extends TestCase
|
||||
{
|
||||
protected $dateTime;
|
||||
protected $dateTimeWithoutSeconds;
|
||||
@ -107,9 +108,9 @@ class DateTimeToRfc3339TransformerTest extends DateTimeTestCase
|
||||
$transformer = new DateTimeToRfc3339Transformer($toTz, $fromTz);
|
||||
|
||||
if (null !== $to) {
|
||||
$this->assertDateTimeEquals(new \DateTime($to), $transformer->reverseTransform($from));
|
||||
$this->assertEquals(new \DateTime($to), $transformer->reverseTransform($from));
|
||||
} else {
|
||||
$this->assertSame($to, $transformer->reverseTransform($from));
|
||||
$this->assertNull($transformer->reverseTransform($from));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -11,9 +11,10 @@
|
||||
|
||||
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;
|
||||
|
||||
class DateTimeToStringTransformerTest extends DateTimeTestCase
|
||||
class DateTimeToStringTransformerTest extends TestCase
|
||||
{
|
||||
public function dataProvider()
|
||||
{
|
||||
@ -126,7 +127,7 @@ class DateTimeToStringTransformerTest extends DateTimeTestCase
|
||||
|
||||
$output = new \DateTime($output);
|
||||
|
||||
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
|
||||
$this->assertEquals($output, $reverseTransformer->reverseTransform($input));
|
||||
}
|
||||
|
||||
public function testReverseTransformEmpty()
|
||||
@ -144,7 +145,7 @@ class DateTimeToStringTransformerTest extends DateTimeTestCase
|
||||
$input = $output->format('Y-m-d H:i:s');
|
||||
$output->setTimezone(new \DateTimeZone('America/New_York'));
|
||||
|
||||
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
|
||||
$this->assertEquals($output, $reverseTransformer->reverseTransform($input));
|
||||
}
|
||||
|
||||
public function testReverseTransformExpectsString()
|
||||
|
@ -11,9 +11,10 @@
|
||||
|
||||
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
|
||||
|
||||
class DateTimeToTimestampTransformerTest extends DateTimeTestCase
|
||||
class DateTimeToTimestampTransformerTest extends TestCase
|
||||
{
|
||||
public function testTransform()
|
||||
{
|
||||
@ -86,7 +87,7 @@ class DateTimeToTimestampTransformerTest extends DateTimeTestCase
|
||||
$output = new \DateTime('2010-02-03 04:05:06 UTC');
|
||||
$input = $output->format('U');
|
||||
|
||||
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
|
||||
$this->assertEquals($output, $reverseTransformer->reverseTransform($input));
|
||||
}
|
||||
|
||||
public function testReverseTransformEmpty()
|
||||
@ -104,7 +105,7 @@ class DateTimeToTimestampTransformerTest extends DateTimeTestCase
|
||||
$input = $output->format('U');
|
||||
$output->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
|
||||
|
||||
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
|
||||
$this->assertEquals($output, $reverseTransformer->reverseTransform($input));
|
||||
}
|
||||
|
||||
public function testReverseTransformExpectsValidTimestamp()
|
||||
|
@ -49,7 +49,7 @@ class DateTimeTypeTest extends BaseTypeTest
|
||||
|
||||
$dateTime = new \DateTime('2010-06-02 03:04:00 UTC');
|
||||
|
||||
$this->assertDateTimeEquals($dateTime, $form->getData());
|
||||
$this->assertEquals($dateTime, $form->getData());
|
||||
}
|
||||
|
||||
public function testSubmitString()
|
||||
@ -133,7 +133,7 @@ class DateTimeTypeTest extends BaseTypeTest
|
||||
|
||||
$form->submit($input);
|
||||
|
||||
$this->assertDateTimeEquals(new \DateTime('2010-06-02 03:00:00 UTC'), $form->getData());
|
||||
$this->assertEquals(new \DateTime('2010-06-02 03:00:00 UTC'), $form->getData());
|
||||
}
|
||||
|
||||
public function testSubmitWithSeconds()
|
||||
@ -165,7 +165,7 @@ class DateTimeTypeTest extends BaseTypeTest
|
||||
|
||||
$form->submit($input);
|
||||
|
||||
$this->assertDateTimeEquals(new \DateTime('2010-06-02 03:04:05 UTC'), $form->getData());
|
||||
$this->assertEquals(new \DateTime('2010-06-02 03:04:05 UTC'), $form->getData());
|
||||
}
|
||||
|
||||
public function testSubmitDifferentTimezones()
|
||||
@ -215,7 +215,7 @@ class DateTimeTypeTest extends BaseTypeTest
|
||||
|
||||
$outputTime->setTimezone(new \DateTimeZone('America/New_York'));
|
||||
|
||||
$this->assertDateTimeEquals($outputTime, $form->getData());
|
||||
$this->assertEquals($outputTime, $form->getData());
|
||||
$this->assertEquals('2010-06-02T03:04:00-10:00', $form->getViewData());
|
||||
}
|
||||
|
||||
@ -266,7 +266,7 @@ class DateTimeTypeTest extends BaseTypeTest
|
||||
'time' => '03:04',
|
||||
));
|
||||
|
||||
$this->assertDateTimeEquals($dateTime, $form->getData());
|
||||
$this->assertEquals($dateTime, $form->getData());
|
||||
}
|
||||
|
||||
public function testInitializeWithDateTime()
|
||||
|
@ -64,7 +64,7 @@ class DateTypeTest extends BaseTypeTest
|
||||
|
||||
$form->submit('2010-06-02');
|
||||
|
||||
$this->assertDateTimeEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
|
||||
$this->assertEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
|
||||
$this->assertEquals('2010-06-02', $form->getViewData());
|
||||
}
|
||||
|
||||
@ -80,7 +80,7 @@ class DateTypeTest extends BaseTypeTest
|
||||
|
||||
$form->submit('2010');
|
||||
|
||||
$this->assertDateTimeEquals(new \DateTime('2010-01-01 UTC'), $form->getData());
|
||||
$this->assertEquals(new \DateTime('2010-01-01 UTC'), $form->getData());
|
||||
$this->assertEquals('2010', $form->getViewData());
|
||||
}
|
||||
|
||||
@ -101,7 +101,7 @@ class DateTypeTest extends BaseTypeTest
|
||||
|
||||
$form->submit('2.6.2010');
|
||||
|
||||
$this->assertDateTimeEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
|
||||
$this->assertEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
|
||||
$this->assertEquals('02.06.2010', $form->getViewData());
|
||||
}
|
||||
|
||||
@ -194,7 +194,7 @@ class DateTypeTest extends BaseTypeTest
|
||||
|
||||
$dateTime = new \DateTime('2010-06-02 UTC');
|
||||
|
||||
$this->assertDateTimeEquals($dateTime, $form->getData());
|
||||
$this->assertEquals($dateTime, $form->getData());
|
||||
$this->assertEquals($text, $form->getViewData());
|
||||
}
|
||||
|
||||
@ -217,7 +217,7 @@ class DateTypeTest extends BaseTypeTest
|
||||
|
||||
$dateTime = new \DateTime('2010-06-02 UTC');
|
||||
|
||||
$this->assertDateTimeEquals($dateTime, $form->getData());
|
||||
$this->assertEquals($dateTime, $form->getData());
|
||||
$this->assertEquals($text, $form->getViewData());
|
||||
}
|
||||
|
||||
@ -254,7 +254,7 @@ class DateTypeTest extends BaseTypeTest
|
||||
|
||||
$form->submit('06*2010*02');
|
||||
|
||||
$this->assertDateTimeEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
|
||||
$this->assertEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
|
||||
$this->assertEquals('06*2010*02', $form->getViewData());
|
||||
}
|
||||
|
||||
@ -468,7 +468,7 @@ class DateTypeTest extends BaseTypeTest
|
||||
|
||||
// 2010-06-02 00:00:00 UTC
|
||||
// 2010-06-01 20:00:00 UTC-4
|
||||
$this->assertDateTimeEquals($dateTime, $form->getData());
|
||||
$this->assertEquals($dateTime, $form->getData());
|
||||
$this->assertEquals('01.06.2010', $form->getViewData());
|
||||
}
|
||||
|
||||
|
@ -315,7 +315,7 @@ class TimeTypeTest extends BaseTypeTest
|
||||
'second' => (int) $outputTime->format('s'),
|
||||
);
|
||||
|
||||
$this->assertDateTimeEquals($dateTime, $form->getData());
|
||||
$this->assertEquals($dateTime, $form->getData());
|
||||
$this->assertEquals($displayedData, $form->getViewData());
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user