From c190f43edb1170c49a912fcab6e04fbca8bdcded Mon Sep 17 00:00:00 2001
From: Maxim Medinskiy <mmedinskiy@magento.com>
Date: Fri, 4 Nov 2016 15:05:46 +0200
Subject: [PATCH] MAGETWO-59904: [PR][Github] Update AccountLock.php #6952

---
 .../Listing/Column/AccountLockTest.php        | 96 ++++++++++++++-----
 1 file changed, 71 insertions(+), 25 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/AccountLockTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/AccountLockTest.php
index c72cf9fddd0..c6f113d56c3 100644
--- a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/AccountLockTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/AccountLockTest.php
@@ -46,27 +46,9 @@ class AccountLockTest extends \PHPUnit_Framework_TestCase
      */
     public function testPrepareDataSource($lockExpirationDate, $expectedResult)
     {
-        $dataSource = [
-            'data' => [
-                'items' => [
-                    [
-                        'lock_expires' => $lockExpirationDate
-                    ],
-                ]
-            ]
-        ];
-        $expectedDataSource = [
-            'data' => [
-                'items' => [
-                    [
-                        'lock_expires' => $expectedResult,
-                    ],
-                ]
-            ]
-        ];
-        $dataSource = $this->component->prepareDataSource($dataSource);
+        $dataSource = $this->component->prepareDataSource($lockExpirationDate);
 
-        $this->assertEquals($expectedDataSource, $dataSource);
+        $this->assertEquals($expectedResult, $dataSource);
     }
 
     /**
@@ -76,13 +58,77 @@ class AccountLockTest extends \PHPUnit_Framework_TestCase
     {
         return [
             [
-                'lockExpirationDate' => date("F j, Y", strtotime('-1 days')),
-                'expectedResult' => new \Magento\Framework\Phrase('Unlocked')
+                'lockExpirationDate' => [
+                    'data' => [
+                        'items' => [['lock_expires' => null]],
+                    ]
+                ],
+                'expectedResult' => [
+                    'data' => [
+                        'items' => [
+                            [
+                                'lock_expires' => new \Magento\Framework\Phrase('Unlocked')
+                            ],
+                        ]
+                    ]
+                ]
             ],
             [
-                'lockExpirationDate' => date("F j, Y", strtotime('+1 days')),
-                'expectedResult' => new \Magento\Framework\Phrase('Locked')
-            ]
+                'lockExpirationDate' => [
+                    'data' => [
+                        'items' => [[]]//Non exist lock_expires data
+                    ]
+                ],
+                'expectedResult' => [
+                    'data' => [
+                        'items' => [
+                            [
+                                'lock_expires' => new \Magento\Framework\Phrase('Unlocked')
+                            ],
+                        ]
+                    ]
+                ]
+            ],
+            [
+                'lockExpirationDate' => [
+                    'data' => [
+                        'items' => [
+                            [
+                                'lock_expires' => date("F j, Y", strtotime('-1 days'))
+                            ],
+                        ]
+                    ]
+                ],
+                'expectedResult' => [
+                    'data' => [
+                        'items' => [
+                            [
+                                'lock_expires' => new \Magento\Framework\Phrase('Unlocked')
+                            ],
+                        ]
+                    ]
+                ]
+            ],
+            [
+                'lockExpirationDate' => [
+                    'data' => [
+                        'items' => [
+                            [
+                                'lock_expires' => date("F j, Y", strtotime('+1 days'))
+                            ],
+                        ]
+                    ]
+                ],
+                'expectedResult' => [
+                    'data' => [
+                        'items' => [
+                            [
+                                'lock_expires' => new \Magento\Framework\Phrase('Locked')
+                            ],
+                        ]
+                    ]
+                ]
+            ],
         ];
     }
 }
-- 
GitLab