Merge pull request #90 from FelixJacobi/split-integration-test-suite

Split integration test suite into non-invasive integration and invasive functional suite

Author: sualko

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
     - name: Install php dependencies
       run: composer install --dev --no-interaction
     - name: Execute tests without coverage
-      run: vendor/bin/phpunit --testsuite="BigBlueButton test suite"
+      run: vendor/bin/phpunit --testsuite="BigBlueButton unit test suite,BigBlueButton integration test suite"
 
   PHP:
     name: PHP ${{ matrix.php-versions }}
@@ -66,7 +66,7 @@ jobs:
       if: ${{ !matrix.experimental }}
       run: |
         mkdir -p build/logs
-        vendor/bin/phpunit --coverage-clover=build/logs/coverage.xml --testsuite="BigBlueButton test suite"
+        vendor/bin/phpunit --coverage-clover=build/logs/coverage.xml --testsuite="BigBlueButton unit test suite,BigBlueButton integration test suite"
     - name: Execute tests without coverage
       if: ${{ matrix.experimental }}
       run: vendor/bin/phpunit --testsuite="BigBlueButton test suite"

composer.json

@@ -94,9 +94,15 @@
       "BigBlueButton\\": ["src", "tests/integration"]
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "BigBlueButton\\Tests\\Functional\\": ["tests/functional"]
+    }
+  },
   "scripts": {
-    "test": "vendor/bin/phpunit",
-    "test-integration": "vendor/bin/phpunit --testsuite=\"BigBlueButton integration test suite\" --exclude-group=integration-legacy",
+    "test": "vendor/bin/phpunit  --testsuite=\"BigBlueButton unit test suite\"",
+    "test-integration": "vendor/bin/phpunit  --testsuite=\"BigBlueButton integration test suite\"",
+    "test-functional": "vendor/bin/phpunit --testsuite=\"BigBlueButton functional test suite\" --exclude-group=functional-legacy",
     "cs-fix": "vendor/bin/php-cs-fixer fix --allow-risky=yes",
     "cs-test": "vendor/bin/php-cs-fixer fix --dry-run --allow-risky=yes",
     "psalm": "psalm --threads=1",
@@ -111,7 +117,7 @@
         "vendor/bin/php-cs-fixer fix --dry-run --allow-risky=yes"
       ],
       "pre-push": [
-        "vendor/bin/phpunit --testsuite=\"BigBlueButton test suite\"",
+        "vendor/bin/phpunit --testsuite=\"BigBlueButton unit test suite,BigBlueButton integration test suite\"",
         "vendor/bin/psalm --threads=1"
       ],
       "post-merge": "composer install",

phpunit-integration.xml.dist

@@ -18,12 +18,15 @@
     </filter>
 
     <testsuites>
-        <testsuite name="BigBlueButton test suite">
+        <testsuite name="BigBlueButton unit test suite">
             <directory>./tests/unit/</directory>
         </testsuite>
         <testsuite name="BigBlueButton integration test suite">
             <directory>./tests/integration/</directory>
         </testsuite>
+        <testsuite name="BigBlueButton functional test suite">
+            <directory>./tests/functional/</directory>
+        </testsuite>
     </testsuites>
 
 </phpunit>

phpunit.xml.dist

@@ -16,8 +16,9 @@
  * You should have received a copy of the GNU Lesser General Public License along
  * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
  */
-namespace BigBlueButton;
+namespace BigBlueButton\Tests\Functional;
 
+use BigBlueButton\BigBlueButton;
 use BigBlueButton\Http\Transport\TransportInterface;
 use BigBlueButton\Parameters\DeleteRecordingsParameters;
 use BigBlueButton\Parameters\EndMeetingParameters;
@@ -26,12 +27,13 @@
 use BigBlueButton\Parameters\IsMeetingRunningParameters;
 use BigBlueButton\Parameters\JoinMeetingParameters;
 use BigBlueButton\Parameters\PublishRecordingsParameters;
+use BigBlueButton\TestCase;
 
 /**
  * Class BigBlueButtonIntegrationTest
  * @package BigBlueButton
  */
