Enhance AdobeIms tests

.travis.yml

@@ -16,7 +16,9 @@ services:
   - elasticsearch
 language: php
 php:
+  - '7.1'
   - '7.2'
+  - '7.3'
 env:
   global:
     - COMPOSER_BIN_DIR=~/bin

AdobeIms/Test/Unit/Block/Adminhtml/SignInTest.php

@@ -82,7 +82,7 @@ class SignInTest extends TestCase
     /**
      * Prepare test objects.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
         $urlBuilderMock = $this->createMock(UrlInterface::class);

AdobeIms/Test/Unit/Controller/Adminhtml/OAuth/CallbackTest.php

@@ -86,7 +86,7 @@ class CallbackTest extends TestCase
     /**
      * Prepare test objects.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
         $this->authMock = $this->createMock(\Magento\Backend\Model\Auth::class);

AdobeIms/Test/Unit/Controller/Adminhtml/User/LogoutTest.php

@@ -54,7 +54,7 @@ class LogoutTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->logoutInterfaceMock = $this->createMock(LogOutInterface::class);
         $this->context = $this->createMock(\Magento\Backend\App\Action\Context::class);

AdobeIms/Test/Unit/Controller/Adminhtml/User/ProfileTest.php

@@ -62,7 +62,7 @@ class ProfileTest extends TestCase
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->action = $this->createMock(\Magento\Backend\App\Action\Context::class);
 

AdobeIms/Test/Unit/Model/ConfigTest.php

@@ -38,7 +38,7 @@ class ConfigTest extends TestCase
     /**
      * Prepare test objects.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
         $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);

AdobeIms/Test/Unit/Model/FlushUserTokensTest.php

@@ -37,7 +37,7 @@ class FlushUserTokensTest extends TestCase
     /**
      * Prepare test objects.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->userContext = $this->createMock(UserContextInterface::class);
         $this->userProfileRepository = $this->createMock(UserProfileRepositoryInterface::class);

AdobeIms/Test/Unit/Model/GetAccessTokenTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\AdobeIms\Test\Unit\Model;
 
-use Elasticsearch\Endpoints\Get;
 use Magento\AdobeIms\Model\GetAccessToken;
 use Magento\AdobeImsApi\Api\UserProfileRepositoryInterface;
 use Magento\Authorization\Model\UserContextInterface;
@@ -39,7 +38,7 @@ class GetAccessTokenTest extends TestCase
     /**
      * Prepare test objects.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->userContext = $this->createMock(UserContextInterface::class);
         $this->userProfile = $this->createMock(UserProfileRepositoryInterface::class);

AdobeIms/Test/Unit/Model/GetImageTest.php

@@ -61,7 +61,7 @@ class GetImageTest extends TestCase
     /**
      * Prepare test objects.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
         $this->configMock = $this->createMock(ScopeConfigInterface::class);

AdobeIms/Test/Unit/Model/GetTokenTest.php

@@ -54,7 +54,7 @@ class GetTokenTest extends TestCase
     /**
      * Prepare test objects.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
         $this->configMock = $this->createMock(ConfigInterface::class);

AdobeIms/Test/Unit/Model/LogOutTest.php

@@ -192,6 +192,6 @@ public function testExecuteWithException(): void
             );
         $this->loggerInterfaceMock->expects($this->once())
             ->method('critical');
-        $this->assertEquals(false, $this->model->execute());
+        $this->assertFalse($this->model->execute());
     }
 }

AdobeIms/Test/Unit/Model/UserAuthorizedTest.php

@@ -36,7 +36,7 @@ class UserAuthorizedTest extends TestCase
     /**
      * Prepare test objects.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->userContext = $this->createMock(UserContextInterface::class);
         $this->userProfile = $this->createMock(UserProfileRepositoryInterface::class);
@@ -62,6 +62,6 @@ public function testExecute(): void
             ->method('getAccessTokenExpiresAt')
             ->willReturn(date('Y-m-d H:i:s'));
 
-        $this->assertEquals(true, $this->userAuthorized->execute());
+        $this->assertTrue($this->userAuthorized->execute());
     }
 }

AdobeIms/Test/Unit/Model/UserProfileRepositoryTest.php

@@ -43,7 +43,7 @@ class UserProfileRepositoryTest extends TestCase
     /**
      * Prepare test objects.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
         $this->resource = $this->createMock(ResourceUserProfile::class);
@@ -65,12 +65,12 @@ public function testSave(): void
 
     /**
      * Test save with exception.
-     *
-     * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     * @expectedExceptionMessage Could not save user profile.
      */
     public function testSaveWithException(): void
     {
+        $this->expectException(\Magento\Framework\Exception\CouldNotSaveException::class);
+        $this->expectExceptionMessage('Could not save user profile.');
+
         $userProfile = $this->createMock(UserProfile::class);
         $this->resource->expects($this->once())
             ->method('save')
@@ -94,12 +94,12 @@ public function testGet()
 
     /**
      * Test get user id with exception.
-     *
-     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage The user profile wasn't found.
      */
     public function testGeWithException()
     {
+        $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class);
+        $this->expectExceptionMessage('The user profile wasn\'t found.');
+
         $entity = $this->objectManager->getObject(UserProfile::class);
         $this->entityFactory->method('create')
             ->willReturn($entity);