From 0b70d02e3f2b312bab7fd0fb1b4936e4569bfe8b Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 7 Apr 2015 13:23:11 +0200 Subject: [PATCH] Remove some useless @group annotations --- .travis.yml | 4 ++-- .../Tests/Validator/Constraints/UniqueEntityValidatorTest.php | 4 ---- .../Bundle/FrameworkBundle/Tests/Functional/FragmentTest.php | 3 --- .../Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php | 3 --- .../Bundle/FrameworkBundle/Tests/Functional/SessionTest.php | 3 --- .../FrameworkBundle/Tests/Functional/SubRequestsTest.php | 3 --- .../SecurityBundle/Tests/Functional/CsrfFormLoginTest.php | 3 --- .../Tests/Functional/FirewallEntryPointTest.php | 3 --- .../Bundle/SecurityBundle/Tests/Functional/FormLoginTest.php | 3 --- .../Tests/Functional/SecurityRoutingIntegrationTest.php | 2 -- .../Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php | 3 --- src/Symfony/Component/Finder/Tests/FinderTest.php | 3 --- 12 files changed, 2 insertions(+), 35 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0943d93975..a949e64237 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,5 +45,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 || (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; + - if [ "$deps" = "high" ]; then echo "$components" | parallel --gnu --keep-order -j10% '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 -j10% '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/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php index 4fefe1d523..9c2b510d34 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php @@ -330,9 +330,6 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest $this->assertNoViolation(); } - /** - * @group GH-1635 - */ public function testAssociatedEntity() { $constraint = new UniqueEntity(array( @@ -389,7 +386,6 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest /** * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException * @expectedExceptionMessage Associated entities are not allowed to have more than one identifier field - * @group GH-1635 */ public function testAssociatedCompositeEntity() { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/FragmentTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/FragmentTest.php index eafe6bd43e..dff65d636c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/FragmentTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/FragmentTest.php @@ -11,9 +11,6 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\Functional; -/** - * @group functional - */ class FragmentTest extends WebTestCase { /** diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php index d4eb927ff8..a8741124fd 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php @@ -11,9 +11,6 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\Functional; -/** - * @group functional - */ class ProfilerTest extends WebTestCase { /** diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php index 3e90e9d7a0..415e031189 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php @@ -11,9 +11,6 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\Functional; -/** - * @group functional - */ class SessionTest extends WebTestCase { /** diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SubRequestsTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SubRequestsTest.php index 2676653b1e..2aaeb220f7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SubRequestsTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SubRequestsTest.php @@ -11,9 +11,6 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\Functional; -/** - * @group functional - */ class SubRequestsTest extends WebTestCase { public function testStateAfterSubRequest() diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php index 4c4c1ac295..c2299c9a51 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/CsrfFormLoginTest.php @@ -11,9 +11,6 @@ namespace Symfony\Bundle\SecurityBundle\Tests\Functional; -/** - * @group functional - */ class CsrfFormLoginTest extends WebTestCase { /** diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FirewallEntryPointTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FirewallEntryPointTest.php index 656d493009..269cea3b72 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FirewallEntryPointTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FirewallEntryPointTest.php @@ -13,9 +13,6 @@ namespace Symfony\Bundle\SecurityBundle\Tests\Functional; use Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FirewallEntryPointBundle\Security\EntryPointStub; -/** - * @group functional - */ class FirewallEntryPointTest extends WebTestCase { public function testItUsesTheConfiguredEntryPointWhenUsingUnknownCredentials() diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FormLoginTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FormLoginTest.php index 0dc038e1df..1b8415ad2a 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FormLoginTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/FormLoginTest.php @@ -11,9 +11,6 @@ namespace Symfony\Bundle\SecurityBundle\Tests\Functional; -/** - * @group functional - */ class FormLoginTest extends WebTestCase { /** diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php index 8239f99ea9..5beec6f927 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SecurityRoutingIntegrationTest.php @@ -65,7 +65,6 @@ class SecurityRoutingIntegrationTest extends WebTestCase /** * @dataProvider getConfigs - * @group ip_whitelist */ public function testSecurityConfigurationForSingleIPAddress($config) { @@ -78,7 +77,6 @@ class SecurityRoutingIntegrationTest extends WebTestCase /** * @dataProvider getConfigs - * @group ip_whitelist */ public function testSecurityConfigurationForMultipleIPAddresses($config) { diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php index d9472f2f7d..f4b3d27f21 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php @@ -11,9 +11,6 @@ namespace Symfony\Bundle\SecurityBundle\Tests\Functional; -/** - * @group functional - */ class SwitchUserTest extends WebTestCase { /** diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php index 67625e9681..c5c282b234 100644 --- a/src/Symfony/Component/Finder/Tests/FinderTest.php +++ b/src/Symfony/Component/Finder/Tests/FinderTest.php @@ -132,8 +132,6 @@ class FinderTest extends Iterator\RealIteratorTestCase /** * @dataProvider getRegexNameTestData - * - * @group regexName */ public function testRegexName($adapter, $regex) { @@ -495,7 +493,6 @@ class FinderTest extends Iterator\RealIteratorTestCase /** * @dataProvider getContainsTestData - * @group grep */ public function testContains($adapter, $matchPatterns, $noMatchPatterns, $expected) {