more cleaning up

src/audio/piano-sampler.test.ts

@@ -2,12 +2,12 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { gardenAudioConfig } from './garden-audio-config';
 import type { GardenAudioGraph } from './garden-audio-graph';
-import { PianoSampler } from './piano-sampler';
-import { pianoSampleDefinitions, resetPianoSampleCacheForTest } from './piano-samples';
+import type { PianoSampler } from './piano-sampler';
 
 const calls = {
   bufferSourcesStarted: 0,
 };
+const sampleCount = 30;
 
 class FakeAudioParam {
   public value = 0;
@@ -61,7 +61,8 @@ class FakeAudioContext {
   }
 }
 
-const makeSampler = (context: AudioContext): PianoSampler => {
+const makeSampler = async (context: AudioContext): Promise<PianoSampler> => {
+  const { PianoSampler } = await import('./piano-sampler');
   const eventBus = new FakeAudioNode() as unknown as GainNode;
   const graph = {
     context,
@@ -75,17 +76,16 @@ const makeSampler = (context: AudioContext): PianoSampler => {
 describe('PianoSampler', () => {
   beforeEach(() => {
     calls.bufferSourcesStarted = 0;
-    resetPianoSampleCacheForTest();
+    vi.resetModules();
   });
 
   afterEach(() => {
     vi.unstubAllGlobals();
-    resetPianoSampleCacheForTest();
   });
 
   it('loads every piano sample before playback', async () => {
     const context = new FakeAudioContext() as unknown as AudioContext;
-    const sampler = makeSampler(context);
+    const sampler = await makeSampler(context);
     const fetch = vi.fn(async () => {
       return {
         arrayBuffer: async () => new ArrayBuffer(8),
@@ -103,23 +103,23 @@ describe('PianoSampler', () => {
       velocity: 0.5,
     });
 
-    expect(fetch).toHaveBeenCalledTimes(pianoSampleDefinitions.length);
-    expect(context.decodeAudioData).toHaveBeenCalledTimes(pianoSampleDefinitions.length);
+    expect(fetch).toHaveBeenCalledTimes(sampleCount);
+    expect(context.decodeAudioData).toHaveBeenCalledTimes(sampleCount);
     expect(calls.bufferSourcesStarted).toBe(1);
   });
 
   it('stays silent when no decoded sample is available', () => {
     const context = new FakeAudioContext() as unknown as AudioContext;
-    const sampler = makeSampler(context);
+    return makeSampler(context).then((sampler) => {
+      sampler.play({
+        durationSeconds: 0.2,
+        midi: 60,
+        pan: 0,
+        startTime: context.currentTime,
+        velocity: 0.5,
+      });
 
-    sampler.play({
-      durationSeconds: 0.2,
-      midi: 60,
-      pan: 0,
-      startTime: context.currentTime,
-      velocity: 0.5,
+      expect(calls.bufferSourcesStarted).toBe(0);
     });
-
-    expect(calls.bufferSourcesStarted).toBe(0);
   });
 });