Improve tests

sanmai · Nov 1, 2020 · 31719a8 · 31719a8
1 parent 8b8c783
commit 31719a8
Show file tree

Hide file tree

Showing 13 changed files with 113 additions and 16 deletions.
diff --git a/examples/140_GetOrder.php b/examples/140_GetOrder.php
@@ -40,6 +40,9 @@
 
 $order = $client->getOrder((int) $argv[1]);
 
+$logger->addFile('order-status-request.json');
+$logger->addFile('order-status-response.json');
+
 $statuses = $client->getOrderStatuses($order->id);
 
 echo "Order ID: {$statuses->id}\n";

diff --git a/examples/150_OrdersStatus.php b/examples/150_OrdersStatus.php
@@ -48,6 +48,9 @@
 $order = $request->addOrder();
 $order->externalId = '100';
 
+$logger->addFile('orders-status-request.json');
+$logger->addFile('orders-status-response.json');
+
 $response = $client->sendOrdersStatusRequest($request);
 
 if ($response->hasErrors()) {

diff --git a/src/Responses/Bad/BadRequestResponse/ValidationError.php b/src/Responses/Bad/BadRequestResponse/ValidationError.php
@@ -151,6 +151,10 @@ public function getMessage(): string
             return \sprintf('%s->%s %s', $this->objectName, $this->field, $this->message);
         }
 
