Merge pull request #199 from alma/feat/MPP-517/fix-autoload-test-unit

Feat/mpp 517/fix autoload test unit
alma · Aug 18, 2023 · b59ab7b · b59ab7b
2 parents 4d141e7 + 95d6add
commit b59ab7b
Show file tree

Hide file tree

Showing 18 changed files with 67 additions and 410 deletions.
diff --git a/alma/controllers/hook/DisplayBackOfficeHeaderHookController.php b/alma/controllers/hook/DisplayBackOfficeHeaderHookController.php
@@ -53,6 +53,8 @@ public function canRun()
      * @param array $params
      *
      * @return void
+     * @throws \PrestaShopDatabaseException
+     * @throws \PrestaShopException
      */
     public function run($params)
     {

diff --git a/alma/lib/Helpers/DateHelper.php b/alma/lib/Helpers/DateHelper.php
@@ -133,4 +133,16 @@ protected static function getFrenchDateFormat($timestamp)
 
         return $date->format('d/m/Y');
     }
+
+    /**
+     * @param string|int $timestamp
+     *
+     * @return bool
+     */
+    public static function isValidTimeStamp($timestamp)
+    {
+        return ((string) (int) $timestamp === $timestamp)
+            && ($timestamp <= PHP_INT_MAX)
+            && ($timestamp >= ~PHP_INT_MAX);
+    }
 }
diff --git a/alma/lib/Helpers/OrderHelper.php b/alma/lib/Helpers/OrderHelper.php
@@ -63,6 +63,8 @@ public function __construct()
      * @param string $endDate
      *
      * @return \Order[]
