PHPUnit: Use testsuites instead of groups

Setono · Oct 1, 2024 · c16ca58 · c16ca58
1 parent cc7cb99
commit c16ca58
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -196,7 +196,7 @@ jobs:
                     dependency-versions: "${{ matrix.dependencies }}"
 
             -   name: "Run phpunit"
-                run: "composer phpunit"
+                run: "vendor/bin/phpunit --testsuite Unit"
 
     integration-tests:
         name: "Integration tests (PHP${{ matrix.php-version }} | Deps: ${{ matrix.dependencies }} | SF${{ matrix.symfony }})"
@@ -315,7 +315,7 @@ jobs:
                     dependency-versions: "${{ matrix.dependencies }}"
 
             -   name: "Collect code coverage with pcov and phpunit/phpunit"
-                run: "vendor/bin/phpunit --coverage-clover=.build/logs/clover.xml"
+                run: "vendor/bin/phpunit --coverage-clover=.build/logs/clover.xml --testsuite Unit"
 
             -   name: "Send code coverage report to Codecov.io"
                 uses: "codecov/codecov-action@v4"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,8 +8,11 @@
         </include>
     </coverage>
     <testsuites>
-        <testsuite name="SetonoSyliusMeilisearchPlugin Test Suite">
-            <directory>tests</directory>
+        <testsuite name="Unit">
+            <directory>tests/Unit</directory>
+        </testsuite>
+        <testsuite name="Functional">
+            <directory>tests/Functional</directory>
         </testsuite>
     </testsuites>
     <php>

diff --git a/tests/Functional/DataMapper/Product/AttributesDataMapperTest.php b/tests/Functional/DataMapper/Product/AttributesDataMapperTest.php
@@ -2,16 +2,16 @@
 
 declare(strict_types=1);
 
-namespace Setono\SyliusMeilisearchPlugin\Tests\Functional;
+namespace Setono\SyliusMeilisearchPlugin\Tests\Functional\DataMapper\Product;
 
 use Setono\SyliusMeilisearchPlugin\Config\Index;
 use Setono\SyliusMeilisearchPlugin\DataMapper\Product\AttributesDataMapper;
 use Setono\SyliusMeilisearchPlugin\Provider\IndexScope\IndexScope;
 use Setono\SyliusMeilisearchPlugin\Tests\Application\Document\Product as ProductDocument;
 use Setono\SyliusMeilisearchPlugin\Tests\Application\Entity\Product;
+use Setono\SyliusMeilisearchPlugin\Tests\Functional\FunctionalTestCase;
 use Sylius\Component\Core\Repository\ProductRepositoryInterface;
 
-/** @group functional */
 final class AttributesDataMapperTest extends FunctionalTestCase
 {
     public function testItMapsProductAttributesToDocumentProperties(): void

diff --git a/tests/Functional/DataMapper/Product/OptionsDataMapperTest.php b/tests/Functional/DataMapper/Product/OptionsDataMapperTest.php
@@ -2,16 +2,16 @@
 
 declare(strict_types=1);
 
-namespace Setono\SyliusMeilisearchPlugin\Tests\Functional;
+namespace Setono\SyliusMeilisearchPlugin\Tests\Functional\DataMapper\Product;
 
 use Setono\SyliusMeilisearchPlugin\Config\Index;
 use Setono\SyliusMeilisearchPlugin\DataMapper\Product\OptionsDataMapper;
 use Setono\SyliusMeilisearchPlugin\Provider\IndexScope\IndexScope;
 use Setono\SyliusMeilisearchPlugin\Tests\Application\Document\Product as ProductDocument;
 use Setono\SyliusMeilisearchPlugin\Tests\Application\Entity\Product;
+use Setono\SyliusMeilisearchPlugin\Tests\Functional\FunctionalTestCase;
 use Sylius\Component\Core\Repository\ProductRepositoryInterface;
 
-/** @group functional */
 final class OptionsDataMapperTest extends FunctionalTestCase
 {
     public function testItMapsProductOptionsToDocumentProperties(): void

diff --git a/tests/Functional/SearchFormBuilderTest.php b/tests/Functional/SearchFormBuilderTest.php
@@ -9,7 +9,6 @@
 use Setono\SyliusMeilisearchPlugin\Form\Builder\SearchFormBuilderInterface;
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
 
-/** @group functional */
 final class SearchFormBuilderTest extends FunctionalTestCase
 {
     public function testItCreatesFormForSearchResultsWithProperlySortedFacetValues(): void

diff --git a/tests/Functional/SearchPaginationTest.php b/tests/Functional/SearchPaginationTest.php
@@ -8,7 +8,6 @@
 use Setono\SyliusMeilisearchPlugin\Engine\SearchRequest;
 use Setono\SyliusMeilisearchPlugin\Tests\Functional\FunctionalTestCase;
 
-/** @group functional */
 final class SearchPaginationTest extends FunctionalTestCase
 {
     public function testItPaginatesSearchResults(): void

diff --git a/tests/Functional/SearchSortingTest.php b/tests/Functional/SearchSortingTest.php
@@ -14,7 +14,6 @@
 use Sylius\Component\Core\Repository\ProductRepositoryInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 
-/** @group functional */
 final class SearchSortingTest extends FunctionalTestCase
 {
     public function testItSortsSearchResultsByLowestPrice(): void

diff --git a/tests/Functional/SearchTest.php b/tests/Functional/SearchTest.php
@@ -7,7 +7,6 @@
 use Setono\SyliusMeilisearchPlugin\Engine\SearchEngine;
 use Setono\SyliusMeilisearchPlugin\Engine\SearchRequest;
 
-/** @group functional */
 final class SearchTest extends FunctionalTestCase
 {
     public function testItProvidesSearchResults(): void