+        if ($this->message !== null) {
+            return $this->message;
+        }
+
         foreach (\get_object_vars($this) as $key => $value) {
             if (!\is_string($value)) {
                 continue;

diff --git a/tests/Deserialization/OrderStatusesResponseTest.php b/tests/Deserialization/OrderStatusesResponseTest.php
@@ -33,11 +33,11 @@
 
 /**
  * @covers \YDeliverySDK\Responses\OrderStatusesResponse
- * @covers \YDeliverySDK\Responses\Types\Order
+ * @covers \YDeliverySDK\Responses\Types\Status
  */
 class OrderStatusesResponseTest extends TestCase
 {
-    public function test_empty_order()
+    public function test_regular_order()
     {
         $response = $this->loadFixture('statuses.json');
 

diff --git a/tests/Deserialization/OrdersStatusResponseTest.php b/tests/Deserialization/OrdersStatusResponseTest.php
@@ -34,6 +34,7 @@
 /**
  * @covers \YDeliverySDK\Responses\OrdersStatusResponse
  * @covers \YDeliverySDK\Responses\Types\OrderStatus
+ * @covers \YDeliverySDK\Responses\Types\Status
  */
 class OrdersStatusResponseTest extends TestCase
 {
@@ -60,6 +61,21 @@ public function test_successful_request()
         }
     }
 
+    public function test_invalid_order()
+    {
+        $response = $this->loadFixture('orders-status-empty.json');
+
+        $this->assertFalse($response->hasErrors());
+
+        $this->assertCount(2, $response);
+
+        foreach ($response as $item) {
+            /** @var $item OrderStatus */
+            $this->assertNull($item->status->datetime);
+            $this->assertGreaterThan(0, $item->status->timestamp->getTimestamp());
+        }
+    }
+
     private function loadFixture(string $filename): OrdersStatusResponse
     {
         return $this->loadFixtureWithType($filename, OrdersStatusResponse::class);

diff --git a/tests/Deserialization/SubmitOrderResponseTest.php b/tests/Deserialization/SubmitOrderResponseTest.php
@@ -37,6 +37,7 @@
 /**
  * @covers \YDeliverySDK\Responses\SubmitOrderResponse
  * @covers \YDeliverySDK\Responses\Types\SubmittedOrder
+ * @covers \YDeliverySDK\Responses\Types\SubmittedOrder\Error
  */
 class SubmitOrderResponseTest extends TestCase
 {
@@ -93,6 +94,14 @@ public function test_with_validation_error()
         );
     }
 
+    public function test_empty()
+    {
+        $response = $this->loadFixture('empty.json');
+
+        $this->assertCount(0, $response);
+        $this->assertFalse($response->hasErrors());
+    }
+
     private function toErrorsArray(Response $response): array
     {
         return take($response->getMessages())->map(function (HasErrorCode $message) {

diff --git a/tests/Deserialization/ValidationErrorTest.php b/tests/Deserialization/ValidationErrorTest.php
@@ -31,27 +31,47 @@
 use YDeliverySDK\Responses\Bad\BadRequestResponse\ValidationError;
 
 /**
- * @covers \YDeliverySDK\Responses\PostalCodeResponse
- * @covers \YDeliverySDK\Responses\Types\PostalCode
+ * @covers \YDeliverySDK\Responses\Bad\BadRequestResponse\ValidationError
  */
 class ValidationErrorTest extends TestCase
 {
-    private const EXAMPLE_ERROR = '{
-            "objectName": "senderOrderDraft",
-            "field": "deliveryType",
-            "message": "must not be null",
-            "conditionCode": "NotNull",
-            "arguments": {},
-            "errorCode": "FIELD_NOT_VALID"
-        }';
-
-    public function test_it_deserializes()
+    public function test_it_deserializes_simple_type()
     {
-        /** @var ValidationError $error */
-        $error = $this->getSerializer()->deserialize(self::EXAMPLE_ERROR, ValidationError::class);
+        $error = $this->loadFixture('validation-error-simple.json');
+
+        $this->assertSame('BOO_ERROR', $error->getErrorCode());
+        $this->assertSame('Boo', $error->getMessage());
+    }
+
+    public function test_it_deserializes_standard_type()
+    {
+        $error = $this->loadFixture('validation-error.json');
 
         $this->assertSame('FIELD_NOT_VALID', $error->getErrorCode());
         $this->assertSame('senderOrderDraft->deliveryType must not be null', $error->getMessage());
         $this->assertSame('NotNull', $error->conditionCode);
     }
+
+    public function test_it_deserializes_rare_type()
+    {
+        $error = $this->loadFixture('validation-error2.json');
+
+        $this->assertSame('OPTION_CALCULATED_DATE_MIN_MISMATCH', $error->getErrorCode());
+        $this->assertSame('2020-10-31', $error->getMessage());
+        $this->assertNull($error->currentValue);
+    }
+
+    public function test_it_deserializes_even_rare_type()
+    {
+        $error = $this->loadFixture('validation-error-code.json');
+
+        $this->assertSame('FATAL_ERROR', $error->getErrorCode());
+        $this->assertSame('FATAL_ERROR', $error->getMessage());
+        $this->assertSame('FATAL_ERROR', $error->message);
+    }
+
+    private function loadFixture(string $filename): ValidationError
+    {
+        return $this->loadFixtureWithType($filename, ValidationError::class);
+    }
 }
diff --git a/tests/Fixtures/responses/empty.json b/tests/Fixtures/responses/empty.json
@@ -0,0 +1 @@
+[]
diff --git a/tests/Fixtures/responses/orders-status-empty.json b/tests/Fixtures/responses/orders-status-empty.json
@@ -0,0 +1,20 @@
+[
+    {
+        "id": 111,
+        "externalId": null,
+        "status": {
+            "code": "NOT_FOUND",
+            "description": "Заказ не найден.",
+            "datetime": null
+        }
+    },
+    {
+        "id": null,
+        "externalId": "100",
+        "status": {
+            "code": "NOT_FOUND",
+            "description": "Заказ не найден.",
+            "datetime": null
+        }
+    }
+]
diff --git a/tests/Fixtures/responses/validation-error-code.json b/tests/Fixtures/responses/validation-error-code.json
@@ -0,0 +1,4 @@
+{
+   "errorCode": "FATAL_ERROR",
+   "message": null
+}
diff --git a/tests/Fixtures/responses/validation-error-simple.json b/tests/Fixtures/responses/validation-error-simple.json
@@ -0,0 +1,4 @@
+{
+   "errorCode": "BOO_ERROR",
+   "message": "Boo"
+}
diff --git a/tests/Fixtures/responses/validation-error.json b/tests/Fixtures/responses/validation-error.json
@@ -0,0 +1,8 @@
+{
+ "objectName": "senderOrderDraft",
+ "field": "deliveryType",
+ "message": "must not be null",
+ "conditionCode": "NotNull",
+ "arguments": {},
+ "errorCode": "FIELD_NOT_VALID"
+}
diff --git a/tests/Fixtures/responses/validation-error2.json b/tests/Fixtures/responses/validation-error2.json
@@ -0,0 +1,5 @@
+{
+   "errorCode": "OPTION_CALCULATED_DATE_MIN_MISMATCH",
+   "currentValue": null,
+   "actualValue": "2020-10-31"
+}