test: fix test

myparcelnl · Oct 17, 2023 · 75382f2 · 75382f2
1 parent 4da2fdc
commit 75382f2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/Helper/SplitStreet.php b/src/Helper/SplitStreet.php
@@ -96,6 +96,11 @@ public static function splitStreet(string $fullStreet, string $local, string $de
                 $matches['box_separator'] = self::BOX_NL;
             }
 
+            if ($matches['box_separator'] && ! $matches['box_number']) {
+                $matches['number_suffix'] = $matches['box_separator'];
+                $matches['box_separator'] = null;
+            }
+
             $fullStreet = implode(
                 ' ',
                 array_filter([

diff --git a/test/Model/Consignment/ConsignmentSplitStreetTest.php b/test/Model/Consignment/ConsignmentSplitStreetTest.php
@@ -374,16 +374,15 @@ public function provideSplitStreetData(): array
                 self::expected(self::NUMBER)        => '5',
                 self::expected(self::NUMBER_SUFFIX) => 'D',
             ],
-//            TODO: This test case is currently impossible to fix because of 'B' being both a number suffix and a box separator
-//            [
-//                self::FULL_STREET                   => 'Slameuterstraat 9B',
-//                self::COUNTRY                       => 'BE',
-//                self::CARRIER_ID                    => CarrierBpost::ID,
-//                self::expected(self::FULL_STREET)   => 'Slameuterstraat 9 B',
-//                self::expected(self::STREET)        => 'Slameuterstraat',
-//                self::expected(self::NUMBER)        => '9',
-//                self::expected(self::NUMBER_SUFFIX) => 'B',
-//            ],
+            [
+                self::FULL_STREET                   => 'Slameuterstraat 9B',
+                self::COUNTRY                       => 'BE',
+                self::CARRIER_ID                    => CarrierBpost::ID,
+                self::expected(self::FULL_STREET)   => 'Slameuterstraat 9 B',
+                self::expected(self::STREET)        => 'Slameuterstraat',
+                self::expected(self::NUMBER)        => '9',
+                self::expected(self::NUMBER_SUFFIX) => 'B',
+            ],
             [
                 self::FULL_STREET                 => 'Oud-Dorpsstraat 136 3',
                 self::COUNTRY                     => 'BE',