Moved tests to tests/phpunit.

drevops · Mar 8, 2024 · 48d9999 · 48d9999
1 parent b5c19a7
commit 48d9999
Show file tree

Hide file tree

Showing 19 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml
@@ -94,7 +94,6 @@ jobs:
 
       - name: Test PHAR
         run: ./.build/git-artifact --help || exit 1
-  #;> PHP_PHAR
 
   # Demonstration of deployment in 'force-push' mode.
   deploy-force-push:

diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "DrevOps\\GitArtifact\\Tests\\": "tests"
+            "DrevOps\\GitArtifact\\Tests\\": "tests/phpunit"
         }
     },
     "config": {

diff --git a/phpcs.xml b/phpcs.xml
@@ -20,7 +20,7 @@
     @see https://github.com/squizlabs/PHP_CodeSniffer/issues/2916
     -->
     <file>src</file>
-    <file>tests</file>
+    <file>tests/phpunit</file>
 
     <rule ref="Symfony.Commenting.License.Warning">
         <exclude-pattern>*.*</exclude-pattern>

diff --git a/phpstan.neon b/phpstan.neon
@@ -8,7 +8,7 @@ parameters:
 
   paths:
     - src
-    - tests
+    - tests/phpunit
 
   excludePaths:
     - vendor/*

diff --git a/phpunit.xml b/phpunit.xml
@@ -15,7 +15,7 @@
 >
     <testsuites>
         <testsuite name="default">
-            <directory>tests</directory>
+            <directory>tests/phpunit</directory>
         </testsuite>
     </testsuites>
 

diff --git a/tests/AbstractTestCase.php → tests/phpunit/AbstractTestCase.php b/tests/AbstractTestCase.php → tests/phpunit/AbstractTestCase.php
diff --git a/tests/Exception/ErrorException.php → tests/phpunit/Exception/ErrorException.php b/tests/Exception/ErrorException.php → tests/phpunit/Exception/ErrorException.php
diff --git a/...Functional/AbstractFunctionalTestCase.php → ...Functional/AbstractFunctionalTestCase.php b/...Functional/AbstractFunctionalTestCase.php → ...Functional/AbstractFunctionalTestCase.php
diff --git a/tests/Functional/BranchTest.php → tests/phpunit/Functional/BranchTest.php b/tests/Functional/BranchTest.php → tests/phpunit/Functional/BranchTest.php
diff --git a/tests/Functional/ForcePushTest.php → tests/phpunit/Functional/ForcePushTest.php b/tests/Functional/ForcePushTest.php → tests/phpunit/Functional/ForcePushTest.php
diff --git a/tests/Functional/GeneralTest.php → tests/phpunit/Functional/GeneralTest.php b/tests/Functional/GeneralTest.php → tests/phpunit/Functional/GeneralTest.php
diff --git a/tests/Functional/README.md → tests/phpunit/Functional/README.md b/tests/Functional/README.md → tests/phpunit/Functional/README.md
diff --git a/tests/Functional/TagTest.php → tests/phpunit/Functional/TagTest.php b/tests/Functional/TagTest.php → tests/phpunit/Functional/TagTest.php
diff --git a/tests/Functional/TokenTest.php → tests/phpunit/Functional/TokenTest.php b/tests/Functional/TokenTest.php → tests/phpunit/Functional/TokenTest.php
diff --git a/tests/Traits/CommandTrait.php → tests/phpunit/Traits/CommandTrait.php b/tests/Traits/CommandTrait.php → tests/phpunit/Traits/CommandTrait.php
diff --git a/tests/Traits/MockTrait.php → tests/phpunit/Traits/MockTrait.php b/tests/Traits/MockTrait.php → tests/phpunit/Traits/MockTrait.php
@@ -2,9 +2,6 @@
 
 namespace DrevOps\GitArtifact\Tests\Traits;
 
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\MockObject\Stub\Stub;
-
 /**
  * Trait MockTrait.
  *

diff --git a/tests/Traits/ReflectionTrait.php → tests/phpunit/Traits/ReflectionTrait.php b/tests/Traits/ReflectionTrait.php → tests/phpunit/Traits/ReflectionTrait.php
diff --git a/tests/Unit/AbstractUnitTestCase.php → tests/phpunit/Unit/AbstractUnitTestCase.php b/tests/Unit/AbstractUnitTestCase.php → tests/phpunit/Unit/AbstractUnitTestCase.php
diff --git a/tests/Unit/ExcludeTest.php → tests/phpunit/Unit/ExcludeTest.php b/tests/Unit/ExcludeTest.php → tests/phpunit/Unit/ExcludeTest.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ parameters: @@
       paths:
         - src
-        - tests
+        - tests/phpunit
       excludePaths:
         - vendor/*
@@ Expand Down @@