Updated tests

Author: sreichel

tests/unit/Mage/Usa/Helper/DataTest.php

@@ -15,6 +15,7 @@
 use Mage_Usa_Helper_Data as Subject;
 use OpenMage\Tests\Unit\OpenMageTest;
 use OpenMage\Tests\Unit\Traits\DataProvider\Mage\Usa\Helper\DataTrait;
+use PhpUnitsOfMeasure\Exception\UnknownUnitOfMeasure;
 
 final class DataTest extends OpenMageTest
 {
@@ -32,48 +33,50 @@ public static function setUpBeforeClass(): void
      * @dataProvider provideConvertMeasureWeightData
      * @group Helper
      */
-    public function testConvertMeasureWeight($expectedResult, $value, $sourceWeightMeasure, $toWeightMeasure): void
+    public function testConvertMeasureWeight(float $expectedResult, $value, string $sourceWeightMeasure, string $toWeightMeasure): void
     {
         $result = self::$subject->convertMeasureWeight($value, $sourceWeightMeasure, $toWeightMeasure);
-        #self::assertIsNotFloat($result);
-        self::assertIsString($result);
-        #self::assertSame($expectedResult, $result);
-        self::assertStringStartsWith($expectedResult, $result);
+
+        self::assertIsFloat($result);
+        self::assertSame($expectedResult, $result);
     }
 
     /**
      * @dataProvider provideConvertMeasureDimensionData
      * @group Helper
      */
-    public function testConvertMeasureDimension($expectedResult, $value, $sourceWeightMeasure, $toWeightMeasure): void
+    public function testConvertMeasureDimension(float $expectedResult, $value, string $sourceWeightMeasure, string $toWeightMeasure): void
     {
         $result = self::$subject->convertMeasureDimension($value, $sourceWeightMeasure, $toWeightMeasure);
-        #self::assertIsNotFloat($result);
-        self::assertIsString($result);
-        #self::assertSame($expectedResult, $result);
-        self::assertStringStartsWith($expectedResult, $result);
+
+        self::assertIsFloat($result);
+        self::assertSame($expectedResult, $result);
     }
 
     /**
      * @dataProvider provideGetMeasureWeightNameData
      * @group Helper
      */
-    public function testGetMeasureWeightName($expectedResult, $value): void
+    public function testGetMeasureWeightName(string $expectedResult, string $eey): void
     {
-        $result = self::$subject->getMeasureWeightName($value);
-        self::assertIsString($result);
-        self::assertSame($expectedResult, $result);
+        try {
+            self::assertSame($expectedResult, self::$subject->getMeasureWeightName($eey));
+        } catch (UnknownUnitOfMeasure $unitOfMeasure) {
+            self::assertSame($expectedResult, $unitOfMeasure->getMessage());
+        }
     }
 
     /**
      * @dataProvider provideGetMeasureDimensionNameData
      * @group Helper
      */
-    public function testGetMeasureDimensionName($expectedResult, $value): void
+    public function testGetMeasureDimensionName(string $expectedResult, string $key): void
     {
-        $result = self::$subject->getMeasureDimensionName($value);
-        self::assertIsString($result);
-        self::assertSame($expectedResult, $result);
+        try {
+            self::assertSame($expectedResult, self::$subject->getMeasureDimensionName($key));
+        } catch (UnknownUnitOfMeasure $unitOfMeasure) {
+            self::assertSame($expectedResult, $unitOfMeasure->getMessage());
+        }
     }
 
     /**

tests/unit/Traits/DataProvider/Mage/Usa/Helper/DataTrait.php

@@ -11,42 +11,61 @@
 namespace OpenMage\Tests\Unit\Traits\DataProvider\Mage\Usa\Helper;
 
 use Generator;
+use Mage_Core_Helper_Measure_Length;
+use Mage_Core_Helper_Measure_Weight;
 
 trait DataTrait
 {
     public function provideConvertMeasureWeightData(): Generator
     {
         yield 'kg to lbs' => [
-            '22.046',
+            22.046226218487757,
             10,
-            'KILOGRAM',
-            'POUND',
+            Mage_Core_Helper_Measure_Weight::KILOGRAM,
+            Mage_Core_Helper_Measure_Weight::POUND,
+        ];
+
+        yield 'ounce to lbs' => [
+            0.625,
+            10,
+            Mage_Core_Helper_Measure_Weight::OUNCE,
+            Mage_Core_Helper_Measure_Weight::POUND,
         ];
     }
 
     public function provideConvertMeasureDimensionData(): Generator
     {
         yield 'm to cm' => [
-            '1000',
+            1000,
             10,
-            'METER',
-            'CENTIMETER',
+            Mage_Core_Helper_Measure_Length::STANDARD,
+            Mage_Core_Helper_Measure_Length::CENTIMETER,
         ];
     }
 
     public function provideGetMeasureWeightNameData(): Generator
     {
         yield 'kg' => [
             'kg',
-            'KILOGRAM',
+            Mage_Core_Helper_Measure_Weight::KILOGRAM,
+        ];
+
+        yield 'exception' => [
+            'Unknown unit of measure (xyz).',
+            'xyz',
         ];
     }
 
     public function provideGetMeasureDimensionNameData(): Generator
     {
-        yield 'm to cm' => [
+        yield 'm' => [
             'm',
-            'METER',
+            Mage_Core_Helper_Measure_Length::STANDARD,
+        ];
+
+        yield 'exception' => [
+            'Unknown unit of measure (xyz).',
+            'xyz',
         ];
     }