Fix static tests

Author: pmclain

app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php

@@ -10,7 +10,7 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\VaultGraphQl\Model\VisibleTokenRetriever;
+use Magento\Vault\Model\PaymentTokenManagement;
 use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
 
 /**
@@ -19,24 +19,24 @@
 class PaymentTokens implements ResolverInterface
 {
     /**
-     * @var VisibleTokenRetriever
+     * @var PaymentTokenManagement
      */
-    private $visibleTokenRetriever;
+    private $paymentTokenManagement;
 
     /**
      * @var CheckCustomerAccount
      */
     private $checkCustomerAccount;
 
     /**
-     * @param VisibleTokenRetriever $visibleTokenRetriever
+     * @param PaymentTokenManagement $paymentTokenManagement
      * @param CheckCustomerAccount $checkCustomerAccount
      */
     public function __construct(
-        VisibleTokenRetriever $visibleTokenRetriever,
+        PaymentTokenManagement $paymentTokenManagement,
         CheckCustomerAccount $checkCustomerAccount
     ) {
-        $this->visibleTokenRetriever = $visibleTokenRetriever;
+        $this->paymentTokenManagement = $paymentTokenManagement;
         $this->checkCustomerAccount = $checkCustomerAccount;
     }
 
@@ -55,7 +55,7 @@ public function resolve(
 
         $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
 
-        $tokens = $this->visibleTokenRetriever->getVisibleAvailableTokens($currentUserId);
+        $tokens = $this->paymentTokenManagement->getVisibleAvailableTokens($currentUserId);
         $result = [];
 
         foreach ($tokens as $token) {

app/code/Magento/VaultGraphQl/Model/VisibleTokenRetriever.php

@@ -10,7 +10,7 @@
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\VaultGraphQl\Model\VisibleTokenRetriever;
+use Magento\Vault\Model\PaymentTokenManagement;
 use Magento\Vault\Model\ResourceModel\PaymentToken as TokenResource;
 use Magento\Vault\Model\ResourceModel\PaymentToken\CollectionFactory;
 
@@ -22,7 +22,7 @@ class CustomerPaymentTokensTest extends GraphQlAbstract
     private $customerTokenService;
 
     /**
-     * @var VisibleTokenRetriever
+     * @var PaymentTokenManagement
      */
     private $paymentTokenManagement;
 
@@ -41,7 +41,7 @@ protected function setUp()
         parent::setUp();
 
         $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-        $this->paymentTokenManagement = Bootstrap::getObjectManager()->get(VisibleTokenRetriever::class);
+        $this->paymentTokenManagement = Bootstrap::getObjectManager()->get(PaymentTokenManagement::class);
         $this->tokenResource = Bootstrap::getObjectManager()->get(TokenResource::class);
         $this->tokenCollectionFactory = Bootstrap::getObjectManager()->get(CollectionFactory::class);
     }
@@ -151,7 +151,6 @@ public function testDeletePaymentToken()
         $this->assertArrayHasKey('type', $token);
         // Validate gateway token is NOT returned
         $this->assertArrayNotHasKey('gateway_token', $token);
-
     }
 
     /**