From e4d0254badf5cacedba943ff0ddbbbb86296d657 Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Thu, 21 Sep 2023 09:15:19 +0200 Subject: [PATCH] chore(sdk): rename testing to simulator (#4231) Splitting the renaming part off from #3918 / https://github.com/winglang/wing/pull/3976 ## Checklist - [ ] Title matches [Winglang's style guide](https://www.winglang.io/contributing/start-here/pull_requests#how-are-pull-request-titles-formatted) - [ ] Description explains motivation and solution - [ ] Tests added (always) - [ ] Docs updated (only required for features) - [ ] Added `pr/e2e-full` label if this feature requires end-to-end testing *By submitting this pull request, I confirm that my contribution is made under the terms of the [Wing Cloud Contribution License](https://github.com/winglang/wing/blob/main/CONTRIBUTION_LICENSE.md)*. --- .../wing-console/console/server/src/expressServer.ts | 4 ++-- .../console/server/src/utils/createRouter.ts | 4 ++-- .../console/server/src/utils/simulator.ts | 12 ++++++------ apps/wing-console/console/server/src/wingsdk.ts | 2 +- apps/wing/src/commands/test.ts | 4 ++-- libs/wingsdk/src/index.ts | 2 +- libs/wingsdk/src/{testing => simulator}/index.ts | 0 libs/wingsdk/src/{testing => simulator}/simulator.ts | 0 libs/wingsdk/src/{testing => simulator}/testing.ts | 0 libs/wingsdk/src/{testing => simulator}/tree.ts | 0 libs/wingsdk/src/target-sim/api.inflight.ts | 4 ++-- libs/wingsdk/src/target-sim/api.ts | 2 +- libs/wingsdk/src/target-sim/app.ts | 2 +- libs/wingsdk/src/target-sim/bucket.inflight.ts | 4 ++-- libs/wingsdk/src/target-sim/bucket.ts | 2 +- libs/wingsdk/src/target-sim/counter.inflight.ts | 2 +- libs/wingsdk/src/target-sim/counter.ts | 2 +- .../src/target-sim/dynamodb-table.inflight.ts | 2 +- libs/wingsdk/src/target-sim/dynamodb-table.ts | 2 +- .../wingsdk/src/target-sim/event-mapping.inflight.ts | 4 ++-- libs/wingsdk/src/target-sim/event-mapping.ts | 4 ++-- libs/wingsdk/src/target-sim/factory.inflight.ts | 2 +- libs/wingsdk/src/target-sim/function.inflight.ts | 4 ++-- libs/wingsdk/src/target-sim/function.ts | 2 +- libs/wingsdk/src/target-sim/on-deploy.inflight.ts | 2 +- libs/wingsdk/src/target-sim/on-deploy.ts | 2 +- libs/wingsdk/src/target-sim/queue.inflight.ts | 4 ++-- libs/wingsdk/src/target-sim/queue.ts | 2 +- libs/wingsdk/src/target-sim/redis.inflight.ts | 2 +- libs/wingsdk/src/target-sim/redis.ts | 2 +- libs/wingsdk/src/target-sim/resource.ts | 2 +- libs/wingsdk/src/target-sim/schedule.inflight.ts | 2 +- libs/wingsdk/src/target-sim/schedule.ts | 2 +- libs/wingsdk/src/target-sim/schema-resources.ts | 4 ++-- libs/wingsdk/src/target-sim/secret.inflight.ts | 4 ++-- libs/wingsdk/src/target-sim/secret.ts | 2 +- libs/wingsdk/src/target-sim/service.inflight.ts | 2 +- libs/wingsdk/src/target-sim/service.ts | 2 +- libs/wingsdk/src/target-sim/table.inflight.ts | 4 ++-- libs/wingsdk/src/target-sim/table.ts | 2 +- libs/wingsdk/src/target-sim/test-runner.inflight.ts | 2 +- libs/wingsdk/src/target-sim/test-runner.ts | 2 +- libs/wingsdk/src/target-sim/topic.inflight.ts | 4 ++-- libs/wingsdk/src/target-sim/topic.ts | 2 +- libs/wingsdk/src/target-sim/website.inflight.ts | 4 ++-- libs/wingsdk/src/target-sim/website.ts | 2 +- libs/wingsdk/test/core/connections.test.ts | 2 +- libs/wingsdk/test/sim-app.ts | 2 +- .../__snapshots__/simulator.test.ts.snap | 0 .../test/{testing => simulator}/on-trace.test.ts | 2 +- .../test/{testing => simulator}/reload.test.ts | 2 +- .../test/{testing => simulator}/simulator.test.ts | 2 +- libs/wingsdk/test/target-awscdk/bucket.test.ts | 2 +- libs/wingsdk/test/target-awscdk/counter.test.ts | 2 +- libs/wingsdk/test/target-awscdk/function.test.ts | 2 +- libs/wingsdk/test/target-awscdk/on-deploy.test.ts | 2 +- libs/wingsdk/test/target-awscdk/queue.test.ts | 2 +- libs/wingsdk/test/target-awscdk/schedule.test.ts | 2 +- libs/wingsdk/test/target-awscdk/topic.test.ts | 2 +- libs/wingsdk/test/target-sim/api.test.ts | 2 +- libs/wingsdk/test/target-sim/binding.test.ts | 2 +- libs/wingsdk/test/target-sim/bucket.test.ts | 2 +- libs/wingsdk/test/target-sim/file-counter.test.ts | 2 +- libs/wingsdk/test/target-sim/function.test.ts | 2 +- .../test/target-sim/immutable-capture.test.ts | 2 +- libs/wingsdk/test/target-sim/inflight.test.ts | 2 +- libs/wingsdk/test/target-sim/on-deploy.test.ts | 2 +- libs/wingsdk/test/target-sim/queue-consumer.test.ts | 2 +- libs/wingsdk/test/target-sim/queue.test.ts | 2 +- libs/wingsdk/test/target-sim/schedule.test.ts | 2 +- libs/wingsdk/test/target-sim/service.test.ts | 2 +- libs/wingsdk/test/target-sim/test.test.ts | 2 +- libs/wingsdk/test/target-sim/topic-producer.test.ts | 2 +- libs/wingsdk/test/target-sim/topic.test.ts | 2 +- libs/wingsdk/test/target-sim/util.ts | 2 +- libs/wingsdk/test/target-sim/website.test.ts | 2 +- libs/wingsdk/test/target-tf-aws/api.test.ts | 2 +- libs/wingsdk/test/target-tf-aws/app.test.ts | 2 +- libs/wingsdk/test/target-tf-aws/bucket.test.ts | 2 +- libs/wingsdk/test/target-tf-aws/captures.test.ts | 2 +- libs/wingsdk/test/target-tf-aws/counter.test.ts | 2 +- .../test/target-tf-aws/dynamodb-table.test.ts | 2 +- libs/wingsdk/test/target-tf-aws/function.test.ts | 2 +- libs/wingsdk/test/target-tf-aws/logger.test.ts | 2 +- libs/wingsdk/test/target-tf-aws/on-deploy.test.ts | 2 +- libs/wingsdk/test/target-tf-aws/queue.test.ts | 2 +- libs/wingsdk/test/target-tf-aws/redis.test.ts | 2 +- libs/wingsdk/test/target-tf-aws/schedule.test.ts | 2 +- libs/wingsdk/test/target-tf-aws/table.test.ts | 2 +- libs/wingsdk/test/target-tf-aws/tokens.test.ts | 2 +- libs/wingsdk/test/target-tf-aws/topic.test.ts | 2 +- libs/wingsdk/test/target-tf-azure/bucket.test.ts | 2 +- libs/wingsdk/test/target-tf-azure/captures.test.ts | 2 +- libs/wingsdk/test/target-tf-azure/function.test.ts | 2 +- 94 files changed, 108 insertions(+), 108 deletions(-) rename libs/wingsdk/src/{testing => simulator}/index.ts (100%) rename libs/wingsdk/src/{testing => simulator}/simulator.ts (100%) rename libs/wingsdk/src/{testing => simulator}/testing.ts (100%) rename libs/wingsdk/src/{testing => simulator}/tree.ts (100%) rename libs/wingsdk/test/{testing => simulator}/__snapshots__/simulator.test.ts.snap (100%) rename libs/wingsdk/test/{testing => simulator}/on-trace.test.ts (94%) rename libs/wingsdk/test/{testing => simulator}/reload.test.ts (96%) rename libs/wingsdk/test/{testing => simulator}/simulator.test.ts (99%) diff --git a/apps/wing-console/console/server/src/expressServer.ts b/apps/wing-console/console/server/src/expressServer.ts index 89d07465e2e..78c9d169d14 100644 --- a/apps/wing-console/console/server/src/expressServer.ts +++ b/apps/wing-console/console/server/src/expressServer.ts @@ -1,6 +1,6 @@ import * as trpcExpress from "@trpc/server/adapters/express"; import { applyWSSHandler } from "@trpc/server/adapters/ws"; -import { testing } from "@winglang/sdk"; +import { simulator } from "@winglang/sdk"; import cors from "cors"; import type Emittery from "emittery"; import express from "express"; @@ -22,7 +22,7 @@ import { getWingVersion } from "./utils/getWingVersion.js"; import type { LogInterface } from "./utils/LogInterface.js"; export interface CreateExpressServerOptions { - simulatorInstance(): Promise; + simulatorInstance(): Promise; consoleLogger: ConsoleLogger; errorMessage(): string | undefined; emitter: Emittery<{ diff --git a/apps/wing-console/console/server/src/utils/createRouter.ts b/apps/wing-console/console/server/src/utils/createRouter.ts index 6e89652a9db..b0f48b99846 100644 --- a/apps/wing-console/console/server/src/utils/createRouter.ts +++ b/apps/wing-console/console/server/src/utils/createRouter.ts @@ -1,5 +1,5 @@ import { initTRPC } from "@trpc/server"; -import { testing } from "@winglang/sdk"; +import { simulator } from "@winglang/sdk"; import type Emittery from "emittery"; import { Config } from "../config.js"; @@ -75,7 +75,7 @@ export interface FileLink { } export interface RouterContext { - simulator(): Promise; + simulator(): Promise; appDetails(): Promise<{ wingVersion: string | undefined; }>; diff --git a/apps/wing-console/console/server/src/utils/simulator.ts b/apps/wing-console/console/server/src/utils/simulator.ts index 5f1743c98cb..fa98c7a8fca 100644 --- a/apps/wing-console/console/server/src/utils/simulator.ts +++ b/apps/wing-console/console/server/src/utils/simulator.ts @@ -1,4 +1,4 @@ -import { testing } from "@winglang/sdk"; +import { simulator } from "@winglang/sdk"; import Emittery from "emittery"; import type { Trace } from "../types.js"; @@ -6,7 +6,7 @@ import type { Trace } from "../types.js"; import { formatWingError } from "./format-wing-error.js"; export interface SimulatorEvents { - starting: { instance: testing.Simulator }; + starting: { instance: simulator.Simulator }; started: undefined; error: Error; stopping: undefined; @@ -14,7 +14,7 @@ export interface SimulatorEvents { } export interface Simulator { - instance(): Promise; + instance(): Promise; start(simfile: string): Promise; stop(): Promise; on( @@ -23,7 +23,7 @@ export interface Simulator { ): void; } -const stopSilently = async (simulator: testing.Simulator) => { +const stopSilently = async (simulator: simulator.Simulator) => { try { await simulator.stop(); } catch (error) { @@ -40,7 +40,7 @@ const stopSilently = async (simulator: testing.Simulator) => { export const createSimulator = (): Simulator => { const events = new Emittery(); - let instance: testing.Simulator | undefined; + let instance: simulator.Simulator | undefined; const start = async (simfile: string) => { try { if (instance) { @@ -48,7 +48,7 @@ export const createSimulator = (): Simulator => { await stopSilently(instance); } - instance = new testing.Simulator({ simfile }); + instance = new simulator.Simulator({ simfile }); instance.onTrace({ callback(trace) { events.emit("trace", trace); diff --git a/apps/wing-console/console/server/src/wingsdk.ts b/apps/wing-console/console/server/src/wingsdk.ts index 98286e36a6d..b2e83431f09 100644 --- a/apps/wing-console/console/server/src/wingsdk.ts +++ b/apps/wing-console/console/server/src/wingsdk.ts @@ -2,7 +2,7 @@ export { Simulator, type WingSimulatorSchema, type BaseResourceSchema, -} from "@winglang/sdk/lib/testing/index.js"; +} from "@winglang/sdk/lib/simulator/index.js"; export { Json } from "@winglang/sdk/lib/std/json.js"; diff --git a/apps/wing/src/commands/test.ts b/apps/wing/src/commands/test.ts index 2762a0d4452..844c1da7a57 100644 --- a/apps/wing/src/commands/test.ts +++ b/apps/wing/src/commands/test.ts @@ -1,7 +1,7 @@ import { basename, resolve, sep } from "path"; import { compile, CompileOptions } from "./compile"; import chalk from "chalk"; -import { std, testing } from "@winglang/sdk"; +import { std, simulator } from "@winglang/sdk"; import * as cp from "child_process"; import debug from "debug"; import { promisify } from "util"; @@ -247,7 +247,7 @@ function noCleanUp(synthDir: string) { } async function testSimulator(synthDir: string, options: TestOptions) { - const s = new testing.Simulator({ simfile: synthDir }); + const s = new simulator.Simulator({ simfile: synthDir }); const { clean } = options; await s.start(); diff --git a/libs/wingsdk/src/index.ts b/libs/wingsdk/src/index.ts index bcb3a10115b..a87907c2bf5 100644 --- a/libs/wingsdk/src/index.ts +++ b/libs/wingsdk/src/index.ts @@ -6,6 +6,6 @@ export * as http from "./http"; export * as math from "./math"; export * as regex from "./regex"; export * as aws from "./shared-aws"; +export * as simulator from "./simulator"; export * as std from "./std"; -export * as testing from "./testing"; export * as util from "./util"; diff --git a/libs/wingsdk/src/testing/index.ts b/libs/wingsdk/src/simulator/index.ts similarity index 100% rename from libs/wingsdk/src/testing/index.ts rename to libs/wingsdk/src/simulator/index.ts diff --git a/libs/wingsdk/src/testing/simulator.ts b/libs/wingsdk/src/simulator/simulator.ts similarity index 100% rename from libs/wingsdk/src/testing/simulator.ts rename to libs/wingsdk/src/simulator/simulator.ts diff --git a/libs/wingsdk/src/testing/testing.ts b/libs/wingsdk/src/simulator/testing.ts similarity index 100% rename from libs/wingsdk/src/testing/testing.ts rename to libs/wingsdk/src/simulator/testing.ts diff --git a/libs/wingsdk/src/testing/tree.ts b/libs/wingsdk/src/simulator/tree.ts similarity index 100% rename from libs/wingsdk/src/testing/tree.ts rename to libs/wingsdk/src/simulator/tree.ts diff --git a/libs/wingsdk/src/target-sim/api.inflight.ts b/libs/wingsdk/src/target-sim/api.inflight.ts index 3c2b9050f44..f767908abe7 100644 --- a/libs/wingsdk/src/target-sim/api.inflight.ts +++ b/libs/wingsdk/src/target-sim/api.inflight.ts @@ -17,11 +17,11 @@ import { parseHttpMethod, sanitizeParamLikeObject, } from "../cloud"; -import { TraceType } from "../std"; import { ISimulatorContext, ISimulatorResourceInstance, -} from "../testing/simulator"; +} from "../simulator/simulator"; +import { TraceType } from "../std"; const LOCALHOST_ADDRESS = "127.0.0.1"; diff --git a/libs/wingsdk/src/target-sim/api.ts b/libs/wingsdk/src/target-sim/api.ts index 96bbb91287e..2db1cf922e3 100644 --- a/libs/wingsdk/src/target-sim/api.ts +++ b/libs/wingsdk/src/target-sim/api.ts @@ -6,8 +6,8 @@ import { ApiSchema, API_TYPE, ApiRoute } from "./schema-resources"; import { simulatorAttrToken } from "./tokens"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; import * as cloud from "../cloud"; +import { BaseResourceSchema } from "../simulator/simulator"; import { IInflightHost, Node, SDK_SOURCE_MODULE } from "../std"; -import { BaseResourceSchema } from "../testing/simulator"; /** * Simulator implementation of `cloud.Api`. diff --git a/libs/wingsdk/src/target-sim/app.ts b/libs/wingsdk/src/target-sim/app.ts index e5a64f84cbd..0e48c3c7994 100644 --- a/libs/wingsdk/src/target-sim/app.ts +++ b/libs/wingsdk/src/target-sim/app.ts @@ -35,8 +35,8 @@ import { SDK_VERSION } from "../constants"; import * as core from "../core"; import { preSynthesizeAllConstructs } from "../core/app"; import { TABLE_FQN, REDIS_FQN, DYNAMODB_TABLE_FQN } from "../ex"; +import { WingSimulatorSchema } from "../simulator/simulator"; import { TEST_RUNNER_FQN } from "../std"; -import { WingSimulatorSchema } from "../testing/simulator"; /** * Path of the simulator configuration file in every .wsim tarball. diff --git a/libs/wingsdk/src/target-sim/bucket.inflight.ts b/libs/wingsdk/src/target-sim/bucket.inflight.ts index 919c18198ca..aa1996e47c6 100644 --- a/libs/wingsdk/src/target-sim/bucket.inflight.ts +++ b/libs/wingsdk/src/target-sim/bucket.inflight.ts @@ -10,11 +10,11 @@ import { IBucketClient, ITopicClient, } from "../cloud"; -import { Json } from "../std"; import { ISimulatorContext, ISimulatorResourceInstance, -} from "../testing/simulator"; +} from "../simulator/simulator"; +import { Json } from "../std"; export class Bucket implements IBucketClient, ISimulatorResourceInstance { private readonly objectKeys: Set; diff --git a/libs/wingsdk/src/target-sim/bucket.ts b/libs/wingsdk/src/target-sim/bucket.ts index 9a9918c4eca..0ce9ae147a0 100644 --- a/libs/wingsdk/src/target-sim/bucket.ts +++ b/libs/wingsdk/src/target-sim/bucket.ts @@ -5,8 +5,8 @@ import { BucketSchema, BUCKET_TYPE } from "./schema-resources"; import { simulatorHandleToken } from "./tokens"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; import * as cloud from "../cloud"; +import { BaseResourceSchema } from "../simulator/simulator"; import { IInflightHost } from "../std"; -import { BaseResourceSchema } from "../testing/simulator"; /** * Simulator implementation of `cloud.Bucket`. diff --git a/libs/wingsdk/src/target-sim/counter.inflight.ts b/libs/wingsdk/src/target-sim/counter.inflight.ts index 3d909d016be..00fec84f860 100644 --- a/libs/wingsdk/src/target-sim/counter.inflight.ts +++ b/libs/wingsdk/src/target-sim/counter.inflight.ts @@ -3,7 +3,7 @@ import { ICounterClient } from "../cloud"; import { ISimulatorContext, ISimulatorResourceInstance, -} from "../testing/simulator"; +} from "../simulator/simulator"; export class Counter implements ICounterClient, ISimulatorResourceInstance { private values: Map; diff --git a/libs/wingsdk/src/target-sim/counter.ts b/libs/wingsdk/src/target-sim/counter.ts index cdcae25a14d..76d4b4b96d5 100644 --- a/libs/wingsdk/src/target-sim/counter.ts +++ b/libs/wingsdk/src/target-sim/counter.ts @@ -3,8 +3,8 @@ import { ISimulatorResource } from "./resource"; import { CounterSchema, COUNTER_TYPE } from "./schema-resources"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; import * as cloud from "../cloud"; +import { BaseResourceSchema } from "../simulator/simulator"; import { IInflightHost } from "../std"; -import { BaseResourceSchema } from "../testing/simulator"; /** * Simulator implementation of `cloud.Counter`. diff --git a/libs/wingsdk/src/target-sim/dynamodb-table.inflight.ts b/libs/wingsdk/src/target-sim/dynamodb-table.inflight.ts index c4a84108652..29834adc3cf 100644 --- a/libs/wingsdk/src/target-sim/dynamodb-table.inflight.ts +++ b/libs/wingsdk/src/target-sim/dynamodb-table.inflight.ts @@ -9,7 +9,7 @@ import { runCommand, runDockerImage } from "../shared/misc"; import { ISimulatorContext, ISimulatorResourceInstance, -} from "../testing/simulator"; +} from "../simulator/simulator"; const MAX_CREATE_TABLE_COMMAND_ATTEMPTS = 50; diff --git a/libs/wingsdk/src/target-sim/dynamodb-table.ts b/libs/wingsdk/src/target-sim/dynamodb-table.ts index d49cb781d40..a31822ebc95 100644 --- a/libs/wingsdk/src/target-sim/dynamodb-table.ts +++ b/libs/wingsdk/src/target-sim/dynamodb-table.ts @@ -3,8 +3,8 @@ import { ISimulatorResource } from "./resource"; import { DynamodbTableSchema, DYNAMODB_TABLE_TYPE } from "./schema-resources"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; import * as ex from "../ex"; +import { BaseResourceSchema } from "../simulator/simulator"; import { IInflightHost } from "../std"; -import { BaseResourceSchema } from "../testing/simulator"; /** * Simulator implementation of `ex.DynamodbTable`. diff --git a/libs/wingsdk/src/target-sim/event-mapping.inflight.ts b/libs/wingsdk/src/target-sim/event-mapping.inflight.ts index 04b083d25c3..1491cc45ec3 100644 --- a/libs/wingsdk/src/target-sim/event-mapping.inflight.ts +++ b/libs/wingsdk/src/target-sim/event-mapping.inflight.ts @@ -6,8 +6,8 @@ import { FunctionHandle, PublisherHandle, } from "./schema-resources"; -import { ISimulatorContext } from "../testing"; -import { ISimulatorResourceInstance } from "../testing/simulator"; +import { ISimulatorContext } from "../simulator"; +import { ISimulatorResourceInstance } from "../simulator/simulator"; export class EventMapping implements ISimulatorResourceInstance { private readonly publisher: PublisherHandle; diff --git a/libs/wingsdk/src/target-sim/event-mapping.ts b/libs/wingsdk/src/target-sim/event-mapping.ts index 058da761505..34e44996cf9 100644 --- a/libs/wingsdk/src/target-sim/event-mapping.ts +++ b/libs/wingsdk/src/target-sim/event-mapping.ts @@ -9,11 +9,11 @@ import { import { simulatorHandleToken } from "./tokens"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; import { fqnForType } from "../constants"; -import { IInflightHost, IResource, Node, Resource } from "../std"; import { BaseResourceSchema, ISimulatorResourceInstance, -} from "../testing/simulator"; +} from "../simulator/simulator"; +import { IInflightHost, IResource, Node, Resource } from "../std"; /** * Interface shared by all event publishing simulator resources. diff --git a/libs/wingsdk/src/target-sim/factory.inflight.ts b/libs/wingsdk/src/target-sim/factory.inflight.ts index 07519992d48..196b21346c2 100644 --- a/libs/wingsdk/src/target-sim/factory.inflight.ts +++ b/libs/wingsdk/src/target-sim/factory.inflight.ts @@ -21,7 +21,7 @@ import type { ISimulatorFactory, ISimulatorContext, ISimulatorResourceInstance, -} from "../testing/simulator"; +} from "../simulator/simulator"; export class DefaultSimulatorFactory implements ISimulatorFactory { /** diff --git a/libs/wingsdk/src/target-sim/function.inflight.ts b/libs/wingsdk/src/target-sim/function.inflight.ts index 77d3a98ee17..cfeeb323f43 100644 --- a/libs/wingsdk/src/target-sim/function.inflight.ts +++ b/libs/wingsdk/src/target-sim/function.inflight.ts @@ -10,11 +10,11 @@ import { } from "./schema-resources"; import { IFunctionClient } from "../cloud"; import { Bundle, createBundle } from "../shared/bundling"; -import { TraceType } from "../std"; import { ISimulatorContext, ISimulatorResourceInstance, -} from "../testing/simulator"; +} from "../simulator/simulator"; +import { TraceType } from "../std"; export class Function implements IFunctionClient, ISimulatorResourceInstance { private readonly filename: string; diff --git a/libs/wingsdk/src/target-sim/function.ts b/libs/wingsdk/src/target-sim/function.ts index f993cc084df..5b9e8755bc3 100644 --- a/libs/wingsdk/src/target-sim/function.ts +++ b/libs/wingsdk/src/target-sim/function.ts @@ -5,9 +5,9 @@ import { FunctionSchema, FUNCTION_TYPE } from "./schema-resources"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; import * as cloud from "../cloud"; import { App } from "../core"; +import { BaseResourceSchema } from "../simulator/simulator"; import { IInflightHost } from "../std"; import { Duration } from "../std/duration"; -import { BaseResourceSchema } from "../testing/simulator"; export const ENV_WING_SIM_INFLIGHT_RESOURCE_PATH = "WING_SIM_INFLIGHT_RESOURCE_PATH"; diff --git a/libs/wingsdk/src/target-sim/on-deploy.inflight.ts b/libs/wingsdk/src/target-sim/on-deploy.inflight.ts index 591bd2c2ce7..181e89453f8 100644 --- a/libs/wingsdk/src/target-sim/on-deploy.inflight.ts +++ b/libs/wingsdk/src/target-sim/on-deploy.inflight.ts @@ -3,7 +3,7 @@ import { IFunctionClient, IOnDeployClient } from "../cloud"; import { ISimulatorContext, ISimulatorResourceInstance, -} from "../testing/simulator"; +} from "../simulator/simulator"; export class OnDeploy implements IOnDeployClient, ISimulatorResourceInstance { private functionHandle: string; diff --git a/libs/wingsdk/src/target-sim/on-deploy.ts b/libs/wingsdk/src/target-sim/on-deploy.ts index 5f182774bfa..ec61b946081 100644 --- a/libs/wingsdk/src/target-sim/on-deploy.ts +++ b/libs/wingsdk/src/target-sim/on-deploy.ts @@ -3,8 +3,8 @@ import { ON_DEPLOY_TYPE, OnDeploySchema } from "./schema-resources"; import { simulatorHandleToken } from "./tokens"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; import * as cloud from "../cloud"; +import { BaseResourceSchema } from "../simulator"; import { IInflightHost, Node, SDK_SOURCE_MODULE } from "../std"; -import { BaseResourceSchema } from "../testing"; export class OnDeploy extends cloud.OnDeploy { private readonly fn: cloud.Function; diff --git a/libs/wingsdk/src/target-sim/queue.inflight.ts b/libs/wingsdk/src/target-sim/queue.inflight.ts index 3d1bd31e4ab..0c5f78690f0 100644 --- a/libs/wingsdk/src/target-sim/queue.inflight.ts +++ b/libs/wingsdk/src/target-sim/queue.inflight.ts @@ -8,11 +8,11 @@ import { FunctionHandle, } from "./schema-resources"; import { IFunctionClient, IQueueClient } from "../cloud"; -import { TraceType } from "../std"; import { ISimulatorContext, ISimulatorResourceInstance, -} from "../testing/simulator"; +} from "../simulator/simulator"; +import { TraceType } from "../std"; export class Queue implements IQueueClient, ISimulatorResourceInstance, IEventPublisher diff --git a/libs/wingsdk/src/target-sim/queue.ts b/libs/wingsdk/src/target-sim/queue.ts index 02cd57d1189..066d5edb022 100644 --- a/libs/wingsdk/src/target-sim/queue.ts +++ b/libs/wingsdk/src/target-sim/queue.ts @@ -7,8 +7,8 @@ import { QueueSchema, QUEUE_TYPE } from "./schema-resources"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; import * as cloud from "../cloud"; import { convertBetweenHandlers } from "../shared/convert"; +import { BaseResourceSchema } from "../simulator/simulator"; import { Duration, IInflightHost, Node, SDK_SOURCE_MODULE } from "../std"; -import { BaseResourceSchema } from "../testing/simulator"; /** * Simulator implementation of `cloud.Queue`. diff --git a/libs/wingsdk/src/target-sim/redis.inflight.ts b/libs/wingsdk/src/target-sim/redis.inflight.ts index 9e6341ea581..199a8c7dd76 100644 --- a/libs/wingsdk/src/target-sim/redis.inflight.ts +++ b/libs/wingsdk/src/target-sim/redis.inflight.ts @@ -6,7 +6,7 @@ import { runCommand, runDockerImage } from "../shared/misc"; import { ISimulatorContext, ISimulatorResourceInstance, -} from "../testing/simulator"; +} from "../simulator/simulator"; export class Redis extends RedisClientBase diff --git a/libs/wingsdk/src/target-sim/redis.ts b/libs/wingsdk/src/target-sim/redis.ts index 0dacb725c49..8cb40b3647e 100644 --- a/libs/wingsdk/src/target-sim/redis.ts +++ b/libs/wingsdk/src/target-sim/redis.ts @@ -3,8 +3,8 @@ import { ISimulatorResource } from "./resource"; import { RedisSchema, REDIS_TYPE } from "./schema-resources"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; import * as ex from "../ex"; +import { BaseResourceSchema } from "../simulator/simulator"; import { IInflightHost } from "../std"; -import { BaseResourceSchema } from "../testing/simulator"; /** * Simulator implementation of `redis.Redis`. diff --git a/libs/wingsdk/src/target-sim/resource.ts b/libs/wingsdk/src/target-sim/resource.ts index 7543025aebd..d3dfd03d7de 100644 --- a/libs/wingsdk/src/target-sim/resource.ts +++ b/libs/wingsdk/src/target-sim/resource.ts @@ -1,5 +1,5 @@ +import { BaseResourceSchema } from "../simulator/simulator"; import { IResource } from "../std"; -import { BaseResourceSchema } from "../testing/simulator"; /** * Interfaces shared by all polycon implementations (preflight classes) diff --git a/libs/wingsdk/src/target-sim/schedule.inflight.ts b/libs/wingsdk/src/target-sim/schedule.inflight.ts index 4b09e51b99b..d01336ae563 100644 --- a/libs/wingsdk/src/target-sim/schedule.inflight.ts +++ b/libs/wingsdk/src/target-sim/schedule.inflight.ts @@ -8,8 +8,8 @@ import { ScheduleTask, } from "./schema-resources"; import { IFunctionClient, IScheduleClient } from "../cloud"; +import { ISimulatorContext, ISimulatorResourceInstance } from "../simulator"; import { TraceType } from "../std"; -import { ISimulatorContext, ISimulatorResourceInstance } from "../testing"; export class Schedule implements IScheduleClient, ISimulatorResourceInstance, IEventPublisher diff --git a/libs/wingsdk/src/target-sim/schedule.ts b/libs/wingsdk/src/target-sim/schedule.ts index a9d238b621d..ed444b83c43 100644 --- a/libs/wingsdk/src/target-sim/schedule.ts +++ b/libs/wingsdk/src/target-sim/schedule.ts @@ -11,8 +11,8 @@ import { } from "./util"; import * as cloud from "../cloud"; import { convertBetweenHandlers } from "../shared/convert"; +import { BaseResourceSchema } from "../simulator"; import { IInflightHost, Node, SDK_SOURCE_MODULE } from "../std"; -import { BaseResourceSchema } from "../testing"; /** * Simulator implementation of `cloud.Schedule`. diff --git a/libs/wingsdk/src/target-sim/schema-resources.ts b/libs/wingsdk/src/target-sim/schema-resources.ts index 93c6f3bd763..b204b5fe825 100644 --- a/libs/wingsdk/src/target-sim/schema-resources.ts +++ b/libs/wingsdk/src/target-sim/schema-resources.ts @@ -1,10 +1,10 @@ import { CorsHeaders, HttpMethod, OpenApiSpec } from "../cloud"; import { ColumnType } from "../ex"; -import { Json } from "../std"; import { BaseResourceAttributes, BaseResourceSchema, -} from "../testing/simulator"; +} from "../simulator/simulator"; +import { Json } from "../std"; export const API_TYPE = "wingsdk.cloud.Api"; export const QUEUE_TYPE = "wingsdk.cloud.Queue"; diff --git a/libs/wingsdk/src/target-sim/secret.inflight.ts b/libs/wingsdk/src/target-sim/secret.inflight.ts index 3b01de1a131..d1b051b50b6 100644 --- a/libs/wingsdk/src/target-sim/secret.inflight.ts +++ b/libs/wingsdk/src/target-sim/secret.inflight.ts @@ -7,11 +7,11 @@ import { SecretSchema, } from "./schema-resources"; import { ISecretClient } from "../cloud"; -import { Json, TraceType } from "../std"; import { ISimulatorContext, ISimulatorResourceInstance, -} from "../testing/simulator"; +} from "../simulator/simulator"; +import { Json, TraceType } from "../std"; export class Secret implements ISecretClient, ISimulatorResourceInstance { private readonly context: ISimulatorContext; diff --git a/libs/wingsdk/src/target-sim/secret.ts b/libs/wingsdk/src/target-sim/secret.ts index 319addebd43..8487ce9dfa1 100644 --- a/libs/wingsdk/src/target-sim/secret.ts +++ b/libs/wingsdk/src/target-sim/secret.ts @@ -4,8 +4,8 @@ import { SECRET_TYPE, SecretSchema } from "./schema-resources"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; import * as cloud from "../cloud"; import { ResourceNames } from "../shared/resource-names"; +import { BaseResourceSchema } from "../simulator/simulator"; import { IInflightHost } from "../std"; -import { BaseResourceSchema } from "../testing/simulator"; /** * Simulator implementation of `cloud.Secret` diff --git a/libs/wingsdk/src/target-sim/service.inflight.ts b/libs/wingsdk/src/target-sim/service.inflight.ts index 23eff460ad4..0804215b463 100644 --- a/libs/wingsdk/src/target-sim/service.inflight.ts +++ b/libs/wingsdk/src/target-sim/service.inflight.ts @@ -4,8 +4,8 @@ import { ServiceSchema, } from "./schema-resources"; import { IFunctionClient, IServiceClient } from "../cloud"; +import { ISimulatorContext, ISimulatorResourceInstance } from "../simulator"; import { TraceType } from "../std"; -import { ISimulatorContext, ISimulatorResourceInstance } from "../testing"; export class Service implements IServiceClient, ISimulatorResourceInstance { private readonly context: ISimulatorContext; diff --git a/libs/wingsdk/src/target-sim/service.ts b/libs/wingsdk/src/target-sim/service.ts index 229bea146a6..305bec51eb1 100644 --- a/libs/wingsdk/src/target-sim/service.ts +++ b/libs/wingsdk/src/target-sim/service.ts @@ -7,8 +7,8 @@ import { simulatorHandleToken } from "./tokens"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; import * as cloud from "../cloud"; import { convertBetweenHandlers } from "../shared/convert"; +import { BaseResourceSchema } from "../simulator"; import { IInflightHost, Node, SDK_SOURCE_MODULE } from "../std"; -import { BaseResourceSchema } from "../testing"; export class Service extends cloud.Service implements ISimulatorResource { private readonly autoStart: boolean; diff --git a/libs/wingsdk/src/target-sim/table.inflight.ts b/libs/wingsdk/src/target-sim/table.inflight.ts index 54a467de604..62e454cb508 100644 --- a/libs/wingsdk/src/target-sim/table.inflight.ts +++ b/libs/wingsdk/src/target-sim/table.inflight.ts @@ -1,11 +1,11 @@ import { TableAttributes, TableSchema } from "./schema-resources"; import { ColumnType, ITableClient } from "../ex"; import { validateRow } from "../shared/table-utils"; -import { Json } from "../std"; import { ISimulatorContext, ISimulatorResourceInstance, -} from "../testing/simulator"; +} from "../simulator/simulator"; +import { Json } from "../std"; export class Table implements ITableClient, ISimulatorResourceInstance { private name: string; diff --git a/libs/wingsdk/src/target-sim/table.ts b/libs/wingsdk/src/target-sim/table.ts index 5abdc80dc9e..2d0f2298f2e 100644 --- a/libs/wingsdk/src/target-sim/table.ts +++ b/libs/wingsdk/src/target-sim/table.ts @@ -3,8 +3,8 @@ import { ISimulatorResource } from "./resource"; import { TableSchema, TABLE_TYPE } from "./schema-resources"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; import * as ex from "../ex"; +import { BaseResourceSchema } from "../simulator/simulator"; import { Json, IInflightHost } from "../std"; -import { BaseResourceSchema } from "../testing/simulator"; /** * Simulator implementation of `ex.Table`. diff --git a/libs/wingsdk/src/target-sim/test-runner.inflight.ts b/libs/wingsdk/src/target-sim/test-runner.inflight.ts index 577f6eac795..c6e9bff30f2 100644 --- a/libs/wingsdk/src/target-sim/test-runner.inflight.ts +++ b/libs/wingsdk/src/target-sim/test-runner.inflight.ts @@ -1,7 +1,7 @@ import { TestRunnerAttributes, TestRunnerSchema } from "./schema-resources"; import { IFunctionClient } from "../cloud"; +import { ISimulatorContext, ISimulatorResourceInstance } from "../simulator"; import { ITestRunnerClient, TestResult } from "../std"; -import { ISimulatorContext, ISimulatorResourceInstance } from "../testing"; export class TestRunnerClient implements ITestRunnerClient, ISimulatorResourceInstance diff --git a/libs/wingsdk/src/target-sim/test-runner.ts b/libs/wingsdk/src/target-sim/test-runner.ts index d071c92ae46..295c8e2b0b9 100644 --- a/libs/wingsdk/src/target-sim/test-runner.ts +++ b/libs/wingsdk/src/target-sim/test-runner.ts @@ -3,9 +3,9 @@ import { ISimulatorResource } from "./resource"; import { TestRunnerSchema, TEST_RUNNER_TYPE } from "./schema-resources"; import { simulatorHandleToken } from "./tokens"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; +import { BaseResourceSchema } from "../simulator/simulator"; import * as std from "../std"; import { IInflightHost } from "../std"; -import { BaseResourceSchema } from "../testing/simulator"; /** * Simulator implementation of `cloud.TestRunner`. diff --git a/libs/wingsdk/src/target-sim/topic.inflight.ts b/libs/wingsdk/src/target-sim/topic.inflight.ts index 5ff64b5dd43..5f02c482d13 100644 --- a/libs/wingsdk/src/target-sim/topic.inflight.ts +++ b/libs/wingsdk/src/target-sim/topic.inflight.ts @@ -8,11 +8,11 @@ import { FunctionHandle, } from "./schema-resources"; import { IFunctionClient, ITopicClient } from "../cloud"; -import { TraceType } from "../std"; import { ISimulatorContext, ISimulatorResourceInstance, -} from "../testing/simulator"; +} from "../simulator/simulator"; +import { TraceType } from "../std"; export class Topic implements ITopicClient, ISimulatorResourceInstance, IEventPublisher diff --git a/libs/wingsdk/src/target-sim/topic.ts b/libs/wingsdk/src/target-sim/topic.ts index 9d7c8e35751..866a432d5d7 100644 --- a/libs/wingsdk/src/target-sim/topic.ts +++ b/libs/wingsdk/src/target-sim/topic.ts @@ -7,8 +7,8 @@ import { TopicSchema, TOPIC_TYPE } from "./schema-resources"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; import * as cloud from "../cloud"; import { convertBetweenHandlers } from "../shared/convert"; +import { BaseResourceSchema } from "../simulator/simulator"; import { IInflightHost, Node, SDK_SOURCE_MODULE } from "../std"; -import { BaseResourceSchema } from "../testing/simulator"; /** * Simulator implementation of `cloud.Topic` diff --git a/libs/wingsdk/src/target-sim/website.inflight.ts b/libs/wingsdk/src/target-sim/website.inflight.ts index 79608c3216a..d530d511611 100644 --- a/libs/wingsdk/src/target-sim/website.inflight.ts +++ b/libs/wingsdk/src/target-sim/website.inflight.ts @@ -3,11 +3,11 @@ import { AddressInfo } from "net"; import express from "express"; import { ApiAttributes, WebsiteSchema, WEBSITE_TYPE } from "./schema-resources"; import { IWebsiteClient } from "../cloud"; -import { Json, TraceType } from "../std"; import { ISimulatorContext, ISimulatorResourceInstance, -} from "../testing/simulator"; +} from "../simulator/simulator"; +import { Json, TraceType } from "../std"; const LOCALHOST_ADDRESS = "127.0.0.1"; diff --git a/libs/wingsdk/src/target-sim/website.ts b/libs/wingsdk/src/target-sim/website.ts index 5a2435770e8..8dc61ffd346 100644 --- a/libs/wingsdk/src/target-sim/website.ts +++ b/libs/wingsdk/src/target-sim/website.ts @@ -4,8 +4,8 @@ import { WebsiteSchema, WEBSITE_TYPE } from "./schema-resources"; import { simulatorAttrToken } from "./tokens"; import { bindSimulatorResource, makeSimulatorJsClient } from "./util"; import * as cloud from "../cloud"; +import { BaseResourceSchema } from "../simulator/simulator"; import { IInflightHost, Json } from "../std"; -import { BaseResourceSchema } from "../testing/simulator"; export class Website extends cloud.Website implements ISimulatorResource { private jsonRoutes: Record = {}; diff --git a/libs/wingsdk/test/core/connections.test.ts b/libs/wingsdk/test/core/connections.test.ts index 5fd7ce0dc6e..ffb63ddfa3e 100644 --- a/libs/wingsdk/test/core/connections.test.ts +++ b/libs/wingsdk/test/core/connections.test.ts @@ -1,7 +1,7 @@ import { test, expect } from "vitest"; import * as cloud from "../../src/cloud"; import { Connections } from "../../src/core"; -import { Testing } from "../../src/testing"; +import { Testing } from "../../src/simulator"; import { SimApp } from "../sim-app"; test("create a bucket", async () => { diff --git a/libs/wingsdk/test/sim-app.ts b/libs/wingsdk/test/sim-app.ts index 9e995c6f454..bd92209b62b 100644 --- a/libs/wingsdk/test/sim-app.ts +++ b/libs/wingsdk/test/sim-app.ts @@ -2,8 +2,8 @@ import * as fs from "fs"; import { join } from "path"; import { directorySnapshot, mkdtemp } from "./util"; import { Function, IFunctionClient } from "../src/cloud"; +import { Simulator, Testing } from "../src/simulator"; import * as sim from "../src/target-sim"; -import { Simulator, Testing } from "../src/testing"; /** * A simulated app. diff --git a/libs/wingsdk/test/testing/__snapshots__/simulator.test.ts.snap b/libs/wingsdk/test/simulator/__snapshots__/simulator.test.ts.snap similarity index 100% rename from libs/wingsdk/test/testing/__snapshots__/simulator.test.ts.snap rename to libs/wingsdk/test/simulator/__snapshots__/simulator.test.ts.snap diff --git a/libs/wingsdk/test/testing/on-trace.test.ts b/libs/wingsdk/test/simulator/on-trace.test.ts similarity index 94% rename from libs/wingsdk/test/testing/on-trace.test.ts rename to libs/wingsdk/test/simulator/on-trace.test.ts index b54c79e8bc8..05a04abe92a 100644 --- a/libs/wingsdk/test/testing/on-trace.test.ts +++ b/libs/wingsdk/test/simulator/on-trace.test.ts @@ -1,7 +1,7 @@ import { test, expect } from "vitest"; import * as cloud from "../../src/cloud"; +import * as testing from "../../src/simulator"; import * as sim from "../../src/target-sim"; -import * as testing from "../../src/testing"; import { mkdtemp } from "../util"; test("onTrace", async () => { diff --git a/libs/wingsdk/test/testing/reload.test.ts b/libs/wingsdk/test/simulator/reload.test.ts similarity index 96% rename from libs/wingsdk/test/testing/reload.test.ts rename to libs/wingsdk/test/simulator/reload.test.ts index dd7e7005a01..ed634f04502 100644 --- a/libs/wingsdk/test/testing/reload.test.ts +++ b/libs/wingsdk/test/simulator/reload.test.ts @@ -1,8 +1,8 @@ import { test, expect } from "vitest"; import { Bucket } from "../../src/cloud"; +import * as testing from "../../src/simulator"; import { Node } from "../../src/std"; import * as sim from "../../src/target-sim"; -import * as testing from "../../src/testing"; import { mkdtemp } from "../util"; test("reloading the simulator updates the state of the tree", async () => { diff --git a/libs/wingsdk/test/testing/simulator.test.ts b/libs/wingsdk/test/simulator/simulator.test.ts similarity index 99% rename from libs/wingsdk/test/testing/simulator.test.ts rename to libs/wingsdk/test/simulator/simulator.test.ts index 3c3f5c708a0..7ae3bd0afcb 100644 --- a/libs/wingsdk/test/testing/simulator.test.ts +++ b/libs/wingsdk/test/simulator/simulator.test.ts @@ -2,8 +2,8 @@ import { Construct } from "constructs"; import { test, expect, describe } from "vitest"; import { Bucket, ITestRunnerClient, TestResult } from "../../src/cloud"; import { InflightBindings } from "../../src/core"; +import { Testing } from "../../src/simulator"; import { Test } from "../../src/std"; -import { Testing } from "../../src/testing"; import { SimApp } from "../sim-app"; describe("run single test", () => { diff --git a/libs/wingsdk/test/target-awscdk/bucket.test.ts b/libs/wingsdk/test/target-awscdk/bucket.test.ts index f58acf5d735..06960ad9ecf 100644 --- a/libs/wingsdk/test/target-awscdk/bucket.test.ts +++ b/libs/wingsdk/test/target-awscdk/bucket.test.ts @@ -1,8 +1,8 @@ import { Match, Template } from "aws-cdk-lib/assertions"; import { test, expect } from "vitest"; import { Bucket } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as awscdk from "../../src/target-awscdk"; -import { Testing } from "../../src/testing"; import { mkdtemp, awscdkSanitize } from "../util"; const CDK_APP_OPTS = { diff --git a/libs/wingsdk/test/target-awscdk/counter.test.ts b/libs/wingsdk/test/target-awscdk/counter.test.ts index 0bd01e64dc9..508b1a5d314 100644 --- a/libs/wingsdk/test/target-awscdk/counter.test.ts +++ b/libs/wingsdk/test/target-awscdk/counter.test.ts @@ -1,8 +1,8 @@ import { Match, Template } from "aws-cdk-lib/assertions"; import { test, expect } from "vitest"; import { Counter, Function, CounterInflightMethods } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as awscdk from "../../src/target-awscdk"; -import { Testing } from "../../src/testing"; import { sanitizeCode, mkdtemp, awscdkSanitize } from "../util"; const CDK_APP_OPTS = { diff --git a/libs/wingsdk/test/target-awscdk/function.test.ts b/libs/wingsdk/test/target-awscdk/function.test.ts index ec3514be1b5..dc4ad20745f 100644 --- a/libs/wingsdk/test/target-awscdk/function.test.ts +++ b/libs/wingsdk/test/target-awscdk/function.test.ts @@ -1,9 +1,9 @@ import { Match, Template } from "aws-cdk-lib/assertions"; import { test, expect } from "vitest"; import { Function } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import { Duration } from "../../src/std"; import * as awscdk from "../../src/target-awscdk"; -import { Testing } from "../../src/testing"; import { mkdtemp, awscdkSanitize } from "../util"; const CDK_APP_OPTS = { diff --git a/libs/wingsdk/test/target-awscdk/on-deploy.test.ts b/libs/wingsdk/test/target-awscdk/on-deploy.test.ts index 224b50057e3..fb905800a9e 100644 --- a/libs/wingsdk/test/target-awscdk/on-deploy.test.ts +++ b/libs/wingsdk/test/target-awscdk/on-deploy.test.ts @@ -1,8 +1,8 @@ import { Capture, Match, Template } from "aws-cdk-lib/assertions"; import { expect, test } from "vitest"; import { Bucket, OnDeploy } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as awscdk from "../../src/target-awscdk"; -import { Testing } from "../../src/testing"; import { sanitizeCode, mkdtemp } from "../util"; const CDK_APP_OPTS = { diff --git a/libs/wingsdk/test/target-awscdk/queue.test.ts b/libs/wingsdk/test/target-awscdk/queue.test.ts index 191cfaeea0d..9109d850f7d 100644 --- a/libs/wingsdk/test/target-awscdk/queue.test.ts +++ b/libs/wingsdk/test/target-awscdk/queue.test.ts @@ -1,9 +1,9 @@ import { Template } from "aws-cdk-lib/assertions"; import { test, expect } from "vitest"; import { Queue } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as std from "../../src/std"; import * as awscdk from "../../src/target-awscdk"; -import { Testing } from "../../src/testing"; import { mkdtemp, sanitizeCode, awscdkSanitize } from "../util"; const CDK_APP_OPTS = { diff --git a/libs/wingsdk/test/target-awscdk/schedule.test.ts b/libs/wingsdk/test/target-awscdk/schedule.test.ts index 7ffb543fee6..8f7d6863ac5 100644 --- a/libs/wingsdk/test/target-awscdk/schedule.test.ts +++ b/libs/wingsdk/test/target-awscdk/schedule.test.ts @@ -1,9 +1,9 @@ import { Match, Template, MatchResult } from "aws-cdk-lib/assertions"; import { test, expect } from "vitest"; import { Schedule } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as std from "../../src/std"; import * as awscdk from "../../src/target-awscdk"; -import { Testing } from "../../src/testing"; import { mkdtemp, awscdkSanitize } from "../util"; const CDK_APP_OPTS = { diff --git a/libs/wingsdk/test/target-awscdk/topic.test.ts b/libs/wingsdk/test/target-awscdk/topic.test.ts index 349a6cd227b..23732e9ed07 100644 --- a/libs/wingsdk/test/target-awscdk/topic.test.ts +++ b/libs/wingsdk/test/target-awscdk/topic.test.ts @@ -1,8 +1,8 @@ import { Template } from "aws-cdk-lib/assertions"; import { test, expect } from "vitest"; import { Topic } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as awscdk from "../../src/target-awscdk"; -import { Testing } from "../../src/testing"; import { mkdtemp, sanitizeCode, awscdkSanitize } from "../util"; const CDK_APP_OPTS = { diff --git a/libs/wingsdk/test/target-sim/api.test.ts b/libs/wingsdk/test/target-sim/api.test.ts index b806dd16855..c06715ab5ac 100644 --- a/libs/wingsdk/test/target-sim/api.test.ts +++ b/libs/wingsdk/test/target-sim/api.test.ts @@ -1,8 +1,8 @@ import { test, expect } from "vitest"; import { listMessages } from "./util"; import * as cloud from "../../src/cloud"; +import { Simulator, Testing } from "../../src/simulator"; import { ApiAttributes } from "../../src/target-sim/schema-resources"; -import { Simulator, Testing } from "../../src/testing"; import { SimApp } from "../sim-app"; // Handler that responds to a request with a fixed string diff --git a/libs/wingsdk/test/target-sim/binding.test.ts b/libs/wingsdk/test/target-sim/binding.test.ts index 97ac4340625..26885ddeb25 100644 --- a/libs/wingsdk/test/target-sim/binding.test.ts +++ b/libs/wingsdk/test/target-sim/binding.test.ts @@ -1,6 +1,6 @@ import { test, expect } from "vitest"; import { Function } from "../../src/cloud"; -import { Testing } from "../../src/testing"; +import { Testing } from "../../src/simulator"; import { SimApp } from "../sim-app"; test("binding throws if a method is unsupported", () => { diff --git a/libs/wingsdk/test/target-sim/bucket.test.ts b/libs/wingsdk/test/target-sim/bucket.test.ts index 58244848e0c..0f6f74e9209 100644 --- a/libs/wingsdk/test/target-sim/bucket.test.ts +++ b/libs/wingsdk/test/target-sim/bucket.test.ts @@ -5,8 +5,8 @@ import { vi, test, expect } from "vitest"; import { listMessages, treeJsonOf } from "./util"; import * as cloud from "../../src/cloud"; import { BucketEventType } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import { Node } from "../../src/std"; -import { Testing } from "../../src/testing"; import { SimApp } from "../sim-app"; test("create a bucket", async () => { diff --git a/libs/wingsdk/test/target-sim/file-counter.test.ts b/libs/wingsdk/test/target-sim/file-counter.test.ts index d7b8d00d852..ba5e41a68b4 100644 --- a/libs/wingsdk/test/target-sim/file-counter.test.ts +++ b/libs/wingsdk/test/target-sim/file-counter.test.ts @@ -2,8 +2,8 @@ import { Construct } from "constructs"; import { test, expect } from "vitest"; import { waitUntilTraceCount } from "./util"; import * as cloud from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import { IResource, Trace } from "../../src/std"; -import { Testing } from "../../src/testing"; import { SimApp } from "../sim-app"; test("can create sequential files in a bucket", async () => { diff --git a/libs/wingsdk/test/target-sim/function.test.ts b/libs/wingsdk/test/target-sim/function.test.ts index cfce52fd4dd..fef87446d21 100644 --- a/libs/wingsdk/test/target-sim/function.test.ts +++ b/libs/wingsdk/test/target-sim/function.test.ts @@ -1,8 +1,8 @@ import { test, expect } from "vitest"; import { listMessages, treeJsonOf } from "./util"; import * as cloud from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import { Node } from "../../src/std"; -import { Testing } from "../../src/testing"; import { SimApp } from "../sim-app"; const INFLIGHT_CODE = ` diff --git a/libs/wingsdk/test/target-sim/immutable-capture.test.ts b/libs/wingsdk/test/target-sim/immutable-capture.test.ts index f1b05ba718e..dcce10c8a1f 100644 --- a/libs/wingsdk/test/target-sim/immutable-capture.test.ts +++ b/libs/wingsdk/test/target-sim/immutable-capture.test.ts @@ -3,8 +3,8 @@ import { test, expect } from "vitest"; import { Bucket } from "../../src/cloud"; import { Function, IFunctionClient } from "../../src/cloud/function"; import { InflightBindings, NodeJsCode } from "../../src/core/inflight"; +import { Testing } from "../../src/simulator"; import { Duration } from "../../src/std"; -import { Testing } from "../../src/testing"; import { SimApp } from "../sim-app"; interface CaptureTest { diff --git a/libs/wingsdk/test/target-sim/inflight.test.ts b/libs/wingsdk/test/target-sim/inflight.test.ts index 2ac4a4b698f..6cd172d2181 100644 --- a/libs/wingsdk/test/target-sim/inflight.test.ts +++ b/libs/wingsdk/test/target-sim/inflight.test.ts @@ -1,7 +1,7 @@ import { test, expect } from "vitest"; import { treeJsonOf } from "./util"; +import { Testing } from "../../src/simulator"; import { Node } from "../../src/std"; -import { Testing } from "../../src/testing"; import { SimApp } from "../sim-app"; const INFLIGHT_CODE = ` diff --git a/libs/wingsdk/test/target-sim/on-deploy.test.ts b/libs/wingsdk/test/target-sim/on-deploy.test.ts index dbcf3b571e6..dc01f45fb0b 100644 --- a/libs/wingsdk/test/target-sim/on-deploy.test.ts +++ b/libs/wingsdk/test/target-sim/on-deploy.test.ts @@ -1,7 +1,7 @@ import { test, expect } from "vitest"; import { listMessages } from "./util"; import * as cloud from "../../src/cloud"; -import { Testing } from "../../src/testing"; +import { Testing } from "../../src/simulator"; import { SimApp } from "../sim-app"; const INFLIGHT_CODE = `async handle() { console.log("super duper success"); }`; diff --git a/libs/wingsdk/test/target-sim/queue-consumer.test.ts b/libs/wingsdk/test/target-sim/queue-consumer.test.ts index 93f67377de1..1842463bac6 100644 --- a/libs/wingsdk/test/target-sim/queue-consumer.test.ts +++ b/libs/wingsdk/test/target-sim/queue-consumer.test.ts @@ -2,8 +2,8 @@ import { Construct } from "constructs"; import { test, expect } from "vitest"; import { waitUntilTrace } from "./util"; import * as cloud from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import { TraceType } from "../../src/std"; -import { Testing } from "../../src/testing"; import { SimApp } from "../sim-app"; test("pushing messages through a queue", async () => { diff --git a/libs/wingsdk/test/target-sim/queue.test.ts b/libs/wingsdk/test/target-sim/queue.test.ts index 8c94140f6e4..2e8241215a4 100644 --- a/libs/wingsdk/test/target-sim/queue.test.ts +++ b/libs/wingsdk/test/target-sim/queue.test.ts @@ -6,9 +6,9 @@ import { waitUntilTraceCount, } from "./util"; import * as cloud from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import { Duration, Node } from "../../src/std"; import { QUEUE_TYPE } from "../../src/target-sim/schema-resources"; -import { Testing } from "../../src/testing"; import { SimApp } from "../sim-app"; const INFLIGHT_CODE = ` diff --git a/libs/wingsdk/test/target-sim/schedule.test.ts b/libs/wingsdk/test/target-sim/schedule.test.ts index 6c36bc732b7..6dfc03f2c03 100644 --- a/libs/wingsdk/test/target-sim/schedule.test.ts +++ b/libs/wingsdk/test/target-sim/schedule.test.ts @@ -1,8 +1,8 @@ import { test, expect } from "vitest"; import * as cloud from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import { Duration } from "../../src/std"; import { SCHEDULE_TYPE } from "../../src/target-sim/schema-resources"; -import { Testing } from "../../src/testing"; import { SimApp } from "../sim-app"; const INFLIGHT_CODE = ` diff --git a/libs/wingsdk/test/target-sim/service.test.ts b/libs/wingsdk/test/target-sim/service.test.ts index 4749916b06a..caa83e3e3a3 100644 --- a/libs/wingsdk/test/target-sim/service.test.ts +++ b/libs/wingsdk/test/target-sim/service.test.ts @@ -1,7 +1,7 @@ import { test, expect } from "vitest"; import * as cloud from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import { SERVICE_TYPE } from "../../src/target-sim/schema-resources"; -import { Testing } from "../../src/testing"; import { SimApp } from "../sim-app"; const INFLIGHT_ON_START = ` diff --git a/libs/wingsdk/test/target-sim/test.test.ts b/libs/wingsdk/test/target-sim/test.test.ts index a207108abc8..1c581cec49e 100644 --- a/libs/wingsdk/test/target-sim/test.test.ts +++ b/libs/wingsdk/test/target-sim/test.test.ts @@ -1,6 +1,6 @@ import { test, expect } from "vitest"; +import { Testing } from "../../src/simulator"; import { Test } from "../../src/std"; -import { Testing } from "../../src/testing"; import { SimApp } from "../sim-app"; const INFLIGHT_CODE = ` diff --git a/libs/wingsdk/test/target-sim/topic-producer.test.ts b/libs/wingsdk/test/target-sim/topic-producer.test.ts index a7413f66105..2504cce506a 100644 --- a/libs/wingsdk/test/target-sim/topic-producer.test.ts +++ b/libs/wingsdk/test/target-sim/topic-producer.test.ts @@ -2,7 +2,7 @@ import { Construct } from "constructs"; import { test, expect } from "vitest"; import { listMessages } from "./util"; import * as cloud from "../../src/cloud"; -import { Testing } from "../../src/testing"; +import { Testing } from "../../src/simulator"; import { SimApp } from "../sim-app"; test("publishing messages to topic", async () => { diff --git a/libs/wingsdk/test/target-sim/topic.test.ts b/libs/wingsdk/test/target-sim/topic.test.ts index 4a20a73e1c4..a642f59d8ea 100644 --- a/libs/wingsdk/test/target-sim/topic.test.ts +++ b/libs/wingsdk/test/target-sim/topic.test.ts @@ -1,8 +1,8 @@ import { test, expect } from "vitest"; import { listMessages, treeJsonOf } from "./util"; import * as cloud from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import { Node } from "../../src/std"; -import { Testing } from "../../src/testing"; import { SimApp } from "../sim-app"; test("create a topic", async () => { diff --git a/libs/wingsdk/test/target-sim/util.ts b/libs/wingsdk/test/target-sim/util.ts index 835c90607f1..938cd0f5a62 100644 --- a/libs/wingsdk/test/target-sim/util.ts +++ b/libs/wingsdk/test/target-sim/util.ts @@ -1,8 +1,8 @@ import { existsSync, readFileSync } from "fs"; import { join } from "path"; import { Construct } from "constructs"; +import { Simulator } from "../../src/simulator"; import { Trace } from "../../src/std"; -import { Simulator } from "../../src/testing"; export function readJsonSync(file: string) { return JSON.parse(readFileSync(file, "utf-8")); diff --git a/libs/wingsdk/test/target-sim/website.test.ts b/libs/wingsdk/test/target-sim/website.test.ts index d2e1ac346a1..1a7b480be53 100644 --- a/libs/wingsdk/test/target-sim/website.test.ts +++ b/libs/wingsdk/test/target-sim/website.test.ts @@ -2,8 +2,8 @@ import { readFileSync } from "fs"; import { resolve } from "path"; import { test, expect } from "vitest"; import * as cloud from "../../src/cloud"; +import { Simulator } from "../../src/simulator"; import { ApiAttributes } from "../../src/target-sim/schema-resources"; -import { Simulator } from "../../src/testing"; import { SimApp } from "../sim-app"; test("website is serving static pages", async () => { diff --git a/libs/wingsdk/test/target-tf-aws/api.test.ts b/libs/wingsdk/test/target-tf-aws/api.test.ts index 40efb48b41f..21dc6cd121d 100644 --- a/libs/wingsdk/test/target-tf-aws/api.test.ts +++ b/libs/wingsdk/test/target-tf-aws/api.test.ts @@ -1,7 +1,7 @@ import { test, expect } from "vitest"; +import { Testing } from "../../src/simulator"; import * as tfaws from "../../src/target-tf-aws"; import { Api, Function } from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { mkdtemp, tfResourcesOfCount } from "../util"; const INFLIGHT_CODE = `async handle(name) { return "Hello, World"; }`; diff --git a/libs/wingsdk/test/target-tf-aws/app.test.ts b/libs/wingsdk/test/target-tf-aws/app.test.ts index ed7c6574a4b..22aafbf2f5b 100644 --- a/libs/wingsdk/test/target-tf-aws/app.test.ts +++ b/libs/wingsdk/test/target-tf-aws/app.test.ts @@ -1,8 +1,8 @@ import { existsSync, readdirSync } from "fs"; import { test, expect } from "vitest"; import { Function } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as tfaws from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { mkdtemp } from "../util"; test("artifacts are located in app root level outdir", () => { diff --git a/libs/wingsdk/test/target-tf-aws/bucket.test.ts b/libs/wingsdk/test/target-tf-aws/bucket.test.ts index c5c6f22b763..e2aee1bc463 100644 --- a/libs/wingsdk/test/target-tf-aws/bucket.test.ts +++ b/libs/wingsdk/test/target-tf-aws/bucket.test.ts @@ -1,8 +1,8 @@ import * as cdktf from "cdktf"; import { test, expect } from "vitest"; import { Bucket } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as tfaws from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { mkdtemp, tfResourcesOf, diff --git a/libs/wingsdk/test/target-tf-aws/captures.test.ts b/libs/wingsdk/test/target-tf-aws/captures.test.ts index b7d789d17ba..f90d6361a9c 100644 --- a/libs/wingsdk/test/target-tf-aws/captures.test.ts +++ b/libs/wingsdk/test/target-tf-aws/captures.test.ts @@ -1,7 +1,7 @@ import { test, expect, describe } from "vitest"; import * as cloud from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as tfaws from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { mkdtemp, sanitizeCode, tfResourcesOf, tfSanitize } from "../util"; describe("function with bucket binding", () => { diff --git a/libs/wingsdk/test/target-tf-aws/counter.test.ts b/libs/wingsdk/test/target-tf-aws/counter.test.ts index 4589f499cf4..e63ccc33298 100644 --- a/libs/wingsdk/test/target-tf-aws/counter.test.ts +++ b/libs/wingsdk/test/target-tf-aws/counter.test.ts @@ -1,8 +1,8 @@ import * as cdktf from "cdktf"; import { test, expect } from "vitest"; import * as cloud from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as tfaws from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { mkdtemp, sanitizeCode, diff --git a/libs/wingsdk/test/target-tf-aws/dynamodb-table.test.ts b/libs/wingsdk/test/target-tf-aws/dynamodb-table.test.ts index 423fbbcf2f8..bc13600a5b6 100644 --- a/libs/wingsdk/test/target-tf-aws/dynamodb-table.test.ts +++ b/libs/wingsdk/test/target-tf-aws/dynamodb-table.test.ts @@ -1,8 +1,8 @@ import { test, expect } from "vitest"; import * as cloud from "../../src/cloud"; import * as ex from "../../src/ex"; +import { Testing } from "../../src/simulator"; import * as tfaws from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { mkdtemp, sanitizeCode, diff --git a/libs/wingsdk/test/target-tf-aws/function.test.ts b/libs/wingsdk/test/target-tf-aws/function.test.ts index aafdb0c3ffe..cf7fa78bc24 100644 --- a/libs/wingsdk/test/target-tf-aws/function.test.ts +++ b/libs/wingsdk/test/target-tf-aws/function.test.ts @@ -1,9 +1,9 @@ import * as cdktf from "cdktf"; import { test, expect } from "vitest"; import { Function } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import { Duration } from "../../src/std"; import * as tfaws from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { mkdtemp, tfResourcesOf, tfSanitize, treeJsonOf } from "../util"; const INFLIGHT_CODE = `async handle(name) { console.log("Hello, " + name); }`; diff --git a/libs/wingsdk/test/target-tf-aws/logger.test.ts b/libs/wingsdk/test/target-tf-aws/logger.test.ts index 3a0a567a3b7..0a43d9a201c 100644 --- a/libs/wingsdk/test/target-tf-aws/logger.test.ts +++ b/libs/wingsdk/test/target-tf-aws/logger.test.ts @@ -1,7 +1,7 @@ import { test, expect } from "vitest"; import { Function } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as tfaws from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { mkdtemp, sanitizeCode, tfResourcesOf, tfSanitize } from "../util"; test("inflight function uses a logger", () => { diff --git a/libs/wingsdk/test/target-tf-aws/on-deploy.test.ts b/libs/wingsdk/test/target-tf-aws/on-deploy.test.ts index 3a730d08718..656ada41034 100644 --- a/libs/wingsdk/test/target-tf-aws/on-deploy.test.ts +++ b/libs/wingsdk/test/target-tf-aws/on-deploy.test.ts @@ -1,7 +1,7 @@ import { test, expect } from "vitest"; import * as cloud from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as tfaws from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { getTfDataSource, getTfResource, diff --git a/libs/wingsdk/test/target-tf-aws/queue.test.ts b/libs/wingsdk/test/target-tf-aws/queue.test.ts index 88555d74f8c..eae11e1b61d 100644 --- a/libs/wingsdk/test/target-tf-aws/queue.test.ts +++ b/libs/wingsdk/test/target-tf-aws/queue.test.ts @@ -1,9 +1,9 @@ import * as cdktf from "cdktf"; import { test, expect } from "vitest"; import { Queue } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as std from "../../src/std"; import * as tfaws from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { mkdtemp, sanitizeCode, diff --git a/libs/wingsdk/test/target-tf-aws/redis.test.ts b/libs/wingsdk/test/target-tf-aws/redis.test.ts index 4759296f57c..8c483a30099 100644 --- a/libs/wingsdk/test/target-tf-aws/redis.test.ts +++ b/libs/wingsdk/test/target-tf-aws/redis.test.ts @@ -1,8 +1,8 @@ import { describe, it, expect } from "vitest"; import { Function } from "../../src/cloud"; import * as ex from "../../src/ex"; +import { Testing } from "../../src/simulator"; import * as tfaws from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { mkdtemp, getTfResource, diff --git a/libs/wingsdk/test/target-tf-aws/schedule.test.ts b/libs/wingsdk/test/target-tf-aws/schedule.test.ts index 870be4f8703..57cf0498604 100644 --- a/libs/wingsdk/test/target-tf-aws/schedule.test.ts +++ b/libs/wingsdk/test/target-tf-aws/schedule.test.ts @@ -1,9 +1,9 @@ import * as cdktf from "cdktf"; import { test, expect } from "vitest"; import * as cloud from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as std from "../../src/std"; import * as tfaws from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { mkdtemp, tfResourcesOf, tfSanitize, treeJsonOf } from "../util"; test("schedule behavior with rate", () => { diff --git a/libs/wingsdk/test/target-tf-aws/table.test.ts b/libs/wingsdk/test/target-tf-aws/table.test.ts index c91e40ad27f..ccff864fac8 100644 --- a/libs/wingsdk/test/target-tf-aws/table.test.ts +++ b/libs/wingsdk/test/target-tf-aws/table.test.ts @@ -1,8 +1,8 @@ import { test, expect } from "vitest"; import * as cloud from "../../src/cloud"; import * as ex from "../../src/ex"; +import { Testing } from "../../src/simulator"; import * as tfaws from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { mkdtemp, sanitizeCode, diff --git a/libs/wingsdk/test/target-tf-aws/tokens.test.ts b/libs/wingsdk/test/target-tf-aws/tokens.test.ts index 87e660b3cd8..164f2aa267d 100644 --- a/libs/wingsdk/test/target-tf-aws/tokens.test.ts +++ b/libs/wingsdk/test/target-tf-aws/tokens.test.ts @@ -1,8 +1,8 @@ import { TerraformVariable } from "cdktf"; import { test, expect } from "vitest"; +import { Testing } from "../../src/simulator"; import * as tfaws from "../../src/target-tf-aws"; import { Api } from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { mkdtemp, tfSanitize, sanitizeCode } from "../util"; test("captures tokens", () => { diff --git a/libs/wingsdk/test/target-tf-aws/topic.test.ts b/libs/wingsdk/test/target-tf-aws/topic.test.ts index 7f44386ff1b..5de821a40b4 100644 --- a/libs/wingsdk/test/target-tf-aws/topic.test.ts +++ b/libs/wingsdk/test/target-tf-aws/topic.test.ts @@ -1,9 +1,9 @@ import * as cdktf from "cdktf"; import { test, expect } from "vitest"; import * as cloud from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import { Duration } from "../../src/std"; import * as tfaws from "../../src/target-tf-aws"; -import { Testing } from "../../src/testing"; import { mkdtemp, sanitizeCode, diff --git a/libs/wingsdk/test/target-tf-azure/bucket.test.ts b/libs/wingsdk/test/target-tf-azure/bucket.test.ts index 6d4e879d766..5eb4d97145c 100644 --- a/libs/wingsdk/test/target-tf-azure/bucket.test.ts +++ b/libs/wingsdk/test/target-tf-azure/bucket.test.ts @@ -1,8 +1,8 @@ import * as cdktf from "cdktf"; import { test, expect } from "vitest"; import { Bucket } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as tfazure from "../../src/target-tf-azure"; -import { Testing } from "../../src/testing"; import { mkdtemp, tfResourcesOf, diff --git a/libs/wingsdk/test/target-tf-azure/captures.test.ts b/libs/wingsdk/test/target-tf-azure/captures.test.ts index 41c9cb5f3ec..e2810217448 100644 --- a/libs/wingsdk/test/target-tf-azure/captures.test.ts +++ b/libs/wingsdk/test/target-tf-azure/captures.test.ts @@ -1,8 +1,8 @@ import * as cdktf from "cdktf"; import { test, expect } from "vitest"; import * as cloud from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as tfazure from "../../src/target-tf-azure"; -import { Testing } from "../../src/testing"; import { mkdtemp, sanitizeCode, tfResourcesOf, tfSanitize } from "../util"; test("function with a bucket binding requiring read_write", () => { diff --git a/libs/wingsdk/test/target-tf-azure/function.test.ts b/libs/wingsdk/test/target-tf-azure/function.test.ts index 7f9ad80125f..bd2831865f6 100644 --- a/libs/wingsdk/test/target-tf-azure/function.test.ts +++ b/libs/wingsdk/test/target-tf-azure/function.test.ts @@ -1,8 +1,8 @@ import * as cdktf from "cdktf"; import { test, expect } from "vitest"; import { Function } from "../../src/cloud"; +import { Testing } from "../../src/simulator"; import * as tfazure from "../../src/target-tf-azure"; -import { Testing } from "../../src/testing"; import { mkdtemp, tfResourcesOf, tfSanitize, treeJsonOf } from "../util"; const INFLIGHT_CODE = `async handle(name) { console.log("Hello, " + name); }`;