From f1373caa9f9673275842a3a77ff30879ae8c74e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B6ckelmann?= Date: Fri, 22 Mar 2024 08:00:24 +0100 Subject: [PATCH] Revert "Fix import of GameModel in Testcases" This reverts commit 6a8c34df521b425ac3ffcb70eaeae8c2b3ce34cc. --- e2e/game-model/AddingGamesystems.spec.ts | 4 ++-- e2e/game-model/RemovingGamesystems.spec.ts | 4 ++-- .../gamesystems/CreateGamesystem.spec.ts | 10 +++++++++- e2e/game-model/gamesystems/FindGamesystem.spec.ts | 10 +++++----- e2e/game-model/gamesystems/GamesystemTrainer.ts | 6 +++--- .../gamesystems/SimpleGamesystem.spec.ts | 10 +++++----- .../gamesystems/actions/AddActions.spec.ts | 4 ++-- .../gamesystems/actions/RemoveActions.spec.ts | 6 +++--- .../gamesystems/actions/SimpleActionTrainer.ts | 8 ++++---- .../conditions/AddTransitionConditions.spec.ts | 4 ++-- .../conditions/ConditionContradicting.spec.ts | 4 ++-- .../conditions/ConditionCreation.spec.ts | 4 ++-- .../conditions/ConditionExpansion.spec.ts | 4 +++- .../gamesystems/conditions/ConditionTrainer.ts | 4 ++-- .../conditions/TransitionConditionTrainer.ts | 8 ++++---- .../productGamesystems/CreateProductStates.spec.ts | 14 ++++++++++++-- .../CreateProductTransitions.spec.ts | 4 ++-- .../productGamesystems/EqualInnerStates.spec.ts | 12 ++++++++++++ .../ProductStateGeneration.spec.ts | 13 +++++++++++++ .../productGamesystems/ProductStateTrainer.ts | 8 ++++---- .../ProductSystemGenerationTrainer.ts | 4 ++-- .../scriptAccounts/ScriptAccountTest.spec.ts | 8 ++++---- 22 files changed, 99 insertions(+), 54 deletions(-) diff --git a/e2e/game-model/AddingGamesystems.spec.ts b/e2e/game-model/AddingGamesystems.spec.ts index db9f74a..4d65fd0 100644 --- a/e2e/game-model/AddingGamesystems.spec.ts +++ b/e2e/game-model/AddingGamesystems.spec.ts @@ -1,8 +1,8 @@ import { BrowserContext, ElectronApplication, Page, _electron as electron } from 'playwright'; import { test, expect } from '@playwright/test'; import * as PATH from 'path'; -import {GameModel} from "../../src/app/project/game-modelGameModel"; -import {Gamesystem} from "../../src/app/project/game-model/gamesystems/Gamesystem"; +import {GameModel} from "../../src/app/game-model/GameModel"; +import {Gamesystem} from "../../src/app/game-model/gamesystems/Gamesystem"; test.describe('Adding Gamesystems', () => { diff --git a/e2e/game-model/RemovingGamesystems.spec.ts b/e2e/game-model/RemovingGamesystems.spec.ts index 1e9596e..e5777fe 100644 --- a/e2e/game-model/RemovingGamesystems.spec.ts +++ b/e2e/game-model/RemovingGamesystems.spec.ts @@ -1,8 +1,8 @@ import { BrowserContext, ElectronApplication, Page, _electron as electron } from 'playwright'; import { test, expect } from '@playwright/test'; import * as PATH from 'path'; -import {GameModel} from "../../src/app/project/game-model/GameModel"; -import {Gamesystem} from "../../src/app/project/game-model/gamesystems/Gamesystem"; +import {GameModel} from "../../src/app/game-model/GameModel"; +import {Gamesystem} from "../../src/app/game-model/gamesystems/Gamesystem"; test.describe('Removing Gamesystems', () => { diff --git a/e2e/game-model/gamesystems/CreateGamesystem.spec.ts b/e2e/game-model/gamesystems/CreateGamesystem.spec.ts index 07a6d7a..84e01c5 100644 --- a/e2e/game-model/gamesystems/CreateGamesystem.spec.ts +++ b/e2e/game-model/gamesystems/CreateGamesystem.spec.ts @@ -1,7 +1,15 @@ import { BrowserContext, ElectronApplication, Page, _electron as electron } from 'playwright'; import { test, expect } from '@playwright/test'; +import * as PATH from 'path'; +import {GameModel} from "../../../src/app/game-model/GameModel"; +import {Gamesystem} from "../../src/app/game-model/gamesystems/Gamesystem"; +import {ScriptAccount} from "../../../src/app/game-model/scriptAccounts/ScriptAccount"; +import {ModelComponentType} from "../../../src/app/game-model/ModelComponentType"; +import {SimpleGamesystem} from "../../../src/app/game-model/gamesystems/SimpleGamesystem"; +import exp = require("node:constants"); +import {end} from "electron-debug"; import {GamesystemTrainer} from "./GamesystemTrainer"; -import {ProductGamesystem} from "../../../src/app/project/gamemodel/gamesystems/ProductGamesystem"; +import {ProductGamesystem} from "../../../src/app/game-model/gamesystems/ProductGamesystem"; test.describe('Test Create Gamesystems', () => { test('Test creating gamesystem with invalid name', async => { diff --git a/e2e/game-model/gamesystems/FindGamesystem.spec.ts b/e2e/game-model/gamesystems/FindGamesystem.spec.ts index 67d32c4..879717b 100644 --- a/e2e/game-model/gamesystems/FindGamesystem.spec.ts +++ b/e2e/game-model/gamesystems/FindGamesystem.spec.ts @@ -1,11 +1,11 @@ import { BrowserContext, ElectronApplication, Page, _electron as electron } from 'playwright'; import { test, expect } from '@playwright/test'; import * as PATH from 'path'; -import {GameModel} from "../../../src/app/project/gamemodel/GameModel"; -import {Gamesystem} from "../../src/app/project/gamemodel/gamesystems/Gamesystem"; -import {ScriptAccount} from "../../../src/app/project/gamemodel/scriptAccounts/ScriptAccount"; -import {ModelComponentType} from "../../../src/app/project/gamemodel/ModelComponentType"; -import {SimpleGamesystem} from "../../../src/app/project/gamemodel/gamesystems/SimpleGamesystem"; +import {GameModel} from "../../../src/app/game-model/GameModel"; +import {Gamesystem} from "../../src/app/game-model/gamesystems/Gamesystem"; +import {ScriptAccount} from "../../../src/app/game-model/scriptAccounts/ScriptAccount"; +import {ModelComponentType} from "../../../src/app/game-model/ModelComponentType"; +import {SimpleGamesystem} from "../../../src/app/game-model/gamesystems/SimpleGamesystem"; import exp = require("node:constants"); import {end} from "electron-debug"; import {GamesystemTrainer} from "./GamesystemTrainer"; diff --git a/e2e/game-model/gamesystems/GamesystemTrainer.ts b/e2e/game-model/gamesystems/GamesystemTrainer.ts index 8c2581b..515882e 100644 --- a/e2e/game-model/gamesystems/GamesystemTrainer.ts +++ b/e2e/game-model/gamesystems/GamesystemTrainer.ts @@ -1,6 +1,6 @@ -import {GameModel} from "../../../src/app/project/gamemodel/GameModel"; -import {SimpleGamesystem} from "../../../src/app/project/gamemodel/gamesystems/SimpleGamesystem"; -import {ProductGamesystem} from "../../../src/app/project/gamemodel/gamesystems/ProductGamesystem"; +import {GameModel} from "../../../src/app/game-model/GameModel"; +import {SimpleGamesystem} from "../../../src/app/game-model/gamesystems/SimpleGamesystem"; +import {ProductGamesystem} from "../../../src/app/game-model/gamesystems/ProductGamesystem"; export class GamesystemTrainer { diff --git a/e2e/game-model/gamesystems/SimpleGamesystem.spec.ts b/e2e/game-model/gamesystems/SimpleGamesystem.spec.ts index 479baae..4c61efd 100644 --- a/e2e/game-model/gamesystems/SimpleGamesystem.spec.ts +++ b/e2e/game-model/gamesystems/SimpleGamesystem.spec.ts @@ -1,11 +1,11 @@ import { BrowserContext, ElectronApplication, Page, _electron as electron } from 'playwright'; import { test, expect } from '@playwright/test'; import * as PATH from 'path'; -import {GameModel} from "../../../src/app/project/gamemodel/GameModel"; -import {Gamesystem} from "../../src/app/project/gamemodel/gamesystems/Gamesystem"; -import {ScriptAccount} from "../../../src/app/project/gamemodel/scriptAccounts/ScriptAccount"; -import {ModelComponentType} from "../../../src/app/project/gamemodel/ModelComponentType"; -import {SimpleGamesystem} from "../../../src/app/project/gamemodel/gamesystems/SimpleGamesystem"; +import {GameModel} from "../../../src/app/game-model/GameModel"; +import {Gamesystem} from "../../src/app/game-model/gamesystems/Gamesystem"; +import {ScriptAccount} from "../../../src/app/game-model/scriptAccounts/ScriptAccount"; +import {ModelComponentType} from "../../../src/app/game-model/ModelComponentType"; +import {SimpleGamesystem} from "../../../src/app/game-model/gamesystems/SimpleGamesystem"; import exp = require("node:constants"); import {end} from "electron-debug"; diff --git a/e2e/game-model/gamesystems/actions/AddActions.spec.ts b/e2e/game-model/gamesystems/actions/AddActions.spec.ts index d7057a0..3e1fd12 100644 --- a/e2e/game-model/gamesystems/actions/AddActions.spec.ts +++ b/e2e/game-model/gamesystems/actions/AddActions.spec.ts @@ -2,8 +2,8 @@ import { test, expect } from '@playwright/test'; import {GamesystemTrainer} from "../GamesystemTrainer"; import {SimpleActionTrainer} from "./SimpleActionTrainer"; -import {ScriptAccount} from "../../../../src/app/project/gamemodel/scriptAccounts/ScriptAccount"; -import {ScriptAccountAction} from "../../../../src/app/project/gamemodel/gamesystems/actions/ScriptAccountAction"; +import {ScriptAccount} from "../../../../src/app/game-model/scriptAccounts/ScriptAccount"; +import {ScriptAccountAction} from "../../../../src/app/game-model/gamesystems/actions/ScriptAccountAction"; test.describe('Test Create SimpleActions', () => { test('Test creating gamesystem with invalid name', async => { diff --git a/e2e/game-model/gamesystems/actions/RemoveActions.spec.ts b/e2e/game-model/gamesystems/actions/RemoveActions.spec.ts index 39e0087..931f7c9 100644 --- a/e2e/game-model/gamesystems/actions/RemoveActions.spec.ts +++ b/e2e/game-model/gamesystems/actions/RemoveActions.spec.ts @@ -2,9 +2,9 @@ import { test, expect } from '@playwright/test'; import {GamesystemTrainer} from "../GamesystemTrainer"; import {SimpleActionTrainer} from "./SimpleActionTrainer"; -import {ScriptAccount} from "../../../../src/app/project/gamemodel/scriptAccounts/ScriptAccount"; -import {ScriptAccountAction} from "../../../../src/app/project/gamemodel/gamesystems/actions/ScriptAccountAction"; -import {SimpleTransition} from "../../../../src/app/project/gamemodel/gamesystems/transitions/SimpleTransition"; +import {ScriptAccount} from "../../../../src/app/game-model/scriptAccounts/ScriptAccount"; +import {ScriptAccountAction} from "../../../../src/app/game-model/gamesystems/actions/ScriptAccountAction"; +import {SimpleTransition} from "../../../../src/app/game-model/gamesystems/transitions/SimpleTransition"; test.describe('Test Remove SimpleActions', () => { test("Test Removing invalid Actions", async () => { diff --git a/e2e/game-model/gamesystems/actions/SimpleActionTrainer.ts b/e2e/game-model/gamesystems/actions/SimpleActionTrainer.ts index ad05361..219ae4d 100644 --- a/e2e/game-model/gamesystems/actions/SimpleActionTrainer.ts +++ b/e2e/game-model/gamesystems/actions/SimpleActionTrainer.ts @@ -1,8 +1,8 @@ -import {SimpleState} from "../../../../src/app/project/gamemodel/gamesystems/states/SimpleState"; -import {SimpleTransition} from "../../../../src/app/project/gamemodel/gamesystems/transitions/SimpleTransition"; +import {SimpleState} from "../../../../src/app/game-model/gamesystems/states/SimpleState"; +import {SimpleTransition} from "../../../../src/app/game-model/gamesystems/transitions/SimpleTransition"; import {Script} from "node:vm"; -import {ScriptAccount} from "../../../../src/app/project/gamemodel/scriptAccounts/ScriptAccount"; -import {ScriptAccountAction} from "../../../../src/app/project/gamemodel/gamesystems/actions/ScriptAccountAction"; +import {ScriptAccount} from "../../../../src/app/game-model/scriptAccounts/ScriptAccount"; +import {ScriptAccountAction} from "../../../../src/app/game-model/gamesystems/actions/ScriptAccountAction"; export class SimpleActionTrainer { static withEmptyActions() { diff --git a/e2e/game-model/gamesystems/conditions/AddTransitionConditions.spec.ts b/e2e/game-model/gamesystems/conditions/AddTransitionConditions.spec.ts index 6c4280a..c9fb7a9 100644 --- a/e2e/game-model/gamesystems/conditions/AddTransitionConditions.spec.ts +++ b/e2e/game-model/gamesystems/conditions/AddTransitionConditions.spec.ts @@ -1,7 +1,7 @@ import { test, expect } from '@playwright/test'; -import {ScriptAccountCondition} from "../../../../src/app/project/gamemodel/gamesystems/conditions/ScriptAccountCondition"; -import {ScriptAccount} from "../../../../src/app/project/gamemodel/scriptAccounts/ScriptAccount"; +import {ScriptAccountCondition} from "../../../../src/app/game-model/gamesystems/conditions/ScriptAccountCondition"; +import {ScriptAccount} from "../../../../src/app/game-model/scriptAccounts/ScriptAccount"; import exp = require("node:constants"); import {ConditionTrainer} from "./ConditionTrainer"; import {Conditional} from "@angular/compiler"; diff --git a/e2e/game-model/gamesystems/conditions/ConditionContradicting.spec.ts b/e2e/game-model/gamesystems/conditions/ConditionContradicting.spec.ts index 880b539..8a26afc 100644 --- a/e2e/game-model/gamesystems/conditions/ConditionContradicting.spec.ts +++ b/e2e/game-model/gamesystems/conditions/ConditionContradicting.spec.ts @@ -1,7 +1,7 @@ import { test, expect } from '@playwright/test'; -import {ScriptAccountCondition} from "../../../../src/app/project/gamemodel/gamesystems/conditions/ScriptAccountCondition"; -import {ScriptAccount} from "../../../../src/app/project/gamemodel/scriptAccounts/ScriptAccount"; +import {ScriptAccountCondition} from "../../../../src/app/game-model/gamesystems/conditions/ScriptAccountCondition"; +import {ScriptAccount} from "../../../../src/app/game-model/scriptAccounts/ScriptAccount"; import exp = require("node:constants"); import {ConditionTrainer} from "./ConditionTrainer"; import {Conditional} from "@angular/compiler"; diff --git a/e2e/game-model/gamesystems/conditions/ConditionCreation.spec.ts b/e2e/game-model/gamesystems/conditions/ConditionCreation.spec.ts index 267a10c..9b1239c 100644 --- a/e2e/game-model/gamesystems/conditions/ConditionCreation.spec.ts +++ b/e2e/game-model/gamesystems/conditions/ConditionCreation.spec.ts @@ -1,7 +1,7 @@ import { test, expect } from '@playwright/test'; -import {ScriptAccountCondition} from "../../../../src/app/project/gamemodel/gamesystems/conditions/ScriptAccountCondition"; -import {ScriptAccount} from "../../../../src/app/project/gamemodel/scriptAccounts/ScriptAccount"; +import {ScriptAccountCondition} from "../../../../src/app/game-model/gamesystems/conditions/ScriptAccountCondition"; +import {ScriptAccount} from "../../../../src/app/game-model/scriptAccounts/ScriptAccount"; import exp = require("node:constants"); test.describe('Test Create Gamesystems', () => { diff --git a/e2e/game-model/gamesystems/conditions/ConditionExpansion.spec.ts b/e2e/game-model/gamesystems/conditions/ConditionExpansion.spec.ts index ac9f593..d2b859c 100644 --- a/e2e/game-model/gamesystems/conditions/ConditionExpansion.spec.ts +++ b/e2e/game-model/gamesystems/conditions/ConditionExpansion.spec.ts @@ -1,6 +1,8 @@ import { test, expect } from '@playwright/test'; -import {ScriptAccountCondition} from "../../../../src/app/project/gamemodel/gamesystems/conditions/ScriptAccountCondition"; +import {ScriptAccountCondition} from "../../../../src/app/game-model/gamesystems/conditions/ScriptAccountCondition"; +import {ScriptAccount} from "../../../../src/app/game-model/scriptAccounts/ScriptAccount"; +import exp = require("node:constants"); import {ConditionTrainer} from "./ConditionTrainer"; test.describe('Test Expand Conditions', () => { diff --git a/e2e/game-model/gamesystems/conditions/ConditionTrainer.ts b/e2e/game-model/gamesystems/conditions/ConditionTrainer.ts index 12bbbff..ea4587c 100644 --- a/e2e/game-model/gamesystems/conditions/ConditionTrainer.ts +++ b/e2e/game-model/gamesystems/conditions/ConditionTrainer.ts @@ -1,5 +1,5 @@ -import {ScriptAccount} from "../../../../src/app/project/gamemodel/scriptAccounts/ScriptAccount"; -import {ScriptAccountCondition} from "../../../../src/app/project/gamemodel/gamesystems/conditions/ScriptAccountCondition"; +import {ScriptAccount} from "../../../../src/app/game-model/scriptAccounts/ScriptAccount"; +import {ScriptAccountCondition} from "../../../../src/app/game-model/gamesystems/conditions/ScriptAccountCondition"; export class ConditionTrainer { static withSimpleCondition(): ScriptAccountCondition { diff --git a/e2e/game-model/gamesystems/conditions/TransitionConditionTrainer.ts b/e2e/game-model/gamesystems/conditions/TransitionConditionTrainer.ts index 20db5cb..ba97347 100644 --- a/e2e/game-model/gamesystems/conditions/TransitionConditionTrainer.ts +++ b/e2e/game-model/gamesystems/conditions/TransitionConditionTrainer.ts @@ -1,7 +1,7 @@ -import {SimpleState} from "../../../../src/app/project/gamemodel/gamesystems/states/SimpleState"; -import {SimpleTransition} from "../../../../src/app/project/gamemodel/gamesystems/transitions/SimpleTransition"; -import {ScriptAccount} from "../../../../src/app/project/gamemodel/scriptAccounts/ScriptAccount"; -import {ScriptAccountCondition} from "../../../../src/app/project/gamemodel/gamesystems/conditions/ScriptAccountCondition"; +import {SimpleState} from "../../../../src/app/game-model/gamesystems/states/SimpleState"; +import {SimpleTransition} from "../../../../src/app/game-model/gamesystems/transitions/SimpleTransition"; +import {ScriptAccount} from "../../../../src/app/game-model/scriptAccounts/ScriptAccount"; +import {ScriptAccountCondition} from "../../../../src/app/game-model/gamesystems/conditions/ScriptAccountCondition"; export class TransitionConditionTrainer { static withTransitionWithoutConditions() { const startingState = new SimpleState("StartingState", ""); diff --git a/e2e/game-model/gamesystems/productGamesystems/CreateProductStates.spec.ts b/e2e/game-model/gamesystems/productGamesystems/CreateProductStates.spec.ts index 3224c3c..165f9c6 100644 --- a/e2e/game-model/gamesystems/productGamesystems/CreateProductStates.spec.ts +++ b/e2e/game-model/gamesystems/productGamesystems/CreateProductStates.spec.ts @@ -1,7 +1,17 @@ +import { BrowserContext, ElectronApplication, Page, _electron as electron } from 'playwright'; import { test, expect } from '@playwright/test'; - +import * as PATH from 'path'; +import {GameModel} from "../../../src/app/game-model/GameModel"; +import {Gamesystem} from "../../src/app/game-model/gamesystems/Gamesystem"; +import {ScriptAccount} from "../../../src/app/game-model/scriptAccounts/ScriptAccount"; +import {ModelComponentType} from "../../../src/app/game-model/ModelComponentType"; +import {SimpleGamesystem} from "../../../src/app/game-model/gamesystems/SimpleGamesystem"; +import exp = require("node:constants"); +import {end} from "electron-debug"; +import {GamesystemTrainer} from "./GamesystemTrainer"; +import {ProductGamesystem} from "../../../src/app/game-model/gamesystems/ProductGamesystem"; import {ProductStateTrainer} from "./ProductStateTrainer"; -import {SimpleState} from "../../../../src/app/project/gamemodel/gamesystems/states/SimpleState"; +import {SimpleState} from "../../../../src/app/game-model/gamesystems/states/SimpleState"; test.describe('Test Create ProductStates', () => { test("Adding already existent ProductState", async () => { diff --git a/e2e/game-model/gamesystems/productGamesystems/CreateProductTransitions.spec.ts b/e2e/game-model/gamesystems/productGamesystems/CreateProductTransitions.spec.ts index 6d6fd31..dd687f3 100644 --- a/e2e/game-model/gamesystems/productGamesystems/CreateProductTransitions.spec.ts +++ b/e2e/game-model/gamesystems/productGamesystems/CreateProductTransitions.spec.ts @@ -1,7 +1,7 @@ import { test, expect } from '@playwright/test'; import {ProductStateTrainer} from "./ProductStateTrainer"; -import {ProductState} from "../../../../src/app/project/gamemodel/gamesystems/states/ProductState"; -import {SimpleGamesystem} from "../../../../src/app/project/gamemodel/gamesystems/SimpleGamesystem"; +import {ProductState} from "../../../../src/app/game-model/gamesystems/states/ProductState"; +import {SimpleGamesystem} from "../../../../src/app/game-model/gamesystems/SimpleGamesystem"; test.describe('Test Create ProductTransitions', () => { test("Test ProductTransition Creation with invalid inputs", async ()=> { const gamesystem = ProductStateTrainer.givenFullProductGamesystemWithTwoStates(); diff --git a/e2e/game-model/gamesystems/productGamesystems/EqualInnerStates.spec.ts b/e2e/game-model/gamesystems/productGamesystems/EqualInnerStates.spec.ts index 070f5dc..5479bf2 100644 --- a/e2e/game-model/gamesystems/productGamesystems/EqualInnerStates.spec.ts +++ b/e2e/game-model/gamesystems/productGamesystems/EqualInnerStates.spec.ts @@ -1,5 +1,17 @@ +import { BrowserContext, ElectronApplication, Page, _electron as electron } from 'playwright'; import { test, expect } from '@playwright/test'; +import * as PATH from 'path'; +import {GameModel} from "../../../src/app/game-model/GameModel"; +import {Gamesystem} from "../../src/app/game-model/gamesystems/Gamesystem"; +import {ScriptAccount} from "../../../src/app/game-model/scriptAccounts/ScriptAccount"; +import {ModelComponentType} from "../../../src/app/game-model/ModelComponentType"; +import {SimpleGamesystem} from "../../../src/app/game-model/gamesystems/SimpleGamesystem"; +import exp = require("node:constants"); +import {end} from "electron-debug"; +import {GamesystemTrainer} from "./GamesystemTrainer"; +import {ProductGamesystem} from "../../../src/app/game-model/gamesystems/ProductGamesystem"; import {ProductStateTrainer} from "./ProductStateTrainer"; +import {SimpleState} from "../../../../src/app/game-model/gamesystems/states/SimpleState"; test.describe('Test Check Equal of Innerstates', () => { test("Test invalid input for equal checking", async()=> { diff --git a/e2e/game-model/gamesystems/productGamesystems/ProductStateGeneration.spec.ts b/e2e/game-model/gamesystems/productGamesystems/ProductStateGeneration.spec.ts index d1ae17a..9e71230 100644 --- a/e2e/game-model/gamesystems/productGamesystems/ProductStateGeneration.spec.ts +++ b/e2e/game-model/gamesystems/productGamesystems/ProductStateGeneration.spec.ts @@ -1,4 +1,17 @@ +import { BrowserContext, ElectronApplication, Page, _electron as electron } from 'playwright'; import { test, expect } from '@playwright/test'; +import * as PATH from 'path'; +import {GameModel} from "../../../src/app/game-model/GameModel"; +import {Gamesystem} from "../../src/app/game-model/gamesystems/Gamesystem"; +import {ScriptAccount} from "../../../src/app/game-model/scriptAccounts/ScriptAccount"; +import {ModelComponentType} from "../../../src/app/game-model/ModelComponentType"; +import {SimpleGamesystem} from "../../../src/app/game-model/gamesystems/SimpleGamesystem"; +import exp = require("node:constants"); +import {end} from "electron-debug"; +import {GamesystemTrainer} from "./GamesystemTrainer"; +import {ProductGamesystem} from "../../../src/app/game-model/gamesystems/ProductGamesystem"; +import {ProductStateTrainer} from "./ProductStateTrainer"; +import {SimpleState} from "../../../../src/app/game-model/gamesystems/states/SimpleState"; import {ProductSystemGenerationTrainer} from "./ProductSystemGenerationTrainer"; test.describe('Test Create ProductStates', () => { diff --git a/e2e/game-model/gamesystems/productGamesystems/ProductStateTrainer.ts b/e2e/game-model/gamesystems/productGamesystems/ProductStateTrainer.ts index cc585f8..797ad83 100644 --- a/e2e/game-model/gamesystems/productGamesystems/ProductStateTrainer.ts +++ b/e2e/game-model/gamesystems/productGamesystems/ProductStateTrainer.ts @@ -1,7 +1,7 @@ -import {ProductGamesystem} from "../../../../src/app/project/gamemodel/gamesystems/ProductGamesystem"; -import {SimpleGamesystem} from "../../../../src/app/project/gamemodel/gamesystems/SimpleGamesystem"; -import {ProductState} from "../../../../src/app/project/gamemodel/gamesystems/states/ProductState"; -import {ProductTransition} from "../../../../src/app/project/gamemodel/gamesystems/transitions/ProductTransition"; +import {ProductGamesystem} from "../../../../src/app/game-model/gamesystems/ProductGamesystem"; +import {SimpleGamesystem} from "../../../../src/app/game-model/gamesystems/SimpleGamesystem"; +import {ProductState} from "../../../../src/app/game-model/gamesystems/states/ProductState"; +import {ProductTransition} from "../../../../src/app/game-model/gamesystems/transitions/ProductTransition"; export class ProductStateTrainer { static INNERSTATE_LETTER_1 = "A"; diff --git a/e2e/game-model/gamesystems/productGamesystems/ProductSystemGenerationTrainer.ts b/e2e/game-model/gamesystems/productGamesystems/ProductSystemGenerationTrainer.ts index f5e66c9..aa34557 100644 --- a/e2e/game-model/gamesystems/productGamesystems/ProductSystemGenerationTrainer.ts +++ b/e2e/game-model/gamesystems/productGamesystems/ProductSystemGenerationTrainer.ts @@ -1,5 +1,5 @@ -import {ProductGamesystem} from "../../../../src/app/project/gamemodel/gamesystems/ProductGamesystem"; -import {SimpleGamesystem} from "../../../../src/app/project/gamemodel/gamesystems/SimpleGamesystem"; +import {ProductGamesystem} from "../../../../src/app/game-model/gamesystems/ProductGamesystem"; +import {SimpleGamesystem} from "../../../../src/app/game-model/gamesystems/SimpleGamesystem"; export class ProductSystemGenerationTrainer { diff --git a/e2e/game-model/scriptAccounts/ScriptAccountTest.spec.ts b/e2e/game-model/scriptAccounts/ScriptAccountTest.spec.ts index 3fd9b2a..00688ac 100644 --- a/e2e/game-model/scriptAccounts/ScriptAccountTest.spec.ts +++ b/e2e/game-model/scriptAccounts/ScriptAccountTest.spec.ts @@ -1,10 +1,10 @@ import { BrowserContext, ElectronApplication, Page, _electron as electron } from 'playwright'; import { test, expect } from '@playwright/test'; import * as PATH from 'path'; -import {GameModel} from "../../../src/app/project/gamemodel/GameModel"; -import {Gamesystem} from "../../src/app/project/gamemodel/gamesystems/Gamesystem"; -import {ScriptAccount} from "../../../src/app/project/gamemodel/scriptAccounts/ScriptAccount"; -import {ModelComponentType} from "../../../src/app/project/gamemodel/ModelComponentType"; +import {GameModel} from "../../../src/app/game-model/GameModel"; +import {Gamesystem} from "../../src/app/game-model/gamesystems/Gamesystem"; +import {ScriptAccount} from "../../../src/app/game-model/scriptAccounts/ScriptAccount"; +import {ModelComponentType} from "../../../src/app/game-model/ModelComponentType"; test.describe('Test ScriptAccounts', () => {