add test cases

Author: Enno Woortmann

composer.json

@@ -12,7 +12,7 @@
     ],
     "require": {
         "wol-soft/php-json-schema-model-generator-production": "dev-enumPostProcessor",
-        "wol-soft/php-micro-template": "^1.3.2",
+        "wol-soft/php-micro-template": "^1.9.0",
 
         "php": ">=7.2",
         "ext-json": "*",

src/SchemaProcessor/PostProcessor/EnumPostProcessor.php

@@ -16,7 +16,6 @@
 use PHPModelGenerator\Model\Validator\EnumValidator;
 use PHPModelGenerator\Model\Validator\FilterValidator;
 use PHPModelGenerator\ModelGenerator;
-use PHPModelGenerator\PropertyProcessor\Decorator\TypeHint\ClearTypeHintDecorator;
 use PHPModelGenerator\PropertyProcessor\Filter\FilterProcessor;
 
 /**
@@ -82,7 +81,7 @@ public function process(Schema $schema, GeneratorConfiguration $generatorConfigu
                     $generatorConfiguration,
                     $json['$id'] ?? $schema->getClassName() . ucfirst($property->getName()),
                     $values,
-                    $json['map'] ?? null
+                    $json['enum-map'] ?? null
                 );
             }
 
@@ -153,25 +152,27 @@ private function validateEnum(PropertyInterface $property): bool
 
         $types = $this->getArrayTypes($json['enum']);
 
-        // the enum must contain either only string or int values to be represented by a backed enum or provide a value
-        // map to resolve the values
-        if ($types !== ['string'] && !isset($json['map'])) {
+        // the enum must contain either only string values or provide a value map to resolve the values
+        if ($types !== ['string'] && !isset($json['enum-map'])) {
             if ($this->skipNonMappedEnums) {
                 return false;
             }
 
             $throw('Unmapped enum %s in file %s');
         }
 
-        if (isset($json['map'])) {
-            if (count(array_uintersect(
-                    $json['map'],
-                    $json['enum'],
-                    fn($a, $b) => $a === $b ? 0 : 1
-                )) !== count($json['enum'])
-            ) {
-                $throw('invalid enum map %s in file %s');
-            }
+        if (isset($json['enum-map']) &&
+            (
+                !is_array($json['enum-map'])
+                    || $this->getArrayTypes(array_keys($json['enum-map'])) !== ['string']
+                    || count(array_uintersect(
+                            $json['enum-map'],
+                            $json['enum'],
+                            fn($a, $b) => $a === $b ? 0 : 1
+                        )) !== count($json['enum'])
+            )
+        ) {
+            $throw('invalid enum map %s in file %s');
         }
 
         return true;

tests/PostProcessor/EnumPostProcessorTest.php

@@ -11,6 +11,7 @@
 use PHPModelGenerator\ModelGenerator;
 use PHPModelGenerator\SchemaProcessor\PostProcessor\EnumPostProcessor;
 use PHPModelGenerator\Tests\AbstractPHPModelGeneratorTest;
+use ReflectionClass;
 
 class EnumPostProcessorTest extends AbstractPHPModelGeneratorTest
 {
@@ -48,9 +49,10 @@ public function testStringOnlyEnum(): void
         $returnType = $this->getReturnType($object, 'getProperty');
         $this->assertTrue($returnType->allowsNull());
         $enum = $returnType->getName();
+        $enumName = (new ReflectionClass($enum))->getShortName();
 
         $this->assertEqualsCanonicalizing(
-            [basename($enum), 'null'],
+            [$enumName, 'null'],
             explode('|', $this->getReturnTypeAnnotation($object, 'getProperty'))
         );
 
@@ -70,7 +72,7 @@ public function testStringOnlyEnum(): void
 
         $this->assertNull($this->getParameterType($object, 'setProperty'));
         $this->assertEqualsCanonicalizing(
-            [basename($enum), 'string', 'null'],
+            [$enumName, 'string', 'null'],
             explode('|', $this->getParameterTypeAnnotation($object, 'setProperty'))
         );
 
@@ -91,6 +93,52 @@ public function testInvalidStringOnlyEnumValue(): void
         new $className(['property' => 'Meier']);
     }
 
+    /**
+     * @dataProvider unmappedEnumThrowsAnExceptionDataProvider
+     */
+    public function testUnmappedEnumThrowsAnException(string $enumValues): void
+    {
+        $this->expectException(SchemaException::class);
+        $this->expectExceptionMessage("Unmapped enum property in file");
+
+        $this->addPostProcessor();
+
+        $this->generateClassFromFileTemplate('EnumProperty.json', [$enumValues], null, false);
+    }
+
+    public function unmappedEnumThrowsAnExceptionDataProvider(): array
+    {
+        return [
+            'int enum'                         => ['[0, 1, 2]'],
+            'mixed enum with string values'    => ['["dieter", 1, "hans"]'],
+            'mixed enum without string values' => ['[0, 1, false, true]'],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidEnumMapThrowsAnExceptionDataProvider
+     */
+    public function testInvalidEnumMapThrowsAnException(string $enumValues, string $enumMap): void
+    {
+        $this->expectException(SchemaException::class);
+        $this->expectExceptionMessage("invalid enum map property in file");
+
+        $this->addPostProcessor();
+
+        $this->generateClassFromFileTemplate('EnumPropertyMapped.json', [$enumValues, $enumMap], null, false);
+    }
+
+    public function invalidEnumMapThrowsAnExceptionDataProvider(): array
+    {
+        return [
+            'invalid map (int)' => ['[0, 1, 2]', '100'],
+            'invalid map (array)' => ['[0, 1, 2]', '[0, 1, 2]'],
+            'missing mapped elements' => ['[0, 1, 2]', '{"a": 0, "b": 1}'],
+            'too many mapped elements' => ['[0, 1]', '{"a": 0, "b": 1, "c": 2}'],
+            'wrong elements mapped' => ['[0, 1]', '{"a": 0, "c": 2}'],
+        ];
+    }
+
     public function testEnumPropertyWithTransformingFilterThrowsAnException(): void
     {
         $this->expectException(SchemaException::class);

tests/Schema/EnumPostProcessorTest/EnumPropertyMapped.json

@@ -0,0 +1,9 @@
+{
+  "type": "object",
+  "properties": {
+    "property": {
+      "enum": %s,
+      "enum-map": %s
+    }
+  }
+}