MErge

Author: schmidt-sebastian

packages/firestore/test/unit/model/values.test.ts

@@ -29,17 +29,16 @@ import {
   estimateByteSize
 } from '../../../src/model/values';
 import { DocumentKey } from '../../../src/model/document_key';
-import { PrimitiveValue } from '../../../src/model/proto_field_value';
 import { primitiveComparator } from '../../../src/util/misc';
 import {
   blob,
   dbId,
   expectCorrectComparisonGroups,
   expectEqualitySets,
   key,
-  ref
+  ref, wrap
 } from '../../util/helpers';
-import { valueOf } from '../../util/values';
+import {serverTimestamp} from "../../../src/model/server_timestamps";
 
 describe('Values', () => {
   const date1 = new Date(2016, 4, 2, 1, 5);
@@ -69,13 +68,12 @@ describe('Values', () => {
       [wrap('\u00e9a')],
       [wrap(date1), wrap(Timestamp.fromDate(date1))],
       [wrap(date2)],
-      // TODO(mrschmidt): Support ServerTimestamps
-      // [
-      //   // NOTE: ServerTimestampValues can't be parsed via wrap().
-      //   serverTimestamp(Timestamp.fromDate(date1), null),
-      //   serverTimestamp(Timestamp.fromDate(date1), null)
-      // ],
-      // [serverTimestamp(Timestamp.fromDate(date2), null)],
+      [
+        // NOTE: ServerTimestampValues can't be parsed via wrap().
+        serverTimestamp(Timestamp.fromDate(date1), null),
+        serverTimestamp(Timestamp.fromDate(date1), null)
+      ],
+      [serverTimestamp(Timestamp.fromDate(date2), null)],
       [wrap(new GeoPoint(0, 1)), wrap(new GeoPoint(0, 1))],
       [wrap(new GeoPoint(1, 0))],
       [wrap(ref('project', 'coll/doc1')), wrap(ref('project', 'coll/doc1'))],
@@ -152,10 +150,9 @@ describe('Values', () => {
       [wrap(date1)],
       [wrap(date2)],
 
-      // TODO(mrschmidt): Support ServerTimestamps
-      // // server timestamps come after all concrete timestamps.
-      // [serverTimestamp(Timestamp.fromDate(date1), null)],
-      // [serverTimestamp(Timestamp.fromDate(date2), null)],
+      // server timestamps come after all concrete timestamps.
+      [serverTimestamp(Timestamp.fromDate(date1), null)],
+      [serverTimestamp(Timestamp.fromDate(date2), null)],
 
       // strings
       [wrap('')],
@@ -285,21 +282,20 @@ describe('Values', () => {
         expectedByteSize: 16,
         elements: [wrap(Timestamp.fromMillis(100)), wrap(Timestamp.now())]
       },
-      // TODO(mrschmidt): Support ServerTimestamps
-      // {
-      //   expectedByteSize: 16,
-      //   elements: [
-      //     serverTimestamp(Timestamp.fromMillis(100), null),
-      //     serverTimestamp(Timestamp.now(), null)
-      //   ]
-      // },
-      // {
-      //   expectedByteSize: 20,
-      //   elements: [
-      //     serverTimestamp(Timestamp.fromMillis(100), wrap(true)),
-      //     serverTimestamp(Timestamp.now(), wrap(false))
-      //   ]
-      // },
+      {
+        expectedByteSize: 16,
+        elements: [
+          serverTimestamp(Timestamp.fromMillis(100), null),
+          serverTimestamp(Timestamp.now(), null)
+        ]
+      },
+      {
+        expectedByteSize: 20,
+        elements: [
+          serverTimestamp(Timestamp.fromMillis(100), wrap(true)),
+          serverTimestamp(Timestamp.now(), wrap(false))
+        ]
+      },
       {
         expectedByteSize: 42,
         elements: [
@@ -327,11 +323,10 @@ describe('Values', () => {
     // as the size of the underlying data grows.
     const relativeGroups: api.Value[][] = [
       [wrap(blob(0)), wrap(blob(0, 1))],
-      // TODO(mrschmidt): Support ServerTimestamps
-      // [
-      //   serverTimestamp(Timestamp.fromMillis(100), null),
-      //   serverTimestamp(Timestamp.now(), wrap(null))
-      // ],
+      [
+        serverTimestamp(Timestamp.fromMillis(100), null),
+        serverTimestamp(Timestamp.now(), wrap(null))
+      ],
       [
         refValue(dbId('p1', 'd1'), key('c1/doc1')),
         refValue(dbId('p1', 'd1'), key('c1/doc1/c2/doc2'))
@@ -407,11 +402,6 @@ describe('Values', () => {
   });
 });
 
-// TODO(mrschmidt): Clean up the helpers and merge wrap() with TestUtil.wrap()
-function wrap(value: unknown): api.Value {
-  return new PrimitiveValue(valueOf(value)).proto;
-}
-
 /** Creates a referenceValue Proto for `databaseId` and `key`. */
 export function refValue(databaseId: DatabaseId, key: DocumentKey): api.Value {
   return {