MAGETWO-34390: Stabilization of replacing Zend_Locale with Native PHP Implementation

Author: slavvka

dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Attribute/Frontend/DatetimeTest.php

@@ -55,17 +55,17 @@ protected function setUp()
     public function testGetValue()
     {
         $attributeValue = '11-11-2011';
-        $dateFormat = 'dd-MM-yyyy';
+        $date = new \DateTime($attributeValue);
         $object = new \Magento\Framework\Object(['datetime' => $attributeValue]);
         $this->attributeMock->expects($this->any())->method('getData')->with('frontend_input')
             ->will($this->returnValue('text'));
 
-        $this->localeDateMock->expects($this->once())->method('getDateFormat')
-            ->with(\IntlDateFormatter::MEDIUM)
-            ->will($this->returnValue($dateFormat));
+        $this->localeDateMock->expects($this->once())->method('formatDateTime')
+            ->with($date, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE, null, null, null)
+            ->willReturn($attributeValue);
         $this->localeDateMock->expects($this->once())->method('date')
-            ->with($attributeValue)
-            ->willReturn(new \DateTime($attributeValue));
+            ->with($date)
+            ->willReturn($date);
 
         $this->assertEquals($attributeValue, $this->model->getValue($object));
     }

dev/tests/unit/testsuite/Magento/Framework/Data/Form/Element/DateTest.php

@@ -31,6 +31,11 @@ class DateTest extends \PHPUnit_Framework_TestCase
      */
     protected $escaperMock;
 
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $localeDateMock;
+
     protected function setUp()
     {
         $this->factoryMock = $this->getMock('Magento\Framework\Data\Form\Element\Factory', [], [], '', false);
@@ -42,10 +47,18 @@ protected function setUp()
             false
         );
         $this->escaperMock = $this->getMock('Magento\Framework\Escaper', [], [], '', false);
+        $this->localeDateMock = $this->getMock(
+            '\Magento\Framework\Stdlib\DateTime\TimezoneInterface',
+            [],
+            [],
+            '',
+            false
+        );
         $this->model = new Date(
             $this->factoryMock,
             $this->collectionFactoryMock,
-            $this->escaperMock
+            $this->escaperMock,
+            $this->localeDateMock
         );
     }