Merge branch 'main' of https://github.com/ProjektAdLer/2D_3D_AdLer

ProjektAdLer · Feb 12, 2025 · 6c8d8f5 · 6c8d8f5
2 parents 192ea3f + 4d7b2df
commit 6c8d8f5
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 3 deletions.
diff --git a/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_Export.glb b/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_Export.glb
diff --git a/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_angry.png b/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_angry.png
diff --git a/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_disappointed.png b/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_disappointed.png
diff --git a/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_happy.png b/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_happy.png
diff --git a/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_preview.png b/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_preview.png
diff --git a/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_shocked.png b/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_shocked.png
diff --git a/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_thumbsup.png b/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_thumbsup.png
diff --git a/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_tired.png b/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_tired.png
diff --git a/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_welcome.png b/src/Assets/misc/quizBackgrounds/a_npc_bully/a_npc_bully_welcome.png
diff --git a/...AvatarEditor/AvatarEditorPreview/AvatarEditorPreviewModel/AvatarEditorPreviewModelView.ts b/...AvatarEditor/AvatarEditorPreview/AvatarEditorPreviewModel/AvatarEditorPreviewModelView.ts
@@ -47,9 +47,7 @@ export default class AvatarEditorPreviewModelView {
     this.scenePresenter = CoreDIContainer.get<ScenePresenterFactory>(
       SCENE_TYPES.ScenePresenterFactory,
     )(AvatarEditorPreviewSceneDefinition);
-    viewModel.avatarConfigDiff.subscribe(() => {
-      this.onAvatarConfigChanged();
-    });
+    viewModel.avatarConfigDiff.subscribe(this.onAvatarConfigChanged);
   }
   private async onAvatarConfigChanged(): Promise<void> {
     this.updateAllModels("diff");

diff --git a/...rEditor/AvatarEditorPreview/AvatarEditorPreviewModel/AvatarEditorPreviewModelView.test.ts b/...rEditor/AvatarEditorPreview/AvatarEditorPreviewModel/AvatarEditorPreviewModelView.test.ts
@@ -0,0 +1,58 @@
+import { mockDeep } from "jest-mock-extended";
+import CoreDIContainer from "../../../../../Core/DependencyInjection/CoreDIContainer";
+import SCENE_TYPES from "../../../../../Core/DependencyInjection/Scenes/SCENE_TYPES";
+import AvatarEditorPreviewModelView from "../../../../../Core/Presentation/AvatarEditor/AvatarEditorPreview/AvatarEditorPreviewModel/AvatarEditorPreviewModelView";
+import AvatarEditorPreviewModelViewModel from "../../../../../Core/Presentation/AvatarEditor/AvatarEditorPreview/AvatarEditorPreviewModel/AvatarEditorPreviewModelViewModel";
+import IScenePresenter from "../../../../../Core/Presentation/Babylon/SceneManagement/IScenePresenter";
+import { AbstractMesh, NullEngine, Scene } from "@babylonjs/core";
+
+const scenePresenterMock = mockDeep<IScenePresenter>();
+const scenePresenterFactoryMock = () => scenePresenterMock;
+function buildSystemUnderTest(): [
+  AvatarEditorPreviewModelViewModel,
+  AvatarEditorPreviewModelView,
+] {
+  const viewModel = new AvatarEditorPreviewModelViewModel();
+  const systemUnderTest = new AvatarEditorPreviewModelView(viewModel);
+  return [viewModel, systemUnderTest];
+}
+
+describe("AvatarEditorPreviewModelView", () => {
+  let systemUnderTest: AvatarEditorPreviewModelView;
+
+  beforeAll(() => {
+    CoreDIContainer.snapshot();
+    CoreDIContainer.rebind(SCENE_TYPES.ScenePresenterFactory).toConstantValue(
+      scenePresenterFactoryMock,
+    );
+  });
+  beforeEach(() => {
+    buildSystemUnderTest();
+  });
+
+  afterAll(() => {
+    CoreDIContainer.restore();
+    jest.clearAllMocks();
+  });
+
+  test("constructor injects scenePresenter", async () => {
+    scenePresenterMock.loadModel.mockResolvedValue([
+      new AbstractMesh("TestMesh", new Scene(new NullEngine())),
+    ]);
+
+    const [, systemUnderTest] = buildSystemUnderTest();
+    expect(systemUnderTest["scenePresenter"]).toBeDefined();
+  });
+
+  test("constructor subscribes to viewModel.isOpen", () => {
+    scenePresenterMock.loadModel.mockResolvedValue([
+      new AbstractMesh("TestMesh", new Scene(new NullEngine())),
+    ]);
+
+    const [viewModel, systemUnderTest] = buildSystemUnderTest();
+
+    expect(viewModel.avatarConfigDiff["subscribers"]).toStrictEqual([
+      systemUnderTest["onAvatarConfigChanged"],
+    ]);
+  });
+});