Adjusted existed test and added test for case without interface

Author: anzin

testData/actions/generation/generator/DataModelGenerator/generateDataModel/Sample.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Foo\Bar\Model\Data;
 
@@ -10,16 +11,17 @@ class Sample extends DataObject implements SampleInterface
     /**
      * @inheritDoc
      */
-    public function getSampleProperty()
+    public function getSampleProperty(): ?string
     {
-        return $this->getData(self::SAMPLE_PROPERTY);
+        return $this->getData(self::SAMPLE_PROPERTY) === null ? null
+            : (string)$this->getData(self::SAMPLE_PROPERTY);
     }
 
     /**
      * @inheritDoc
      */
-    public function setSampleProperty($sampleProperty)
+    public function setSampleProperty(?string $sampleProperty): void
     {
-        return $this->setData(self::SAMPLE_PROPERTY, $sampleProperty);
+        $this->setData(self::SAMPLE_PROPERTY, $sampleProperty);
     }
 }

testData/actions/generation/generator/DataModelGenerator/generateDataModelWithoutInterface/Sample.php

@@ -0,0 +1,37 @@
+<?php
+declare(strict_types=1);
+
+namespace Foo\Bar\Model\Data;
+
+use Magento\Framework\DataObject;
+
+class Sample extends DataObject
+{
+    /**
+     * String constants for property names
+     */
+    const SAMPLE_PROPERTY = "sample_property";
+
+    /**
+     * Getter for SampleProperty.
+     *
+     * @return string|null
+     */
+    public function getSampleProperty(): ?string
+    {
+        return $this->getData(self::SAMPLE_PROPERTY) === null ? null
+            : (string)$this->getData(self::SAMPLE_PROPERTY);
+    }
+
+    /**
+     * Setter for SampleProperty.
+     *
+     * @param string|null $sampleProperty
+     *
+     * @return void
+     */
+    public function setSampleProperty(?string $sampleProperty): void
+    {
+        $this->setData(self::SAMPLE_PROPERTY, $sampleProperty);
+    }
+}

testData/actions/generation/generator/DataModelInterfaceGenerator/generateDataModelInterface/SampleInterface.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Foo\Bar\Api\Data;
 
@@ -10,13 +11,18 @@ interface SampleInterface
     const SAMPLE_PROPERTY = "sample_property";
 
     /**
-     * @return string
+     * Getter for SampleProperty.
+     *
+     * @return string|null
      */
-    public function getSampleProperty();
+    public function getSampleProperty(): ?string;
 
     /**
-     * @param string $sampleProperty
-     * @return $this
+     * Setter for SampleProperty.
+     *
+     * @param string|null $sampleProperty
+     *
+     * @return void
      */
-    public function setSampleProperty($sampleProperty);
+    public function setSampleProperty(?string $sampleProperty): void;
 }

tests/com/magento/idea/magento2plugin/actions/generation/generator/DataModelGeneratorTest.java

@@ -22,7 +22,36 @@ public void testGenerateDataModel() {
                 "Foo_Bar",
                 "Foo\\Bar\\Model\\Data\\Sample",
                 "Foo\\Bar\\Api\\Data\\SampleInterface",
-                "SAMPLE_PROPERTY;sample_property;string;SampleProperty;sampleProperty"
+                "SAMPLE_PROPERTY;sample_property;string;SampleProperty;sampleProperty",
+                true
+        );
+        final DataModelGenerator generator = new DataModelGenerator(
+                project, modelData
+        );
+        final PsiFile modelFile = generator.generate(NewDataModelAction.ACTION_NAME);
+        final PsiFile expectedFile
+                = myFixture.configureByFile(this.getFixturePath("Sample.php"));
+
+        assertGeneratedFileIsCorrect(
+                expectedFile,
+                "src/app/code/Foo/Bar/Model/Data",
+                modelFile
+        );
+    }
+
+    /**
+     * Tests for generation of a Magento 2 Data Model without interface.
+     */
+    public void testGenerateDataModelWithoutInterface() {
+        final Project project = myFixture.getProject();
+        final DataModelData modelData = new DataModelData(
+                "Foo\\Bar\\Model\\Data",
+                "Sample",
+                "Foo_Bar",
+                "Foo\\Bar\\Model\\Data\\Sample",
+                "Foo\\Bar\\Api\\Data\\SampleInterface",
+                "SAMPLE_PROPERTY;sample_property;string;SampleProperty;sampleProperty",
+                false
         );
         final DataModelGenerator generator = new DataModelGenerator(
                 project, modelData