Skip to content

Commit

Permalink
Merge pull request ronanguilloux#93 from Soullivaneuh/phpunit-testsuite
Browse files Browse the repository at this point in the history
Use PHPUnit test suites instead of groups
  • Loading branch information
soullivaneuh committed Apr 15, 2016
2 parents d5629c5 + e6ddfd8 commit d07dcba
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 23 deletions.
8 changes: 2 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ matrix:
include:
- php: 5.4
env: COMPOSER_FLAGS="--prefer-lowest"
- php: 5.6
env: PHPUNIT_OPTION="--group symfony"
- php: 5.6
env: SYMFONY_VERSION=2.3.*
- php: 5.6
Expand All @@ -31,8 +29,6 @@ matrix:
env: SYMFONY_VERSION=3.0.*
- php: 5.6
env: SYMFONY_VERSION=3.1.*@dev
- php: 5.6
env: PHPUNIT_OPTION="--group silex"
- php: 5.6
env: SILEX_VERSION=1.1.*
- php: 5.6
Expand Down Expand Up @@ -72,8 +68,8 @@ install:
- composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
- composer global require phpunit/phpunit:@stable satooshi/php-coveralls:@stable codeclimate/php-test-reporter:@stable --no-update
- composer global update --prefer-dist --no-interaction
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; PHPUNIT_OPTION="--group symfony"; fi;
- if [ "$SILEX_VERSION" != "" ]; then composer require "silex/silex:${SILEX_VERSION}" --no-update; PHPUNIT_OPTION="--group silex"; fi;
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; PHPUNIT_OPTION="--testsuite symfony"; fi;
- if [ "$SILEX_VERSION" != "" ]; then composer require "silex/silex:${SILEX_VERSION}" --no-update; PHPUNIT_OPTION="--testsuite silex"; fi;
- if [ "$ISOCODES_VERSION" != "" ]; then composer require "ronanguilloux/isocodes:${ISOCODES_VERSION}" --no-update; fi;
- composer update --prefer-dist --no-interaction $COMPOSER_FLAGS

Expand Down
19 changes: 8 additions & 11 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,14 @@
stopOnFailure="false"
syntaxCheck="false">
<testsuites>
<testsuite name="IsoCodesValidator Test Suite">
<directory >./tests/</directory>
<testsuite name="constraints">
<directory >./tests/Constraints</directory>
</testsuite>
<testsuite name="symfony">
<directory >./tests/Bundle</directory>
</testsuite>
<testsuite name="silex">
<directory >./tests/Provider</directory>
</testsuite>
</testsuites>

Expand All @@ -21,13 +27,4 @@
<directory>./src</directory>
</whitelist>
</filter>

<groups>
<exclude>
<group>symfony</group>
</exclude>
<exclude>
<group>silex</group>
</exclude>
</groups>
</phpunit>
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

/**
* @author Sullivan Senechal <[email protected]>
*
* @group symfony
*/
class TranslationPassTest extends AbstractCompilerPassTestCase
{
Expand Down
2 changes: 0 additions & 2 deletions tests/Bundle/SLLHIsoCodesValidatorBundleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

/**
* @author Sullivan Senechal <[email protected]>
*
* @group symfony
*/
class SLLHIsoCodesValidatorBundleTest extends AbstractContainerBuilderTestCase
{
Expand Down
2 changes: 0 additions & 2 deletions tests/Provider/IsoCodesValidatorServiceProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

/**
* @author Sullivan Senechal <[email protected]>
*
* @group silex
*/
class IsoCodesValidatorServiceProviderTest extends \PHPUnit_Framework_TestCase
{
Expand Down

0 comments on commit d07dcba

Please sign in to comment.