From 52ab20607c7343d84cb1bff5324e4a6066ad74fa Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 13 Mar 2015 18:08:02 +0100 Subject: [PATCH] [2.3] add @group legacy --- .travis.yml | 2 +- .../ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php | 3 +++ .../Tests/TokenParser/LegacyRenderTokenParserTest.php | 3 +++ src/Symfony/Component/Console/Tests/ApplicationTest.php | 6 ++++++ src/Symfony/Component/Console/Tests/Command/CommandTest.php | 6 ++++++ .../Component/Console/Tests/Input/InputDefinitionTest.php | 6 ++++++ src/Symfony/Component/Form/Tests/AbstractLayoutTest.php | 6 ++++++ .../EventListener/LegacyBindRequestListenerTest.php | 1 + .../Component/Routing/Tests/Annotation/RouteTest.php | 3 +++ src/Symfony/Component/Routing/Tests/RouteTest.php | 3 +++ 10 files changed, 38 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 06fc091ab5..fb8f8acbaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,5 +46,5 @@ install: script: - if [ "$deps" = "no" ]; then echo "$components" | parallel --gnu --keep-order 'echo -e "\\nRunning {} tests"; phpunit --exclude-group tty,benchmark,intl-data {} || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi; - if [ "$deps" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi; - - if [ "$deps" = "high" ]; then echo "$components" | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; phpunit --exclude-group tty,benchmark,intl-data,legacy || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi; + - if [ "$deps" = "high" ]; then echo "$components" | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi; - if [ "$deps" = "low" ]; then echo "$components" | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi; diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php index 3fdb978666..dd53bf4226 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/UnloadedEntityChoiceListSingleIntIdTest.php @@ -21,6 +21,9 @@ class UnloadedEntityChoiceListSingleIntIdTest extends AbstractEntityChoiceListSi $this->markTestSkipped('Non-existing values are not detected for unloaded choice lists.'); } + /** + * @group legacy + */ public function testLegacyGetIndicesForValuesIgnoresNonExistingValues() { $this->markTestSkipped('Non-existing values are not detected for unloaded choice lists.'); diff --git a/src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php b/src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php index a11ae8b9b8..57e361b5db 100644 --- a/src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php +++ b/src/Symfony/Bundle/TwigBundle/Tests/TokenParser/LegacyRenderTokenParserTest.php @@ -15,6 +15,9 @@ use Symfony\Bundle\TwigBundle\Tests\TestCase; use Symfony\Bundle\TwigBundle\TokenParser\RenderTokenParser; use Symfony\Bundle\TwigBundle\Node\RenderNode; +/** + * @group legacy + */ class LegacyRenderTokenParserTest extends TestCase { protected function setUp() diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php index 6180b6122d..80ab7fb5ed 100644 --- a/src/Symfony/Component/Console/Tests/ApplicationTest.php +++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php @@ -424,6 +424,9 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase } } + /** + * @group legacy + */ public function testLegacyAsText() { $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED); @@ -435,6 +438,9 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase $this->assertStringEqualsFile(self::$fixturesPath.'/application_astext2.txt', $this->normalizeLineBreaks($application->asText('foo')), '->asText() returns a text representation of the application'); } + /** + * @group legacy + */ public function testLegacyAsXml() { $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED); diff --git a/src/Symfony/Component/Console/Tests/Command/CommandTest.php b/src/Symfony/Component/Console/Tests/Command/CommandTest.php index a9455ca71d..1249dbc5c4 100644 --- a/src/Symfony/Component/Console/Tests/Command/CommandTest.php +++ b/src/Symfony/Component/Console/Tests/Command/CommandTest.php @@ -318,6 +318,9 @@ class CommandTest extends \PHPUnit_Framework_TestCase $output->writeln('from the code...'); } + /** + * @group legacy + */ public function testLegacyAsText() { $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED); @@ -329,6 +332,9 @@ class CommandTest extends \PHPUnit_Framework_TestCase $this->assertStringEqualsFile(self::$fixturesPath.'/command_astext.txt', $command->asText(), '->asText() returns a text representation of the command'); } + /** + * @group legacy + */ public function testLegacyAsXml() { $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED); diff --git a/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php b/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php index 18bcb94b47..a73e3f467e 100644 --- a/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php +++ b/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php @@ -373,6 +373,9 @@ class InputDefinitionTest extends \PHPUnit_Framework_TestCase $this->assertEquals('foo1 ... [fooN]', $definition->getSynopsis(), '->getSynopsis() returns a synopsis of arguments and options'); } + /** + * @group legacy + */ public function testLegacyAsText() { $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED); @@ -390,6 +393,9 @@ class InputDefinitionTest extends \PHPUnit_Framework_TestCase $this->assertStringEqualsFile(self::$fixtures.'/definition_astext.txt', $definition->asText(), '->asText() returns a textual representation of the InputDefinition'); } + /** + * @group legacy + */ public function testLegacyAsXml() { $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED); diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php index cfc41cdf48..f741ce0b68 100644 --- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php @@ -122,6 +122,9 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg abstract protected function setTheme(FormView $view, array $themes); + /** + * @group legacy + */ public function testLegacyEnctype() { $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED); @@ -133,6 +136,9 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg $this->assertEquals('enctype="multipart/form-data"', $this->renderEnctype($form->createView())); } + /** + * @group legacy + */ public function testLegacyNoEnctype() { $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED); diff --git a/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php index 183d3a7a3a..521f7b3c17 100644 --- a/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/EventListener/LegacyBindRequestListenerTest.php @@ -20,6 +20,7 @@ use Symfony\Component\HttpFoundation\File\UploadedFile; /** * @author Bernhard Schussek + * @group legacy */ class LegacyBindRequestListenerTest extends \PHPUnit_Framework_TestCase { diff --git a/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php b/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php index 5cdf11f491..00219f08d1 100644 --- a/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php +++ b/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php @@ -46,6 +46,9 @@ class RouteTest extends \PHPUnit_Framework_TestCase ); } + /** + * @group legacy + */ public function testLegacyGetPattern() { $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED); diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php index 8b8f02fb42..fdb8bbfbd8 100644 --- a/src/Symfony/Component/Routing/Tests/RouteTest.php +++ b/src/Symfony/Component/Routing/Tests/RouteTest.php @@ -201,6 +201,9 @@ class RouteTest extends \PHPUnit_Framework_TestCase $this->assertNotSame($compiled, $route->compile(), '->compile() recompiles if the route was modified'); } + /** + * @group legacy + */ public function testLegacyPattern() { $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);