-abstract class AbstractBigBlueButtonIntegrationTest extends TestCase
+abstract class AbstractBigBlueButtonFunctionalTest extends TestCase
 {
     /**
      * @var BigBlueButton
@@ -200,7 +202,7 @@ public function testJoinMeeting()
     /* Get Default Config XML */
 
     /**
-     * @group integration-legacy
+     * @group functional-legacy
      */
     public function testGetDefaultConfigXML()
     {
@@ -209,7 +211,7 @@ public function testGetDefaultConfigXML()
     }
 
     /**
-     * @group integration-legacy
+     * @group functional-legacy
      */
     public function testSetConfigXML()
     {

…AbstractBigBlueButtonIntegrationTest.php …/AbstractBigBlueButtonFunctionalTest.phptests/integration/AbstractBigBlueButtonIntegrationTest.php renamed to tests/functional/AbstractBigBlueButtonFunctionalTest.php tests/integration/AbstractBigBlueButtonIntegrationTest.php renamed to tests/functional/AbstractBigBlueButtonFunctionalTest.php

@@ -18,12 +18,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with littleredbutton/bigbluebutton-api-php. If not, see <http://www.gnu.org/licenses/>.
  */
-namespace BigBlueButton;
+namespace BigBlueButton\Tests\Functional;
 
 use BigBlueButton\Http\Transport\CurlTransport;
 use BigBlueButton\Http\Transport\TransportInterface;
 
-final class BigBlueButtonWithCurlTransportTest extends AbstractBigBlueButtonIntegrationTest
+final class BigBlueButtonWithCurlTransportTest extends AbstractBigBlueButtonFunctionalTest
 {
     /**
      * {@inheritDoc}

…n/BigBlueButtonWithCurlTransportTest.php …l/BigBlueButtonWithCurlTransportTest.phptests/integration/BigBlueButtonWithCurlTransportTest.php renamed to tests/functional/BigBlueButtonWithCurlTransportTest.php tests/integration/BigBlueButtonWithCurlTransportTest.php renamed to tests/functional/BigBlueButtonWithCurlTransportTest.php

@@ -18,15 +18,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with littleredbutton/bigbluebutton-api-php. If not, see <http://www.gnu.org/licenses/>.
  */
-namespace BigBlueButton;
+namespace BigBlueButton\Tests\Functional;
 
 use BigBlueButton\Http\Transport\Bridge\PsrHttpClient\PsrHttpClientTransport;
 use BigBlueButton\Http\Transport\TransportInterface;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Symfony\Component\HttpClient\CurlHttpClient;
 use Symfony\Component\HttpClient\Psr18Client;
 
-final class BigBlueButtonWithPsrHttpClientTransport extends AbstractBigBlueButtonIntegrationTest
+final class BigBlueButtonWithPsrHttpClientTransport extends AbstractBigBlueButtonFunctionalTest
 {
     /**
      * {@inheritDoc}

…BlueButtonWithPsrHttpClientTransport.php …BlueButtonWithPsrHttpClientTransport.phptests/integration/BigBlueButtonWithPsrHttpClientTransport.php renamed to tests/functional/BigBlueButtonWithPsrHttpClientTransport.php tests/integration/BigBlueButtonWithPsrHttpClientTransport.php renamed to tests/functional/BigBlueButtonWithPsrHttpClientTransport.php

@@ -18,12 +18,12 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with littleredbutton/bigbluebutton-api-php. If not, see <http://www.gnu.org/licenses/>.
  */
-namespace BigBlueButton;
+namespace BigBlueButton\Tests\Functional;
 
 use BigBlueButton\Http\Transport\Bridge\SymfonyHttpClient\SymfonyHttpClientTransport;
 use BigBlueButton\Http\Transport\TransportInterface;
 
-final class BigBlueButtonWithSymfonyHttpClientTransportTest extends AbstractBigBlueButtonIntegrationTest
+final class BigBlueButtonWithSymfonyHttpClientTransportTest extends AbstractBigBlueButtonFunctionalTest
 {
     /**
      * {@inheritDoc}

…onWithSymfonyHttpClientTransportTest.php …onWithSymfonyHttpClientTransportTest.phptests/integration/BigBlueButtonWithSymfonyHttpClientTransportTest.php renamed to tests/functional/BigBlueButtonWithSymfonyHttpClientTransportTest.php tests/integration/BigBlueButtonWithSymfonyHttpClientTransportTest.php renamed to tests/functional/BigBlueButtonWithSymfonyHttpClientTransportTest.php

@@ -121,6 +121,10 @@ public function testRequestWithoutPayload(): void
 
     public function testRequestWithCookie(): void
     {
+        if (\PHP_VERSION_ID >= 80000) {
+            self::markTestSkipped('Broken on PHP 8. To be fixed in https://github.com/littleredbutton/bigbluebutton-api-php/pull/78.');
+        }
+
         $request   = new TransportRequest('http://localhost:8057/cookie.php', '', 'application/xml');
         $transport = new CurlTransport();