Conflict resolved

Author: mrprabhu92

dev/tests/api-functional/testsuite/Magento/GraphQl/OrderCancellation/CancelGuestOrderTest.php

@@ -2,6 +2,15 @@
 /**
  * Copyright 2024 Adobe
  * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
  */
 declare(strict_types=1);
 
@@ -193,13 +202,13 @@ public function testAttemptToCancelOrderWithSomeStatuses(string $status, string
         $this->assertEquals(
             [
                 'requestGuestOrderCancel' => [
-                        'errorV2' => [
-                            'message' => 'Order already closed, complete, cancelled or on hold'
-                        ],
-                        'order' => [
-                            'status' => $expectedStatus
-                        ]
+                    'errorV2' => [
+                        'message' => 'Order already closed, complete, cancelled or on hold'
+                    ],
+                    'order' => [
+                        'status' => $expectedStatus
                     ]
+                ]
             ],
             $this->graphQlMutation($query)
         );
@@ -236,13 +245,13 @@ public function testAttemptToCancelOrderWithOfflinePaymentFullyInvoicedFullyShip
         $this->assertEquals(
             [
                 'requestGuestOrderCancel' => [
-                        'errorV2' => [
-                            'message' => 'Order already closed, complete, cancelled or on hold'
-                        ],
-                        'order' => [
-                            'status' => 'Complete'
-                        ]
+                    'errorV2' => [
+                        'message' => 'Order already closed, complete, cancelled or on hold'
+                    ],
+                    'order' => [
+                        'status' => 'Complete'
                     ]
+                ]
             ],
             $this->graphQlMutation($query)
         );
@@ -292,13 +301,13 @@ public function testAttemptToCancelOrderWithOfflinePaymentFullyInvoicedPartially
         $this->assertEquals(
             [
                 'requestGuestOrderCancel' => [
-                        'errorV2' => [
-                            'message' => 'Order with one or more items shipped cannot be cancelled'
-                        ],
-                        'order' => [
-                            'status' => 'Processing'
-                        ]
+                    'errorV2' => [
+                        'message' => 'Order with one or more items shipped cannot be cancelled'
+                    ],
+                    'order' => [
+                        'status' => 'Processing'
                     ]
+                ]
             ],
             $this->graphQlMutation($query)
         );
@@ -335,13 +344,13 @@ public function testAttemptToCancelOrderWithOfflinePaymentFullyInvoicedFullyRefu
         $this->assertEquals(
             [
                 'requestGuestOrderCancel' => [
-                        'errorV2' => [
-                            'message' => 'Order already closed, complete, cancelled or on hold'
-                        ],
-                        'order' => [
-                            'status' => 'Closed'
-                        ]
+                    'errorV2' => [
+                        'message' => 'Order already closed, complete, cancelled or on hold'
+                    ],
+                    'order' => [
+                        'status' => 'Closed'
                     ]
+                ]
             ],
             $this->graphQlMutation($query)
         );
@@ -373,11 +382,11 @@ public function testCancelOrderWithOutAnyAmountPaid()
         $this->assertEquals(
             [
                 'requestGuestOrderCancel' => [
-                        'errorV2' => null,
-                        'order' => [
-                            'status' => 'Pending'
-                        ]
+                    'errorV2' => null,
+                    'order' => [
+                        'status' => 'Pending'
                     ]
+                ]
             ],
             $this->graphQlMutation($query)
         );
@@ -467,14 +476,14 @@ private function getOrderToken(OrderInterface $order): string
         return Bootstrap::getObjectManager()->create(Token::class)->encrypt(
             $order->getIncrementId(),
             $order->getBillingAddress()->getEmail(),
-            $order->getBillingAddress()->getLastname()
+            $order->getBillingAddress()->getPostcode()
         );
     }
 
     /**
      * @return array[]
      */
-    public static function orderStatusProvider(): array
+    public function orderStatusProvider(): array
     {
         return [
             'On Hold status' => [