Fix EntityMapperTest unit tests

Author: Hectorhammett

Datastore/src/EntityMapper.php

@@ -222,18 +222,26 @@ public function convertValue($type, $value, $className = Entity::class)
                 break;
 
             case 'timestampValue':
-                // The Serializer converts timestamps to an array [seconds, nanos].
-                // This code is taking that format to convert it into an Immutable date.
-                $seconds = $value['seconds'];
-                $nanos = $value['nanos'] ?? 0;
-                $microseconds = (int)($nanos / 1000);
-                $result = \DateTimeImmutable::createFromFormat(
-                    'U.u',
-                    sprintf('%d.%06d', $seconds, $microseconds)
-                );
+                if (is_array($value)) {
+                    // The Serializer converts timestamps to an array [seconds, nanos].
+                    // This code is taking that format to convert it into an Immutable date.
+                    $seconds = $value['seconds'];
+                    $nanos = $value['nanos'] ?? 0;
+                    $microseconds = (int)($nanos / 1000);
+                    $result = \DateTimeImmutable::createFromFormat(
+                        'U.u',
+                        sprintf('%d.%06d', $seconds, $microseconds)
+                    );
+                } else {
+                    // This is to keep compatibility with the previous implementation
+                    $result = \DateTimeImmutable::createFromFormat(self::DATE_FORMAT, $value);
 
-                break;
+                    if (!$result) {
+                        $result = \DateTimeImmutable::createFromFormat(self::DATE_FORMAT_NO_MS, $value);
+                    }
+                }
 
+                break;
             case 'keyValue':
                 $namespaceId = (isset($value['partitionId']['namespaceId']))
                     ? $value['partitionId']['namespaceId']

Datastore/tests/Unit/EntityMapperTest.php

@@ -109,11 +109,22 @@ public function testResponseToPropertiesDoubleValue($input, $expected)
 
     public function testResponseToPropertiesTimestampValue()
     {
-        $date = new \DateTimeImmutable;
+        $seconds = 1678886400;
+        $nanos = 123456789;
+        $microseconds = floor($nanos / 1000);
+        $date = \DateTimeImmutable::createFromFormat(
+            'U.u',
+            sprintf('%d.%06d', $seconds, $microseconds)
+        );
 
         $data = [
             'foo' => [
-                'timestampValue' => $date->format(self::DATE_FORMAT)
+                // This data is after a Proto has been transformed
+                // by the serializer class
+                'timestampValue' => [
+                    'seconds' => $seconds,
+                    'nanos' => $nanos
+                ]
             ]
         ];
 
@@ -676,16 +687,6 @@ public function testValueObjectInt()
         $this->assertEquals(1, $int['integerValue']);
     }
 
-    /**
-     * @dataProvider valueObjectDoubleCases
-     */
-    public function testValueObjectDoubleForGrpcClient($input, $expected)
-    {
-        $double = $this->mapper->valueObject($input);
-
-        $this->compareResult($expected, $double['doubleValue']);
-    }
-
     /**
      * @dataProvider valueObjectDoubleForRestCases
      */
@@ -922,16 +923,9 @@ public function datastoreToSimpleDoubleValueCases()
     {
         return [
             [1.1, 1.1],
-
-            // Happens when using rest client
             ['Infinity', INF],
             ['-Infinity', -INF],
             ['NaN', NAN],
-
-            // Happens when using grpc client
-            [INF, INF],
-            [-INF, -INF],
-            [NAN, NAN]
         ];
     }