#6 Tests moved to /tests, .gitattributes added to exclude unnecessary…

… files from export (#8)
michalbiarda · Mar 30, 2021 · cbdd3ab · cbdd3ab
1 parent 12873a1
commit cbdd3ab
Show file tree

Hide file tree

Showing 61 changed files with 17 additions and 6 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,5 @@
+/tests export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+azure-pipelines.yml export-ignore
+phpcs.ruleset.xml export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 .idea
 .phpunit.result.cache
 vendor
-src/Test/phpunit_integration.xml
+tests/phpunit_integration.xml
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -34,7 +34,7 @@ steps:
 - script: ./vendor/bin/phpmd ./src/ ansi controversial,naming --exclude /Model/*
   displayName: 'Run PHP mess detector for other rulesets'
 
-- script: ./vendor/bin/phpunit --no-configuration --log-junit $(System.DefaultWorkingDirectory)/junit-unit-report.xml ./src/Test/Unit/
+- script: ./vendor/bin/phpunit --no-configuration --log-junit $(System.DefaultWorkingDirectory)/junit-unit-report.xml ./tests/Unit/
   displayName: 'Run unit tests with phpunit'
 
 - task: PublishTestResults@2
@@ -52,9 +52,9 @@ steps:
 
 - script: |
     echo Linking $(integrationTestsConfig.secureFilePath) to the integration tests directory...
-    sudo ln -s -t $(System.DefaultWorkingDirectory)/src/Test $(integrationTestsConfig.secureFilePath)
+    sudo ln -s -t $(System.DefaultWorkingDirectory)/tests $(integrationTestsConfig.secureFilePath)
 
-- script: ./vendor/bin/phpunit --configuration ./src/Test/phpunit_integration.xml --log-junit $(System.DefaultWorkingDirectory)/junit-integration-report.xml
+- script: ./vendor/bin/phpunit --configuration ./tests/phpunit_integration.xml --log-junit $(System.DefaultWorkingDirectory)/junit-integration-report.xml
   displayName: 'Run integration tests with phpunit'
 
 - task: PublishTestResults@2

diff --git a/composer.json b/composer.json
@@ -1,6 +1,7 @@
 {
   "name": "michalbiarda/shipx-php-sdk",
-  "version": "1.0.0-alpha6",
+  "description": "PHP SDK for Inpost ShipX API",
+  "version": "1.0.0-alpha7",
   "authors": [
     {
       "email": "m.biarda@gmail.com",
@@ -22,6 +23,11 @@
       "MB\\ShipXSDK\\": "src/"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "MB\\ShipXSDK\\Test\\": "tests/"
+    }
+  },
   "license": "Beerware",
   "require-dev": {
     "phpunit/phpunit": "^9.4",

diff --git a/...ration/Client/AddressBookResourceTest.php → ...ration/Client/AddressBookResourceTest.php b/...ration/Client/AddressBookResourceTest.php → ...ration/Client/AddressBookResourceTest.php
diff --git a/...Test/Integration/Client/ClientFactory.php → tests/Integration/Client/ClientFactory.php b/...Test/Integration/Client/ClientFactory.php → tests/Integration/Client/ClientFactory.php
diff --git a/...st/Integration/Client/MpkResourceTest.php → tests/Integration/Client/MpkResourceTest.php b/...st/Integration/Client/MpkResourceTest.php → tests/Integration/Client/MpkResourceTest.php
diff --git a/...ation/Client/OrganizationResourceTest.php → ...ation/Client/OrganizationResourceTest.php b/...ation/Client/OrganizationResourceTest.php → ...ation/Client/OrganizationResourceTest.php
diff --git a/.../Integration/Client/PointResourceTest.php → .../Integration/Client/PointResourceTest.php b/.../Integration/Client/PointResourceTest.php → .../Integration/Client/PointResourceTest.php
diff --git a/...Integration/Client/ReportResourceTest.php → ...Integration/Client/ReportResourceTest.php b/...Integration/Client/ReportResourceTest.php → ...Integration/Client/ReportResourceTest.php
diff --git a/...tion/Client/SendingMethodResourceTest.php → ...tion/Client/SendingMethodResourceTest.php b/...tion/Client/SendingMethodResourceTest.php → ...tion/Client/SendingMethodResourceTest.php
diff --git a/...ntegration/Client/ServiceResourceTest.php → ...ntegration/Client/ServiceResourceTest.php b/...ntegration/Client/ServiceResourceTest.php → ...ntegration/Client/ServiceResourceTest.php
diff --git a/...tegration/Client/ShipmentResourceTest.php → ...tegration/Client/ShipmentResourceTest.php b/...tegration/Client/ShipmentResourceTest.php → ...tegration/Client/ShipmentResourceTest.php
diff --git a/...Integration/Client/StatusResourceTest.php → ...Integration/Client/StatusResourceTest.php b/...Integration/Client/StatusResourceTest.php → ...Integration/Client/StatusResourceTest.php
diff --git a/src/Test/Integration/Client/TestCase.php → tests/Integration/Client/TestCase.php b/src/Test/Integration/Client/TestCase.php → tests/Integration/Client/TestCase.php
diff --git a/...tegration/Client/TrackingResourceTest.php → ...tegration/Client/TrackingResourceTest.php b/...tegration/Client/TrackingResourceTest.php → ...tegration/Client/TrackingResourceTest.php
diff --git a/src/Test/Integration/Config.php → tests/Integration/Config.php b/src/Test/Integration/Config.php → tests/Integration/Config.php
diff --git a/src/Test/Unit/Request/RequestFactoryTest.php → tests/Unit/Request/RequestFactoryTest.php b/src/Test/Unit/Request/RequestFactoryTest.php → tests/Unit/Request/RequestFactoryTest.php
diff --git a/...it/Response/HttpResponseProcessorTest.php → ...it/Response/HttpResponseProcessorTest.php b/...it/Response/HttpResponseProcessorTest.php → ...it/Response/HttpResponseProcessorTest.php
diff --git a/...est/Unit/Response/ResponseFactoryTest.php → tests/Unit/Response/ResponseFactoryTest.php b/...est/Unit/Response/ResponseFactoryTest.php → tests/Unit/Response/ResponseFactoryTest.php
diff --git a/...it/Stub/HttpResponse/AbstractResponse.php → ...it/Stub/HttpResponse/AbstractResponse.php b/...it/Stub/HttpResponse/AbstractResponse.php → ...it/Stub/HttpResponse/AbstractResponse.php
diff --git a/...tpResponse/AbstractStreamWithContents.php → ...tpResponse/AbstractStreamWithContents.php b/...tpResponse/AbstractStreamWithContents.php → ...tpResponse/AbstractStreamWithContents.php
diff --git a/.../Unit/Stub/HttpResponse/ErrorResponse.php → .../Unit/Stub/HttpResponse/ErrorResponse.php b/.../Unit/Stub/HttpResponse/ErrorResponse.php → .../Unit/Stub/HttpResponse/ErrorResponse.php
diff --git a/...t/Stub/HttpResponse/NoContentResponse.php → ...t/Stub/HttpResponse/NoContentResponse.php b/...t/Stub/HttpResponse/NoContentResponse.php → ...t/Stub/HttpResponse/NoContentResponse.php
diff --git a/...est/Unit/Stub/HttpResponse/OkResponse.php → tests/Unit/Stub/HttpResponse/OkResponse.php b/...est/Unit/Stub/HttpResponse/OkResponse.php → tests/Unit/Stub/HttpResponse/OkResponse.php
diff --git a/...st/Unit/Stub/HttpResponse/Response200.php → tests/Unit/Stub/HttpResponse/Response200.php b/...st/Unit/Stub/HttpResponse/Response200.php → tests/Unit/Stub/HttpResponse/Response200.php
diff --git a/...ttpResponse/Response200WithBinaryBody.php → ...ttpResponse/Response200WithBinaryBody.php b/...ttpResponse/Response200WithBinaryBody.php → ...ttpResponse/Response200WithBinaryBody.php
diff --git a/...HttpResponse/Response200WithErrorData.php → ...HttpResponse/Response200WithErrorData.php b/...HttpResponse/Response200WithErrorData.php → ...HttpResponse/Response200WithErrorData.php
diff --git a/...Response/Response200WithJsonArrayBody.php → ...Response/Response200WithJsonArrayBody.php b/...Response/Response200WithJsonArrayBody.php → ...Response/Response200WithJsonArrayBody.php
diff --git a/...tpResponse/Response200WithoutJsonBody.php → ...tpResponse/Response200WithoutJsonBody.php b/...tpResponse/Response200WithoutJsonBody.php → ...tpResponse/Response200WithoutJsonBody.php
diff --git a/...Response/Response200WithoutJsonHeader.php → ...Response/Response200WithoutJsonHeader.php b/...Response/Response200WithoutJsonHeader.php → ...Response/Response200WithoutJsonHeader.php
diff --git a/...st/Unit/Stub/HttpResponse/Response400.php → tests/Unit/Stub/HttpResponse/Response400.php b/...st/Unit/Stub/HttpResponse/Response400.php → tests/Unit/Stub/HttpResponse/Response400.php
diff --git a/...tpResponse/Response400WithoutJsonBody.php → ...tpResponse/Response400WithoutJsonBody.php b/...tpResponse/Response400WithoutJsonBody.php → ...tpResponse/Response400WithoutJsonBody.php
diff --git a/...Response/Response400WithoutJsonHeader.php → ...Response/Response400WithoutJsonHeader.php b/...Response/Response400WithoutJsonHeader.php → ...Response/Response400WithoutJsonHeader.php
diff --git a/...HttpResponse/StreamWithBinaryContents.php → ...HttpResponse/StreamWithBinaryContents.php b/...HttpResponse/StreamWithBinaryContents.php → ...HttpResponse/StreamWithBinaryContents.php
diff --git a/.../HttpResponse/StreamWithErrorContents.php → .../HttpResponse/StreamWithErrorContents.php b/.../HttpResponse/StreamWithErrorContents.php → .../HttpResponse/StreamWithErrorContents.php
diff --git a/...pResponse/StreamWithJsonArrayContents.php → ...pResponse/StreamWithJsonArrayContents.php b/...pResponse/StreamWithJsonArrayContents.php → ...pResponse/StreamWithJsonArrayContents.php
diff --git a/...Response/StreamWithJsonFooBarContents.php → ...Response/StreamWithJsonFooBarContents.php b/...Response/StreamWithJsonFooBarContents.php → ...Response/StreamWithJsonFooBarContents.php
diff --git a/...esponse/StreamWithSimpleErrorContents.php → ...esponse/StreamWithSimpleErrorContents.php b/...esponse/StreamWithSimpleErrorContents.php → ...esponse/StreamWithSimpleErrorContents.php
diff --git a/...ub/HttpResponse/StreamWithoutContents.php → ...ub/HttpResponse/StreamWithoutContents.php b/...ub/HttpResponse/StreamWithoutContents.php → ...ub/HttpResponse/StreamWithoutContents.php
diff --git a/...t/Stub/MethodWithArrayResponsePayload.php → ...t/Stub/MethodWithArrayResponsePayload.php b/...t/Stub/MethodWithArrayResponsePayload.php → ...t/Stub/MethodWithArrayResponsePayload.php
diff --git a/...Stub/MethodWithAuthorizationInterface.php → ...Stub/MethodWithAuthorizationInterface.php b/...Stub/MethodWithAuthorizationInterface.php → ...Stub/MethodWithAuthorizationInterface.php
diff --git a/...it/Stub/MethodWithAuthorizationNeeded.php → ...it/Stub/MethodWithAuthorizationNeeded.php b/...it/Stub/MethodWithAuthorizationNeeded.php → ...it/Stub/MethodWithAuthorizationNeeded.php
diff --git a/...st/Unit/Stub/MethodWithBinaryResponse.php → tests/Unit/Stub/MethodWithBinaryResponse.php b/...st/Unit/Stub/MethodWithBinaryResponse.php → tests/Unit/Stub/MethodWithBinaryResponse.php
diff --git a/...Unit/Stub/MethodWithFilterableResults.php → ...Unit/Stub/MethodWithFilterableResults.php b/...Unit/Stub/MethodWithFilterableResults.php → ...Unit/Stub/MethodWithFilterableResults.php
diff --git a/...t/Stub/MethodWithJsonRequestInterface.php → ...t/Stub/MethodWithJsonRequestInterface.php b/...t/Stub/MethodWithJsonRequestInterface.php → ...t/Stub/MethodWithJsonRequestInterface.php
diff --git a/.../Stub/MethodWithJsonResponseInterface.php → .../Stub/MethodWithJsonResponseInterface.php b/.../Stub/MethodWithJsonResponseInterface.php → .../Stub/MethodWithJsonResponseInterface.php
diff --git a/.../Unit/Stub/MethodWithPaginatedResults.php → .../Unit/Stub/MethodWithPaginatedResults.php b/.../Unit/Stub/MethodWithPaginatedResults.php → .../Unit/Stub/MethodWithPaginatedResults.php
diff --git a/src/Test/Unit/Stub/MethodWithPayload.php → tests/Unit/Stub/MethodWithPayload.php b/src/Test/Unit/Stub/MethodWithPayload.php → tests/Unit/Stub/MethodWithPayload.php
diff --git a/src/Test/Unit/Stub/MethodWithQueryParams.php → tests/Unit/Stub/MethodWithQueryParams.php b/src/Test/Unit/Stub/MethodWithQueryParams.php → tests/Unit/Stub/MethodWithQueryParams.php
diff --git a/...t/Unit/Stub/MethodWithResponsePayload.php → ...s/Unit/Stub/MethodWithResponsePayload.php b/...t/Unit/Stub/MethodWithResponsePayload.php → ...s/Unit/Stub/MethodWithResponsePayload.php
diff --git a/...t/Unit/Stub/MethodWithSortableResults.php → ...s/Unit/Stub/MethodWithSortableResults.php b/...t/Unit/Stub/MethodWithSortableResults.php → ...s/Unit/Stub/MethodWithSortableResults.php
diff --git a/src/Test/Unit/Stub/MethodWithUriParams.php → tests/Unit/Stub/MethodWithUriParams.php b/src/Test/Unit/Stub/MethodWithUriParams.php → tests/Unit/Stub/MethodWithUriParams.php
diff --git a/...Stub/MethodWithoutAuthorizationNeeded.php → ...Stub/MethodWithoutAuthorizationNeeded.php b/...Stub/MethodWithoutAuthorizationNeeded.php → ...Stub/MethodWithoutAuthorizationNeeded.php
diff --git a/src/Test/Unit/Stub/MethodWithoutPayload.php → tests/Unit/Stub/MethodWithoutPayload.php b/src/Test/Unit/Stub/MethodWithoutPayload.php → tests/Unit/Stub/MethodWithoutPayload.php
diff --git a/...Test/Unit/Stub/MethodWithoutUriParams.php → tests/Unit/Stub/MethodWithoutUriParams.php b/...Test/Unit/Stub/MethodWithoutUriParams.php → tests/Unit/Stub/MethodWithoutUriParams.php
diff --git a/.../Stub/ModelWithFooBarSimpleProperties.php → .../Stub/ModelWithFooBarSimpleProperties.php b/.../Stub/ModelWithFooBarSimpleProperties.php → .../Stub/ModelWithFooBarSimpleProperties.php
diff --git a/src/Test/Unit/Stub/ModelWithItemsArray.php → tests/Unit/Stub/ModelWithItemsArray.php b/src/Test/Unit/Stub/ModelWithItemsArray.php → tests/Unit/Stub/ModelWithItemsArray.php
diff --git a/...Test/Unit/Stub/ProcessorReturningNull.php → tests/Unit/Stub/ProcessorReturningNull.php b/...Test/Unit/Stub/ProcessorReturningNull.php → tests/Unit/Stub/ProcessorReturningNull.php
diff --git a/...Stub/ProcessorReturningSimpleResponse.php → ...Stub/ProcessorReturningSimpleResponse.php b/...Stub/ProcessorReturningSimpleResponse.php → ...Stub/ProcessorReturningSimpleResponse.php
diff --git a/src/Test/phpunit_integration.xml.dist → tests/phpunit_integration.xml.dist b/src/Test/phpunit_integration.xml.dist → tests/phpunit_integration.xml.dist
@@ -5,7 +5,7 @@
  * See LICENSE.txt for license details.
  */
 -->
-<phpunit bootstrap="../../vendor/autoload.php">
+<phpunit bootstrap="../vendor/autoload.php">
     <testsuites>
         <testsuite name="Integration Tests">
             <directory>Integration</directory>