BUG#AC-6920:final testcases with fixes

Author: rachana

app/code/Magento/QuoteGraphQl/Model/Resolver/MaskedCartId.php

@@ -103,12 +103,11 @@ private function ensureQuoteMaskExist(int $quoteId): string
         if ($maskedId === '') {
             $quoteIdMask = $this->quoteIdMaskFactory->create();
             $quoteIdMask->setQuoteId($quoteId);
-
             $this->quoteIdMaskResourceModel->save($quoteIdMask);
             $maskedId = $this->quoteIdToMaskedQuoteId->execute($quoteId);
         }
         return $maskedId;
     }
-
 }
 
+

app/code/Magento/QuoteGraphQl/Test/Unit/Model/Resolver/MaskedCartIdTest.php

@@ -17,11 +17,9 @@
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResourceModel;
 use Magento\QuoteGraphQl\Model\Resolver\Cart;
-use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Resolver\MaskedCartId;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Magento\Quote\Model\QuoteIdMask;
 
 class MaskedCartIdTest extends TestCase
 {
@@ -65,9 +63,6 @@ class MaskedCartIdTest extends TestCase
      */
     private Cart $cartMock;
 
-    private Quote $quoteMock;
-
-    private QuoteIdMask $quoteIdMask;
     /**
      * @var Quote|MockObject
      */
@@ -92,54 +87,31 @@ protected function setUp(): void
             QuoteIdToMaskedQuoteIdInterface::class,
             ['execute']
         );
-    
         $this->quoteIdMaskFactory = $this->createPartialMock(
             QuoteIdMaskFactory::class,
             ['create']
         );
-<<<<<<< HEAD
         $this->quoteIdMaskResourceModelMock = $this->getMockBuilder(QuoteIdMaskResourceModel::class)
-       ->disableOriginalConstructor()
-          ->addMethods(
-              [
-               'setQuoteId',
-              ]
-          )
-          ->onlyMethods(['save'])
-          ->getMock();
-=======
-       /* $this->quoteIdMaskResourceModelMock = $this->createMock(QuoteIdMaskResourceModel::class,
-    ['setQuoteId']);*/
-    $this->quoteIdMaskResourceModelMock = $this->getMockBuilder(QuoteIdMaskResourceModel::class)
-    ->disableOriginalConstructor()
-     ->addMethods(
-        [
-            'setQuoteId',
-        ])
-      ->onlyMethods(['save'])
-    ->getMock();
->>>>>>> 0abcd0e7ba32642f377b80ba764baccbbe85c4b7
+            ->disableOriginalConstructor()
+            ->addMethods(
+                [
+                    'setQuoteId',
+                ]
+            )
+            ->onlyMethods(['save'])
+            ->getMock();
         $this->maskedCartId = new MaskedCartId(
             $this->quoteIdToMaskedQuoteId,
             $this->quoteIdMaskFactory,
             $this->quoteIdMaskResourceModelMock
         );
         $this->quoteMock = $this->getMockBuilder(Quote::class)
-<<<<<<< HEAD
-         ->disableOriginalConstructor()
-         ->getMock();
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->quoteIdMask = $this->getMockBuilder(QuoteIdMask::class)
-           ->disableOriginalConstructor()
-           ->getMock();
+            ->disableOriginalConstructor()
+            ->getMock();
     }
-=======
-        ->disableOriginalConstructor()
-        ->getMock();
-        $this->quoteIdMask = $this->getMockBuilder(QuoteIdMask::class)
-        ->disableOriginalConstructor()
-        ->getMock();
-      }
->>>>>>> 0abcd0e7ba32642f377b80ba764baccbbe85c4b7
 
     public function testResolveWithoutModelInValueParameter(): void
     {
@@ -153,36 +125,19 @@ public function testResolve(): void
         $this->valueMock = ['model' => $this->quoteMock];
         $cartId = 1;
         $this->quoteMock
-        ->expects($this->once())
-        ->method('getId')
-        ->willReturn($cartId);
-<<<<<<< HEAD
+            ->expects($this->once())
+            ->method('getId')
+            ->willReturn($cartId);
         $this->quoteIdMaskFactory
-          ->expects($this->once())
-          ->method('create')
-          ->willReturn($this->quoteIdMask);
+            ->expects($this->once())
+            ->method('create')
+            ->willReturn($this->quoteIdMask);
         $this->quoteIdMask->setQuoteId($cartId);
         $this->quoteIdMaskResourceModelMock
-       ->expects($this->once())
-       ->method('save')
-       ->with($this->quoteIdMask);
-=======
-
-        $this->quoteIdMaskFactory
-        ->expects($this->once())
-        ->method('create')
-        ->willReturn($this->quoteIdMask);
-
-        $this->quoteIdMask->setQuoteId($cartId);
-        
-        $this->quoteIdMaskResourceModelMock
-        ->expects($this->once())
-        ->method('save')
-        ->with( $this->quoteIdMask);
-    
-    
-
->>>>>>> 0abcd0e7ba32642f377b80ba764baccbbe85c4b7
+            ->expects($this->once())
+            ->method('save')
+            ->with($this->quoteIdMask);
         $this->maskedCartId->resolve($this->fieldMock, $this->contextMock, $this->resolveInfoMock, $this->valueMock);
     }
 }
+