test fix

Author: raju-opti

lib/vuid/vuid_manager.ts

@@ -92,17 +92,20 @@ export class VuidCacheManager {
 
 export type VuidManagerConfig = {
   enableVuid?: boolean;
+  vuidCache: Cache<string>;
   vuidCacheManager: VuidCacheManager;
 }
 
 export class DefaultVuidManager implements VuidManager {
   private vuidCacheManager: VuidCacheManager;
   private vuid?: string;
+  private vuidCache: Cache<string>;
   private vuidEnabled = false;
 
   constructor(config: VuidManagerConfig) {
     this.vuidCacheManager = config.vuidCacheManager;
     this.vuidEnabled = config.enableVuid || false;
+    this.vuidCache = config.vuidCache;
   }
 
   getVuid(): Maybe<string> {
@@ -118,6 +121,7 @@ export class DefaultVuidManager implements VuidManager {
    * @returns Promise that resolves when the VuidManager is initialized
    */
   async initialize(): Promise<void> {      
+    this.vuidCacheManager.setCache(this.vuidCache);
     if (!this.vuidEnabled) {
       await this.vuidCacheManager.remove();
       return;

lib/vuid/vuid_manager_factory.browser.spec.ts

@@ -13,6 +13,7 @@ vi.mock('./vuid_manager', () => {
   };
 });
 
+import { getMockSyncCache } from '../tests/mock/mock_cache';
 import { createVuidManager } from './vuid_manager_factory.browser';
 import { LocalStorageCache } from '../utils/cache/local_storage_cache.browser';
 import { DefaultVuidManager, VuidCacheManager } from './vuid_manager';
@@ -23,6 +24,7 @@ describe('createVuidManager', () => {
   const MockDefaultVuidManager = vi.mocked(DefaultVuidManager);
 
   beforeEach(() => {
+    MockLocalStorageCache.mockClear();
     MockDefaultVuidManager.mockClear();
   });
 
@@ -36,15 +38,18 @@ describe('createVuidManager', () => {
     expect(MockDefaultVuidManager.mock.calls[1][0].enableVuid).toBe(false);
   });
 
-  it('should use a VuidCacheManager with a LocalStorageCache', () => {
-    const manager = createVuidManager({ enableVuid: true });
+  it('should use the provided cache', () => {
+    const cache = getMockSyncCache<string>();
+    const manager = createVuidManager({ enableVuid: true, vuidCache: cache });
     expect(manager).toBe(MockDefaultVuidManager.mock.instances[0]);
+    expect(MockDefaultVuidManager.mock.calls[0][0].vuidCache).toBe(cache);
+  });
 
+  it('should use a LocalStorageCache if no cache is provided', () => {
+    const manager = createVuidManager({ enableVuid: true });
+    expect(manager).toBe(MockDefaultVuidManager.mock.instances[0]);
 
-    const usedCacheManager = MockDefaultVuidManager.mock.calls[0][0].vuidCacheManager;
-    expect(usedCacheManager).toBe(MockVuidCacheManager.mock.instances[0]);
-
-    const usedCache = MockVuidCacheManager.mock.calls[0][0];
+    const usedCache = MockDefaultVuidManager.mock.calls[0][0].vuidCache;
     expect(usedCache).toBe(MockLocalStorageCache.mock.instances[0]);
   });
 

lib/vuid/vuid_manager_factory.browser.ts

@@ -17,15 +17,12 @@ import { DefaultVuidManager, VuidCacheManager, VuidManager } from './vuid_manage
 import { LocalStorageCache } from '../utils/cache/local_storage_cache.browser';
 import { VuidManagerOptions } from './vuid_manager_factory';
 
-export const vuidCacheManager = new VuidCacheManager(new LocalStorageCache<string>());
+export const vuidCacheManager = new VuidCacheManager();
 
 export const createVuidManager = (options: VuidManagerOptions): VuidManager => {
-  if (options.vuidCache) {
-    vuidCacheManager.setCache(options.vuidCache);
-  }
-  
   return new DefaultVuidManager({
     vuidCacheManager,
+    vuidCache: options.vuidCache || new LocalStorageCache<string>(),
     enableVuid: options.enableVuid
   });
 }

lib/vuid/vuid_manager_factory.react_native.spec.ts

@@ -1,8 +1,8 @@
 import { vi, describe, expect, it, beforeEach } from 'vitest';
 
-vi.mock('../utils/cache/local_storage_cache.react_native', () => {
+vi.mock('../utils/cache/async_storage_cache.react_native', () => {
   return {
-    LocalStorageCache: vi.fn(),
+    AsyncStorageCache: vi.fn(),
   };
 });
 
@@ -13,16 +13,19 @@ vi.mock('./vuid_manager', () => {
   };
 });
 
-import { createVuidManager } from './vuid_manager_factory.browser';
-import { Async}
+import { getMockAsyncCache } from '../tests/mock/mock_cache';
+import { createVuidManager } from './vuid_manager_factory.react_native';
+import { AsyncStorageCache } from '../utils/cache/async_storage_cache.react_native';
+
 import { DefaultVuidManager, VuidCacheManager } from './vuid_manager';
 
 describe('createVuidManager', () => {
   const MockVuidCacheManager = vi.mocked(VuidCacheManager);
-  const MockLocalStorageCache = vi.mocked(LocalStorageCache);
+  const MockAsyncStorageCache = vi.mocked(AsyncStorageCache);
   const MockDefaultVuidManager = vi.mocked(DefaultVuidManager);
 
   beforeEach(() => {
+    MockAsyncStorageCache.mockClear();
     MockDefaultVuidManager.mockClear();
   });
 
@@ -36,16 +39,19 @@ describe('createVuidManager', () => {
     expect(MockDefaultVuidManager.mock.calls[1][0].enableVuid).toBe(false);
   });
 
-  it('should use a VuidCacheManager with a LocalStorageCache', () => {
-    const manager = createVuidManager({ enableVuid: true });
+  it('should use the provided cache', () => {
+    const cache = getMockAsyncCache<string>();
+    const manager = createVuidManager({ enableVuid: true, vuidCache: cache });
     expect(manager).toBe(MockDefaultVuidManager.mock.instances[0]);
+    expect(MockDefaultVuidManager.mock.calls[0][0].vuidCache).toBe(cache);
+  });
 
+  it('should use a AsyncStorageCache if no cache is provided', () => {
+    const manager = createVuidManager({ enableVuid: true });
+    expect(manager).toBe(MockDefaultVuidManager.mock.instances[0]);
 
-    const usedCacheManager = MockDefaultVuidManager.mock.calls[0][0].vuidCacheManager;
-    expect(usedCacheManager).toBe(MockVuidCacheManager.mock.instances[0]);
-
-    const usedCache = MockVuidCacheManager.mock.calls[0][0];
-    expect(usedCache).toBe(MockLocalStorageCache.mock.instances[0]);
+    const usedCache = MockDefaultVuidManager.mock.calls[0][0].vuidCache;
+    expect(usedCache).toBe(MockAsyncStorageCache.mock.instances[0]);
   });
 
   it('should use a single VuidCacheManager instance for all VuidManager instances', () => {

lib/vuid/vuid_manager_factory.react_native.ts

@@ -17,11 +17,12 @@ import { DefaultVuidManager, VuidCacheManager, VuidManager } from './vuid_manage
 import { AsyncStorageCache } from '../utils/cache/async_storage_cache.react_native';
 import { VuidManagerOptions } from './vuid_manager_factory';
 
-export const vuidCacheManager = new VuidCacheManager(new AsyncStorageCache<string>());
+export const vuidCacheManager = new VuidCacheManager();
 
 export const createVuidManager = (options: VuidManagerOptions): VuidManager => {
   return new DefaultVuidManager({
     vuidCacheManager,
+    vuidCache: options.vuidCache || new AsyncStorageCache<string>(),
     enableVuid: options.enableVuid
   });
 }

vitest.config.mts

@@ -20,7 +20,7 @@ export default defineConfig({
   test: {
     onConsoleLog: () => true,
     environment: 'happy-dom',
-    include: ['**/vuid_manager_factory.browser.spec.ts'],
+    include: ['**/vuid_manager_factory.react_native.spec.ts'],
     typecheck: {
       tsconfig: 'tsconfig.spec.json',
     },