fixed unit tests

Author: dconeybe

packages/firestore/src/api/index_configuration.ts

@@ -17,6 +17,10 @@
 
 import { firestoreClientSetIndexConfiguration } from '../core/firestore_client';
 import { fieldPathFromDotSeparatedString } from '../lite-api/user_data_reader';
+import {
+  getPersistentCacheIndexManager,
+  registerFieldIndexManagementApi
+} from './persistent_cache_index_manager';
 import {
   FieldIndex,
   IndexKind,
@@ -171,19 +175,21 @@ export function setIndexConfiguration(
   firestore: Firestore,
   jsonOrConfiguration: string | IndexConfiguration
 ): Promise<void> {
-  firestore = cast(firestore, Firestore);
-  const client = ensureFirestoreConfigured(firestore);
-  if (
-    !client._uninitializedComponentsProvider ||
-    client._uninitializedComponentsProvider?._offlineKind === 'memory'
-  ) {
+  const persistentCacheIndexManager = getPersistentCacheIndexManager(firestore);
+  if (!persistentCacheIndexManager) {
     // PORTING NOTE: We don't return an error if the user has not enabled
     // persistence since `enableIndexeddbPersistence()` can fail on the Web.
     logWarn('Cannot enable indexes when persistence is disabled');
     return Promise.resolve();
   }
+
+  registerFieldIndexManagementApi(persistentCacheIndexManager);
+
   const parsedIndexes = parseIndexes(jsonOrConfiguration);
-  return firestoreClientSetIndexConfiguration(client, parsedIndexes);
+  return firestoreClientSetIndexConfiguration(
+    persistentCacheIndexManager._client,
+    parsedIndexes
+  );
 }
 
 export function parseIndexes(

packages/firestore/src/api/persistent_cache_index_manager.ts

@@ -71,6 +71,15 @@ export function getPersistentCacheIndexManager(
   return instance;
 }
 
+export function registerFieldIndexManagementApi(
+  indexManager: PersistentCacheIndexManager
+): FieldIndexManagementApiImpl {
+  if (!indexManager._fieldIndexManagementApi) {
+    indexManager._fieldIndexManagementApi = new FieldIndexManagementApiImpl();
+  }
+  return indexManager._fieldIndexManagementApi;
+}
+
 /**
  * Enables the SDK to create persistent cache indexes automatically for local
  * query execution when the SDK believes cache indexes can help improve
@@ -84,24 +93,19 @@ export function enablePersistentCacheIndexAutoCreation(
   const client: FirestoreClient = indexManager._client;
   client.verifyNotTerminated();
 
-  if (!indexManager._fieldIndexManagementApi) {
-    indexManager._fieldIndexManagementApi = new FieldIndexManagementApiImpl();
-  }
+  const fieldIndexManagementApi = registerFieldIndexManagementApi(indexManager);
 
-  indexManager._fieldIndexManagementApi.indexAutoCreationEnabled = true;
+  fieldIndexManagementApi.indexAutoCreationEnabled = true;
 
   if (indexManager._fieldIndexManagementApiInstallPromise) {
     return;
   }
 
   indexManager._fieldIndexManagementApiInstallPromise =
-    firestoreClientSetFieldIndexManagementApi(
-      client,
-      indexManager._fieldIndexManagementApi
-    )
-      .then(_ => {
-        logDebug('enabling persistent cache index auto creation succeeded');
-      })
+    firestoreClientSetFieldIndexManagementApi(client, fieldIndexManagementApi)
+      .then(_ =>
+        logDebug('enabling persistent cache index auto creation succeeded')
+      )
       .catch(error =>
         logWarn('enabling persistent cache index auto creation failed', error)
       );

packages/firestore/src/index/field_index_management_api.ts

@@ -23,6 +23,8 @@ import { LocalDocumentsView } from '../local/local_documents_view';
  * limitations under the License.
  */
 export interface FieldIndexManagementApi {
+  indexAutoCreationEnabled: boolean;
+
   createCacheIndexes(
     transaction: PersistenceTransaction,
     indexManager: IndexManager,

packages/firestore/src/local/query_engine.ts

@@ -144,7 +144,9 @@ export class QueryEngine {
         return this.executeFullCollectionScan(transaction, query, context).next(
           result => {
             queryResult.result = result;
-            if (this.fieldIndexManagementApi) {
+            if (
+              this.fieldIndexManagementApi?.indexAutoCreationEnabled === true
+            ) {
               return this.fieldIndexManagementApi.createCacheIndexes(
                 transaction,
                 this.indexManager,

packages/firestore/test/unit/local/local_store_indexeddb.test.ts

@@ -179,6 +179,10 @@ class AsyncLocalStoreTester {
   }
 
   async configureFieldsIndexes(...indexes: FieldIndex[]): Promise<void> {
+    localStoreGetOrSetFieldIndexManagementApi(
+      this.localStore,
+      () => new FieldIndexManagementApiImpl()
+    );
     await localStoreConfigureFieldIndexes(this.localStore, indexes);
   }
 

packages/firestore/test/unit/local/query_engine.test.ts

@@ -286,6 +286,8 @@ function genericQueryEngineTest(
     );
     queryEngine.initialize(localDocuments, underlyingIndexManager);
 
+    queryEngine.fieldIndexManagementApi = new FieldIndexManagementApiImpl();
+
     indexManager = new TestIndexManager(persistence, underlyingIndexManager);
   });
 

packages/firestore/test/unit/specs/spec_test_runner.ts

@@ -78,7 +78,10 @@ import {
   DbPrimaryClientStore
 } from '../../../src/local/indexeddb_sentinels';
 import { LocalStore } from '../../../src/local/local_store';
-import { localStoreConfigureFieldIndexes } from '../../../src/local/local_store_impl';
+import {
+  localStoreConfigureFieldIndexes,
+  localStoreGetOrSetFieldIndexManagementApi
+} from '../../../src/local/local_store_impl';
 import { LruGarbageCollector } from '../../../src/local/lru_garbage_collector';
 import { MemoryLruDelegate } from '../../../src/local/memory_persistence';
 import {
@@ -178,6 +181,7 @@ import {
   QueryEvent,
   SharedWriteTracker
 } from './spec_test_components';
+import { FieldIndexManagementApiImpl } from '../../../src/index/field_index_management';
 
 use(chaiExclude);
 
@@ -583,6 +587,10 @@ abstract class TestRunner {
   ): Promise<void> {
     return this.queue.enqueue(async () => {
       const parsedIndexes = parseIndexes(jsonOrConfiguration);
+      localStoreGetOrSetFieldIndexManagementApi(
+        this.localStore,
+        () => new FieldIndexManagementApiImpl()
+      );
       return localStoreConfigureFieldIndexes(this.localStore, parsedIndexes);
     });
   }