+     * @throws \PrestaShopDatabaseException
+     * @throws \PrestaShopException
      */
     public function getOrdersByDate($startDate, $endDate)
     {
@@ -87,6 +89,7 @@ public function getOrdersByDate($startDate, $endDate)
      * @param string $endDate
      *
      * @return array
+     * @throws \PrestaShopDatabaseException
      */
     public function getOrdersIdByDate($startDate, $endDate)
     {

diff --git a/alma/lib/Helpers/ShareOfCheckoutHelper.php b/alma/lib/Helpers/ShareOfCheckoutHelper.php
@@ -70,13 +70,16 @@ public function __construct($orderHelper)
 
     /**
      * @return bool
+     * @throws \PrestaShopDatabaseException
+     * @throws \PrestaShopException
      */
     public function shareDays()
     {
         $shareOfCheckoutEnabledDate = $this->getEnabledDate();
         if (
             ShareOfCheckoutAdminFormBuilder::ALMA_SHARE_OF_CHECKOUT_CONSENT_NO === SettingsHelper::getShareOfCheckoutStatus()
             || empty($shareOfCheckoutEnabledDate)
+            || !DateHelper::isValidTimeStamp($shareOfCheckoutEnabledDate)
         ) {
             Logger::instance()->info('Share Of Checkout is disabled or invalide date');
 
@@ -102,6 +105,8 @@ public function shareDays()
      * Put Payload to Share of Checkout.
      *
      * @return void
+     * @throws \PrestaShopDatabaseException
+     * @throws \PrestaShopException
      */
     public function putDay()
     {
@@ -152,6 +157,8 @@ public function getStartShareOfCheckout()
      * Total Orders to send.
      *
      * @return array
+     * @throws \PrestaShopDatabaseException
+     * @throws \PrestaShopException
      */
     public function getTotalOrders()
     {
@@ -437,7 +444,7 @@ private function getEndDateTime()
      *
      * @param string $id
      *
-     * @return string
+     * @return array|bool|object|null|string
      */
     private function getIsoCodeById($id)
     {
@@ -453,6 +460,8 @@ private function getIsoCodeById($id)
      * Payload Share of Checkout.
      *
      * @return array
+     * @throws \PrestaShopDatabaseException
+     * @throws \PrestaShopException
      */
     public function getPayload()
     {
@@ -467,15 +476,15 @@ public function getPayload()
     /**
      * @return string|false
      */
-    protected function getEnabledDate()
+    public function getEnabledDate()
     {
         return \Configuration::get(ShareOfCheckoutAdminFormBuilder::ALMA_SHARE_OF_CHECKOUT_DATE);
     }
 
     /**
      * @return array
      */
-    protected function getDatesInInterval($lastShareOfCheckout, $shareOfCheckoutEnabledDate)
+    public function getDatesInInterval($lastShareOfCheckout, $shareOfCheckoutEnabledDate)
     {
         return DateHelper::getDatesInInterval($lastShareOfCheckout, $shareOfCheckoutEnabledDate);
     }

diff --git a/alma/phpunit.ci.xml b/alma/phpunit.ci.xml
@@ -11,13 +11,8 @@
          stopOnFailure               = "true">
 
     <testsuites>
-        <testsuite name="Alma Installment Prestashop Unit Test Suite">
-            <directory>tests/unit</directory>
-        </testsuite>
-    </testsuites>
-    <testsuites>
-        <testsuite name="Alma Installment Prestashop Integration Test Suite">
-            <directory>tests/integration</directory>
+        <testsuite name="Alma Installment Prestashop Test Suite">
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 

diff --git a/alma/phpunit.dist.xml b/alma/phpunit.dist.xml
@@ -11,13 +11,8 @@
          stopOnFailure               = "false">
 
     <testsuites>
-        <testsuite name="Alma Installment Prestashop Unit Test Suite">
-            <directory>tests/unit</directory>
-        </testsuite>
-    </testsuites>
-    <testsuites>
-        <testsuite name="Alma Installment Prestashop Integration Test Suite">
-            <directory>tests/integration</directory>
+        <testsuite name="Alma Installment Prestashop Test Suite">
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
     <php>

diff --git a/alma/tests/README.md b/alma/tests/README.md
@@ -18,15 +18,5 @@ cd modules/alma/
 
 to launch test :
 ```
-./vendor/bin/phpunit
-```
-
-to launch integration test :
-```
-./vendor/bin/phpunit --testsuite 'Alma Installment Prestashop Integration Test Suite'
-```
-
-to launch unit test :
-```
-./vendor/bin/phpunit --testsuite 'Alma Installment Prestashop Unit Test Suite'
+./vendor/bin/phpunit -c phpunit.ci.xml
 ```
diff --git a/...eOfCheckout/ShareOfCheckoutHelperTest.php → ...Unit/Helper/ShareOfCheckoutHelperTest.php b/...eOfCheckout/ShareOfCheckoutHelperTest.php → ...Unit/Helper/ShareOfCheckoutHelperTest.php
@@ -22,7 +22,7 @@
  * @license   https://opensource.org/licenses/MIT The MIT License
  */
 
-namespace Alma\PrestaShop\Tests\Unit\Lib\ShareOfCheckout;
+namespace Alma\PrestaShop\Tests\Unit\Helper;
 
 use Alma\PrestaShop\Helpers\OrderHelper;
 use Alma\PrestaShop\Helpers\ShareOfCheckoutHelper;
@@ -43,7 +43,10 @@ protected function setUp()
     /**
      * @dataProvider dateErrorDataProvider
      *
+     * @param $dateErrorData
      * @return void
+     * @throws \PrestaShopDatabaseException
+     * @throws \PrestaShopException
      */
     public function testShareDaysNoDate($dateErrorData)
     {
@@ -52,6 +55,11 @@ public function testShareDaysNoDate($dateErrorData)
         $this->assertFalse($shareOfCheckoutHelperMock->shareDays());
     }
 
+    /**
+     * @return void
+     * @throws \PrestaShopDatabaseException
+     * @throws \PrestaShopException
+     */
     public function testShareDaysReturnTrueWithValidTimestamp()
     {
         $this->orderHelperMock->shouldReceive('resetOrderList');
@@ -67,7 +75,11 @@ public function testShareDaysReturnTrueWithValidTimestamp()
      *
      * @dataProvider ordersGetPayload
      *
+     * @param $ordersMock
+     * @param $expectedPayload
      * @return void
+     * @throws \PrestaShopDatabaseException
+     * @throws \PrestaShopException
      */
     public function testGetPayload($ordersMock, $expectedPayload)
     {
@@ -103,7 +115,11 @@ public function testGetTotalPaymentMethods($ordersMock, $expectedTotalPaymentMet
      *
      * @dataProvider ordersTotalOrders
      *
+     * @param $ordersMock
+     * @param $expectedTotalOrders
      * @return void
+     * @throws \PrestaShopDatabaseException
+     * @throws \PrestaShopException
      */
     public function testGetTotalOrders($ordersMock, $expectedTotalOrders)
     {
@@ -115,6 +131,9 @@ public function testGetTotalOrders($ordersMock, $expectedTotalOrders)
         $this->assertEquals($expectedTotalOrders, $getTotalOrders);
     }
 
+    /**
+     * @return array[]
+     */
     public function ordersTotalOrders()
     {
         $expectedTotalOrders = [
@@ -138,6 +157,9 @@ public function ordersTotalOrders()
         ];
     }
 
+    /**
+     * @return array[]
+     */
     public function ordersTotalPaymentMethods()
     {
         $expectedTotalPaymentMethods = [
@@ -176,6 +198,9 @@ public function ordersTotalPaymentMethods()
         ];
     }
 
+    /**
+     * @return array[]
+     */
     public function ordersGetPayload()
     {
         $expectedPayload = [
@@ -230,6 +255,9 @@ public function ordersGetPayload()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function orders()
     {
         $ordersMock = [];
@@ -267,6 +295,9 @@ public function orders()
         return $ordersMock;
     }
 
+    /**
+     * @return array
+     */
     public function dateErrorDataProvider()
     {
         return [

diff --git a/alma/tests/unit/lib/Model/CartDataTest.php → alma/tests/Unit/Model/CartDataTest.php b/alma/tests/unit/lib/Model/CartDataTest.php → alma/tests/Unit/Model/CartDataTest.php
@@ -22,7 +22,7 @@
  * @license   https://opensource.org/licenses/MIT The MIT License
  */
 
-namespace Alma\PrestaShop\Tests\Unit\Lib\Model;
+namespace Alma\PrestaShop\Tests\Unit\Model;
 
 use Alma\PrestaShop\Helpers\ProductHelper;
 use Alma\PrestaShop\Model\CartData;

diff --git a/alma/tests/integration/index.php b/alma/tests/integration/index.php