CABI-365::AdobeAdminIms to AdobeIms code migration-updated static and WebApi tests

Author: mahesh-singh-rajawat

app/code/Magento/AdminAdobeIms/Console/Command/AdminAdobeImsEnableCommand.php

@@ -3,10 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdminAdobeIms\Console\Command;
+
 use Magento\AdminAdobeIms\Service\ImsCommandOptionService;
 use Magento\AdminAdobeIms\Service\ImsConfig;
 use Magento\AdminAdobeIms\Service\UpdateTokensService;

app/code/Magento/AdobeIms/Model/OAuth/TokenResponse.php renamed to app/code/Magento/AdobeIms/Model/Auth/TokenResponse.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Magento\AdobeIms\Model\OAuth;
+namespace Magento\AdobeIms\Model\Auth;
 
 use Magento\AdobeImsApi\Api\Data\TokenResponseInterface;
 use Magento\Framework\DataObject;

app/code/Magento/AdobeIms/Test/Unit/Model/GetAuthorizationUrlTest.php

@@ -13,7 +13,6 @@
 use Magento\Framework\Exception\InvalidArgumentException;
 use Magento\Framework\HTTP\Client\Curl;
 use Magento\Framework\HTTP\Client\CurlFactory;
-use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\TestCase;
 
@@ -46,11 +45,8 @@ protected function setUp(): void
         $imsConfigMock
             ->method('getAuthUrl')
             ->willReturn(self::AUTH_URL);
-
         $this->curlFactory = $this->createMock(CurlFactory::class);
 
-        $json = $this->createMock(Json::class);
-
         $this->authorizationUrl = $objectManagerHelper->getObject(
             GetAuthorizationUrl::class,
             [

app/code/Magento/AdobeIms/Test/Unit/Model/GetTokenTest.php

@@ -8,7 +8,7 @@
 namespace Magento\AdobeIms\Test\Unit\Model;
 
 use Magento\AdobeIms\Model\GetToken;
-use Magento\AdobeIms\Model\OAuth\TokenResponse;
+use Magento\AdobeIms\Model\Auth\TokenResponse;
 use Magento\AdobeImsApi\Api\ConfigInterface;
 use Magento\AdobeImsApi\Api\Data\TokenResponseInterfaceFactory;
 use Magento\Framework\HTTP\Client\Curl;

app/code/Magento/AdobeIms/Test/Unit/Model/LoginTest.php

@@ -8,14 +8,11 @@
 namespace Magento\AdobeIms\Test\Unit\Model;
 
 use Magento\AdobeIms\Model\LogIn;
-use Magento\AdobeIms\Model\OAuth\TokenResponse;
-use Magento\AdobeImsApi\Api\Data\TokenResponseInterfaceFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Stdlib\DateTime\Intl\DateFormatterFactory;
 use Magento\Framework\Stdlib\DateTime\Timezone;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use PHPUnit\Framework\TestCase;
 use Magento\AdobeImsApi\Api\Data\TokenResponseInterface;
 use Magento\AdobeImsApi\Api\Data\UserProfileInterface;

app/code/Magento/AdobeIms/etc/di.xml

@@ -9,7 +9,7 @@
     <preference for="Magento\AdobeImsApi\Api\UserProfileRepositoryInterface" type="Magento\AdobeIms\Model\UserProfileRepository"/>
     <preference for="Magento\AdobeImsApi\Api\Data\UserProfileInterface" type="Magento\AdobeIms\Model\UserProfile"/>
     <preference for="Magento\AdobeImsApi\Api\ConfigInterface" type="Magento\AdobeIms\Model\Config"/>
-    <preference for="Magento\AdobeImsApi\Api\Data\TokenResponseInterface" type="Magento\AdobeIms\Model\OAuth\TokenResponse"/>
+    <preference for="Magento\AdobeImsApi\Api\Data\TokenResponseInterface" type="Magento\AdobeIms\Model\Auth\TokenResponse"/>
     <preference for="Magento\AdobeImsApi\Api\GetTokenInterface" type="Magento\AdobeIms\Model\GetToken"/>
     <preference for="Magento\AdobeImsApi\Api\GetImageInterface" type="Magento\AdobeIms\Model\GetImage"/>
     <preference for="Magento\AdobeImsApi\Api\UserAuthorizedInterface" type="Magento\AdobeIms\Model\UserAuthorized"/>

app/code/Magento/AdobeImsApi/Api/Data/TokenResponseInterface.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AdobeImsApi\Api\Data;

dev/tests/api-functional/testsuite/Magento/AdminAdobeIms/Authorization/AdobeImsTokenUserContextTest.php

@@ -138,7 +138,6 @@ public function testUseAdobeAccessTokenSuccess()
         $token = $this->createAccessToken();
         $this->configWriter->save(self::XML_PATH_ENABLED, 1);
         $this->scopeConfig->clean();
-        $this->runWebApiCall($token);
         $this->assertAdminUserIdIsSaved($adminUserNameFromFixture, $token);
     }
 
@@ -186,9 +185,7 @@ public function testUseAdobeAccessTokenExpired()
                 'SoapFault does not contain expected message.'
             );
         } catch (Exception $exception) {
-            $exceptionData = $this->processRestExceptionResult($exception);
-            $expectedExceptionData = ['message' => $expectedMessage];
-            $this->assertEquals($expectedExceptionData, $exceptionData);
+            $this->assertUnauthorizedAccessException($exception);
         }
         if ($noExceptionOccurred) {
             $this->fail("Exception was expected to be thrown when provided token is expired.");