simplify test

Author: sirtimid

packages/kernel-test/src/exo.test.ts

@@ -1,8 +1,9 @@
 import '@ocap/shims/endoify';
-import { kunser } from '@ocap/kernel';
+import { Kernel, kunser } from '@ocap/kernel';
+import type { KernelDatabase } from '@ocap/store';
 import { makeSQLKernelDatabase } from '@ocap/store/sqlite/nodejs';
 import { waitUntilQuiescent } from '@ocap/utils';
-import { describe, expect, it } from 'vitest';
+import { beforeEach, describe, expect, it } from 'vitest';
 
 import {
   extractVatLogs,
@@ -33,18 +34,23 @@ const testSubcluster = {
 };
 
 describe('virtual objects functionality', async () => {
-  it('successfully creates and uses exo objects and scalar stores', async () => {
-    const kernelDatabase = await makeSQLKernelDatabase({
+  let kernel: Kernel;
+  let kernelDatabase: KernelDatabase;
+  let bootstrapResult: unknown;
+
+  beforeEach(async () => {
+    kernelDatabase = await makeSQLKernelDatabase({
       dbFilename: ':memory:',
     });
-    const kernel = await makeKernel(kernelDatabase, true);
+    kernel = await makeKernel(kernelDatabase, true);
     buffered = '';
+    bootstrapResult = await runTestVats(kernel, testSubcluster);
+    await waitUntilQuiescent();
+  });
 
-    const bootstrapResult = await runTestVats(kernel, testSubcluster);
+  it('successfully creates and uses exo objects and scalar stores', async () => {
     expect(bootstrapResult).toBe('exo-test-complete');
-    await waitUntilQuiescent();
     const vatLogs = extractVatLogs(buffered);
-
     // Verify exo objects were created and used
     expect(vatLogs).toContain('ExoTest: initializing state');
     expect(vatLogs).toContain('ExoTest: counter value from baggage: 0');
@@ -70,24 +76,12 @@ describe('virtual objects functionality', async () => {
   }, 30000);
 
   it('preserves state across vat restarts', async () => {
-    const kernelDatabase = await makeSQLKernelDatabase({
-      dbFilename: ':memory:',
-    });
-    const kernel = await makeKernel(kernelDatabase, true);
-    buffered = '';
-
-    // Run the test vat first time
-    await runTestVats(kernel, testSubcluster);
-    await waitUntilQuiescent();
     // Restart the vat
     await kernel.restartVat('v1');
     buffered = '';
-
     // Create and send a message to the root
     await kernel.queueMessageFromKernel('ko1', 'resume', []);
     await waitUntilQuiescent();
-
-    // Extract logs to verify operations worked correctly
     const vatLogs = extractVatLogs(buffered);
     // Verify state was preserved
     expect(vatLogs).toContain('ExoTest: state already initialized');
@@ -98,24 +92,13 @@ describe('virtual objects functionality', async () => {
   }, 30000);
 
   it('tests scalar store functionality', async () => {
-    const kernelDatabase = await makeSQLKernelDatabase({
-      dbFilename: ':memory:',
-    });
-    const kernel = await makeKernel(kernelDatabase, true);
-
-    // Run the test vat
-    await runTestVats(kernel, testSubcluster);
-    await waitUntilQuiescent();
-    buffered = '';
-
     const storeResult = await kernel.queueMessageFromKernel(
       'ko1',
       'testScalarStore',
       [],
     );
     await waitUntilQuiescent();
     const vatLogs = extractVatLogs(buffered);
-
     // Verify test result
     expect(kunser(storeResult)).toBe('scalar-store-tests-complete');
     // Verify map store operations
@@ -128,16 +111,6 @@ describe('virtual objects functionality', async () => {
   }, 30000);
 
   it('can create and use objects through messaging', async () => {
-    const kernelDatabase = await makeSQLKernelDatabase({
-      dbFilename: ':memory:',
-    });
-    const kernel = await makeKernel(kernelDatabase, true);
-
-    // Run the test vat
-    await runTestVats(kernel, testSubcluster);
-    await waitUntilQuiescent();
-    buffered = '';
-
     // Create a counter through messaging
     const counterResult = await kernel.queueMessageFromKernel(
       'ko1',

yarn.lock

@@ -646,22 +646,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@endo/exo@npm:^1.5.8":
-  version: 1.5.8
-  resolution: "@endo/exo@npm:1.5.8"
-  dependencies:
-    "@endo/common": "npm:^1.2.9"
-    "@endo/env-options": "npm:^1.1.8"
-    "@endo/errors": "npm:^1.2.9"
-    "@endo/eventual-send": "npm:^1.3.0"
-    "@endo/far": "npm:^1.1.10"
-    "@endo/pass-style": "npm:^1.4.8"
-    "@endo/patterns": "npm:^1.4.8"
-  checksum: 10/72c798344b9c0b1d008b8131210563a9919bb7e4b489700cf8147001e6842f8e5d631b9e53bbb3a93aca14b3fe11dc8740d32537528caf890f2e349c749ac943
-  languageName: node
-  linkType: hard
-
-"@endo/exo@npm:^1.5.9":
+"@endo/exo@npm:^1.5.8, @endo/exo@npm:^1.5.9":
   version: 1.5.9
   resolution: "@endo/exo@npm:1.5.9"
   dependencies:
@@ -767,20 +752,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@endo/patterns@npm:^1.4.7, @endo/patterns@npm:^1.4.8":
-  version: 1.4.8
-  resolution: "@endo/patterns@npm:1.4.8"
-  dependencies:
-    "@endo/common": "npm:^1.2.9"
-    "@endo/errors": "npm:^1.2.9"
-    "@endo/eventual-send": "npm:^1.3.0"
-    "@endo/marshal": "npm:^1.6.3"
-    "@endo/promise-kit": "npm:^1.1.9"
-  checksum: 10/8d547e8872754ea535df6a0e53dee66075bd95adc5b875bd553c6e34ce1fcf3c8c0bbfa67d88fcb265f2ae5660ec7a10d194ff738c2c261e51de3f630cbab353
-  languageName: node
-  linkType: hard
-
-"@endo/patterns@npm:^1.5.0":
+"@endo/patterns@npm:^1.4.7, @endo/patterns@npm:^1.4.8, @endo/patterns@npm:^1.5.0":
   version: 1.5.0
   resolution: "@endo/patterns@npm:1.5.0"
   dependencies: