MC-5233: DateTime product attributes support

Author: serhii-balko

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php

@@ -56,7 +56,7 @@ protected function setUp()
 
     /**
      * Test to retrieve attribute value
-     * 
+     *
      * @param string $frontendInput
      * @param int $timeType
      * @dataProvider getValueDataProvider

app/code/Magento/Ui/Test/Unit/Component/Filters/Type/DateTest.php

@@ -239,6 +239,7 @@ public function getPrepareDataProvider()
      * @param array $filterData
      * @param array $expectedCondition
      * @param MockObject $uiComponent
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function processFilters(
         string $name,
@@ -257,18 +258,22 @@ private function processFilters(
                 $from = new \DateTime($filterData[$name]['from']);
                 $to = new \DateTime($filterData[$name]['to']);
                 $uiComponent->method('convertDatetime')
-                    ->willReturnMap([
-                        [$filterData[$name]['from'], true, $from],
-                        [$filterData[$name]['to'], true, $to],
-                    ]);
+                    ->willReturnMap(
+                        [
+                            [$filterData[$name]['from'], true, $from],
+                            [$filterData[$name]['to'], true, $to],
+                        ]
+                    );
             } else {
                 $from = new \DateTime($filterData[$name]['from']);
                 $to = new \DateTime($filterData[$name]['to'] . ' 23:59:59');
                 $uiComponent->method('convertDate')
-                    ->willReturnMap([
-                        [$filterData[$name]['from'], 0, 0, 0, true, $from],
-                        [$filterData[$name]['to'], 23, 59, 59, true, $to],
-                    ]);
+                    ->willReturnMap(
+                        [
+                            [$filterData[$name]['from'], 0, 0, 0, true, $from],
+                            [$filterData[$name]['to'], 23, 59, 59, true, $to],
+                        ]
+                    );
             }
         }
 

app/code/Magento/Ui/Test/Unit/Component/FiltersTest.php

@@ -58,7 +58,7 @@ protected function setUp()
 
     /**
      * Test to Update filter component according to $component
-     * 
+     *
      * @param string $filterType
      * @param string $filterName
      * @dataProvider updateDataProvider

dev/tests/integration/testsuite/Magento/Eav/Model/Entity/AttributeTest.php

@@ -3,49 +3,54 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Eav\Model\Entity;
 
-use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
-class AttributeTest extends \PHPUnit\Framework\TestCase
+/**
+ * Class to test EAV Entity attribute model
+ */
+class AttributeTest extends TestCase
 {
     /**
      * @var Attribute
      */
     private $attribute;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     private $objectManager;
 
     /**
      * @var ResolverInterface
      */
-    private $_localeResolver;
+    private $localeResolver;
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->attribute = $this->objectManager->get(Attribute::class);
-        $this->_localeResolver = $this->objectManager->get(ResolverInterface::class);
+        $this->localeResolver = $this->objectManager->get(ResolverInterface::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function tearDown()
     {
         $this->attribute = null;
         $this->objectManager = null;
-        $this->_localeResolver = null;
+        $this->localeResolver = null;
     }
 
     /**
@@ -56,11 +61,17 @@ protected function tearDown()
      * @dataProvider beforeSaveDataProvider
      * @throws
      */
-    public function testBeforeSave($defaultValue, $backendType, $locale, $expected)
-    {
+    public function testBeforeSave(
+        string $defaultValue,
+        string $backendType,
+        string $frontendInput,
+        string $locale,
+        string $expected
+    ) {
         $this->attribute->setDefaultValue($defaultValue);
         $this->attribute->setBackendType($backendType);
-        $this->_localeResolver->setLocale($locale);
+        $this->attribute->setFrontendInput($frontendInput);
+        $this->localeResolver->setLocale($locale);
         $this->attribute->beforeSave();
 
         $this->assertEquals($expected, $this->attribute->getDefaultValue());
@@ -74,13 +85,15 @@ public function testBeforeSave($defaultValue, $backendType, $locale, $expected)
     public function beforeSaveDataProvider()
     {
         return [
-            ['21/07/18', 'datetime', 'en_AU', '2018-07-21 00:00:00'],
-            ['07/21/18', 'datetime', 'en_US', '2018-07-21 00:00:00'],
-            ['21/07/18', 'datetime', 'fr_FR', '2018-07-21 00:00:00'],
-            ['21/07/18', 'datetime', 'de_DE', '2018-07-21 00:00:00'],
-            ['21/07/18', 'datetime', 'uk_UA', '2018-07-21 00:00:00'],
-            ['100.50', 'decimal', 'en_US', '100.50'],
-            ['100,50', 'decimal', 'uk_UA', '100.5'],
+            ['21/07/18', 'datetime', 'date', 'en_AU', '2018-07-21 00:00:00'],
+            ['07/21/18', 'datetime', 'date', 'en_US', '2018-07-21 00:00:00'],
+            ['21/07/18', 'datetime', 'date', 'fr_FR', '2018-07-21 00:00:00'],
+            ['21/07/18', 'datetime', 'date', 'de_DE', '2018-07-21 00:00:00'],
+            ['21/07/18', 'datetime', 'date', 'uk_UA', '2018-07-21 00:00:00'],
+            ['100.50', 'decimal', 'decimal', 'en_US', '100.50'],
+            ['100,50', 'decimal', 'decimal', 'uk_UA', '100.5'],
+            ['07/21/2019 2:30 PM', 'datetime', 'datetime', 'en_US', '2019-07-21 21:30:00'],
+            ['21.07.2019 14:30', 'datetime', 'datetime', 'uk_UA', '2019-07-21 21:30:00'],
         ];
     }
 
@@ -90,13 +103,13 @@ public function beforeSaveDataProvider()
      * @param string $locale
      * @param string $expected
      * @dataProvider beforeSaveErrorDataDataProvider
-     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedException LocalizedException
      */
     public function testBeforeSaveErrorData($defaultValue, $backendType, $locale, $expected)
     {
         $this->attribute->setDefaultValue($defaultValue);
         $this->attribute->setBackendType($backendType);
-        $this->_localeResolver->setLocale($locale);
+        $this->localeResolver->setLocale($locale);
         $this->attribute->beforeSave();
 
         $this->expectExceptionMessage($expected);