Merge pull request #700 from postnl/bugfix/POSTNL-338

fix: POSTNL-338 overcome 2 lines street address validation

Author: bakkerpj

Service/Customer/Data.php

@@ -5,6 +5,8 @@
 
 class Data
 {
+    private const ADDRESS_MAX_LINES = 3;
+
     protected int $addressLineExtend = 0;
 
     protected Address $addressHelper;
@@ -23,14 +25,15 @@ public function getAddressLinesExtendCount(): int
     public function canExtendAddressLines(): bool
     {
         $allowedLines = (int)$this->addressHelper->getStreetLines();
-        return $allowedLines === 1;
+        return $allowedLines < self::ADDRESS_MAX_LINES;
     }
 
     public function setAddressLineExtend(): void
     {
         if (!$this->canExtendAddressLines()) {
             return;
         }
-        $this->addressLineExtend = 2;
+
+        $this->addressLineExtend = self::ADDRESS_MAX_LINES - (int)$this->addressHelper->getStreetLines();
     }
 }

Test/TestCase.php

@@ -35,7 +35,7 @@ public function getInstance(array $args = [])
     /**
      * Basic setup
      */
-    public function setUp() : void
+    protected function setUp() : void
     {
         ini_set('error_reporting', E_ALL);
         ini_set('display_errors', '1');

Test/Unit/Block/Adminhtml/Grid/Shipment/DownloadPdfActionTest.php

@@ -19,7 +19,7 @@ class DownloadPdfActionTest extends TestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp() : void
+    protected function setUp() : void
     {
         parent::setUp();
 

Test/Unit/Block/Adminhtml/Shipment/ViewTest.php

@@ -30,7 +30,7 @@ class ViewTest extends TestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp() : void
+    protected function setUp() : void
     {
         parent::setUp();
 

Test/Unit/Config/CheckoutConfiguration/IsShippingOptionsActiveTest.php

@@ -25,7 +25,7 @@ class IsShippingOptionsActiveTest extends TestCase
      */
     private $accountConfiguration;
 
-    public function setUp() : void
+    protected function setUp() : void
     {
         parent::setUp();
 

Test/Unit/Config/Validator/ValidAddressTest.php

@@ -20,7 +20,7 @@ class ValidAddressTest extends TestCase
      */
     private $instance;
 
-    public function setUp() : void
+    protected function setUp() : void
     {
         parent::setUp();
 

Test/Unit/Plugin/Ui/Component/MassActionTest.php

@@ -18,7 +18,7 @@ class MassActionTest extends TestCase
     /**
      * Set up
      */
-    public function setUp() : void
+    protected function setUp() : void
     {
         parent::setUp();
 

Test/Unit/Service/Carrier/Price/Filter/CountryFilterTest.php

@@ -15,7 +15,7 @@ class CountryFilterTest extends TestCase
      */
     private $input = [];
 
-    public function setUp() : void
+    protected function setUp() : void
     {
         parent::setUp();
 

Test/Unit/Service/Customer/DataTest.php

@@ -0,0 +1,56 @@
+<?php
+declare(strict_types=1);
+
+namespace TIG\PostNL\Test\Unit\Service\Customer;
+
+use Magento\Customer\Helper\Address;
+use TIG\PostNL\Service\Customer\Data;
+use TIG\PostNL\Test\TestCase;
+
+class DataTest extends TestCase
+{
+    private $addressHelperMock;
+    private Data $data;
+
+    protected function setUp(): void
+    {
+        $this->addressHelperMock = $this->createMock(Address::class);
+        $this->data = new Data($this->addressHelperMock);
+
+        parent::setUp();
+    }
+
+    public function testGetAddressLinesExtendCountReturnsInitialValue()
+    {
+        $this->assertSame(0, $this->data->getAddressLinesExtendCount());
+    }
+
+    public function testCanExtendAddressLinesReturnsTrueWhenAllowedLinesLessThanMax()
+    {
+        $this->addressHelperMock->method('getStreetLines')->willReturn(2);
+        $this->assertTrue($this->data->canExtendAddressLines());
+    }
+
+    public function testCanExtendAddressLinesReturnsFalseWhenAllowedLinesEqualOrGreaterThanMax()
+    {
+        $this->addressHelperMock->method('getStreetLines')->willReturn(3);
+        $this->assertFalse($this->data->canExtendAddressLines());
+
+        $this->addressHelperMock->method('getStreetLines')->willReturn(4);
+        $this->assertFalse($this->data->canExtendAddressLines());
+    }
+
+    public function testSetAddressLineExtendSetsValueWhenCanExtend()
+    {
+        $this->addressHelperMock->method('getStreetLines')->willReturn(2);
+        $this->data->setAddressLineExtend();
+        $this->assertSame(1, $this->data->getAddressLinesExtendCount());
+    }
+
+    public function testSetAddressLineExtendDoesNothingWhenCannotExtend()
+    {
+        $this->addressHelperMock->method('getStreetLines')->willReturn(3);
+        $this->data->setAddressLineExtend();
+        $this->assertSame(0, $this->data->getAddressLinesExtendCount());
+    }
+}

Test/Unit/Service/Import/Matrixrate/RowTest.php

@@ -14,7 +14,7 @@ class RowTest extends TestCase
      */
     private $instance;
 
-    public function setUp() : void
+    protected function setUp() : void
     {
         parent::setUp();