completed DecorationView tests

ProjektAdLer · Sep 19, 2024 · 9276993 · 9276993
1 parent 3e0a162
commit 9276993
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 24 deletions.
diff --git a/src/Components/Core/Presentation/Babylon/Decoration/DecorationView.ts b/src/Components/Core/Presentation/Babylon/Decoration/DecorationView.ts
@@ -29,39 +29,43 @@ export default class DecorationView {
     insideDeco: AbstractMesh[];
     outsideDeco: AbstractMesh[];
   }> {
-    const theme = LearningSpaceThemeLookup.getLearningSpaceTheme(
-      this.viewModel.theme,
-    );
     if (
-      !theme ||
       this.viewModel.learningSpaceTemplateType ===
-        LearningSpaceTemplateType.None
+      LearningSpaceTemplateType.None
     ) {
       return { insideDeco: [], outsideDeco: [] };
     }
 
     const scenePresenter = CoreDIContainer.get<ScenePresenterFactory>(
       SCENE_TYPES.ScenePresenterFactory,
     )(LearningSpaceSceneDefinition);
+    const themeConfig = LearningSpaceThemeLookup.getLearningSpaceTheme(
+      this.viewModel.theme,
+    );
 
     let insideDeco: AbstractMesh[] = [];
     if (
-      theme.insideDecorationModels[this.viewModel.learningSpaceTemplateType] !==
-      ""
+      themeConfig.insideDecorationModels[
+        this.viewModel.learningSpaceTemplateType
+      ] !== ""
     )
       insideDeco = await scenePresenter.loadModel(
-        theme.insideDecorationModels[this.viewModel.learningSpaceTemplateType],
+        themeConfig.insideDecorationModels[
+          this.viewModel.learningSpaceTemplateType
+        ],
         true,
       );
 
     let outsideDeco: AbstractMesh[] = [];
     if (
-      theme.outsideDecorationModels[
+      themeConfig.outsideDecorationModels[
         this.viewModel.learningSpaceTemplateType
       ] !== ""
     )
       outsideDeco = await scenePresenter.loadModel(
-        theme.outsideDecorationModels[this.viewModel.learningSpaceTemplateType],
+        themeConfig.outsideDecorationModels[
+          this.viewModel.learningSpaceTemplateType
+        ],
       );
 
     return { insideDeco, outsideDeco };

diff --git a/src/Components/CoreTest/Presentation/Babylon/Decoration/DecorationView.test.ts b/src/Components/CoreTest/Presentation/Babylon/Decoration/DecorationView.test.ts
@@ -73,20 +73,7 @@ describe("DecorationView", () => {
   });
 
   // ANF-ID: [ELG0025]
-  test.skip("loads no model when theme is invalid", async () => {
-    const [viewModel, systemUnderTest] = buildSystemUnderTest();
-    viewModel.theme = "invalid theme";
-    viewModel.learningSpaceTemplateType = LearningSpaceTemplateType.L;
-
-    systemUnderTest.asyncSetup();
-
-    expect(scenePresenterMock.loadModel).not.toHaveBeenCalled();
-    expect(viewModel.insideMeshes).toStrictEqual([]);
-    expect(viewModel.outsideMeshes).toStrictEqual([]);
-  });
-
-  // ANF-ID: [ELG0025]
-  test.skip("loads no model when learning space template type is None", async () => {
+  test("loads no model when learning space template type is None", async () => {
     const [viewModel, systemUnderTest] = buildSystemUnderTest();
     viewModel.theme = LearningSpaceThemeType.CampusAB;
     viewModel.learningSpaceTemplateType = LearningSpaceTemplateType.None;