From f5a51bd498dbe0df4df266ab23fc553c4d77d627 Mon Sep 17 00:00:00 2001 From: shravya132 Date: Thu, 17 Oct 2024 12:36:00 +1000 Subject: [PATCH 1/2] Fixed issue when images didn't load in Backstory Cutscenes. --- .../game/components/cutscenes/BackstoryCutscene.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/core/src/main/com/csse3200/game/components/cutscenes/BackstoryCutscene.java b/source/core/src/main/com/csse3200/game/components/cutscenes/BackstoryCutscene.java index 5b6f84bd..fde88cf5 100644 --- a/source/core/src/main/com/csse3200/game/components/cutscenes/BackstoryCutscene.java +++ b/source/core/src/main/com/csse3200/game/components/cutscenes/BackstoryCutscene.java @@ -79,12 +79,12 @@ protected void setupScenes() { scenes.add(scene2); - Scene scene3 = new Scene(foodCriticBackground); + Scene scene3 = new Scene("images/Cutscenes/Food_Critic_Background.png"); scene3.setSceneText(scene3Text); scene3.setDuration(3.0f); scenes.add(scene3); - Scene scene4 = new Scene(foodCriticBackground); + Scene scene4 = new Scene("images/Cutscenes/Food_Critic_Background.png"); scene4.setSceneText(scene4Text); scene4.setDuration(3.0f); scenes.add(scene4); @@ -141,7 +141,7 @@ protected void loadAssets() { textures = new String[] { "images/Cutscenes/Brooklyn_Bistro_Background.png", "images/Cutscenes/Kitchen_Background.png", - foodCriticBackground, + "images/Cutscenes/Food_Critic_Background.png", "images/Cutscenes/Animals_in_Kitchen_Background.png", "images/Cutscenes/Farm_Background.png", "images/Cutscenes/graveyard_mafia.png", From f1035174c6b622801557f5ae7bca574f1a7a533d Mon Sep 17 00:00:00 2001 From: shravya132 Date: Thu, 17 Oct 2024 12:52:00 +1000 Subject: [PATCH 2/2] Fixed failing tests and deleted commented out test file. --- .../cutscenes/BackstoryCutsceneTest.java | 4 +- .../tutorial/TutorialScreenDisplayTest.java | 88 ------------------- 2 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 source/core/src/test/com/csse3200/game/components/tutorial/TutorialScreenDisplayTest.java diff --git a/source/core/src/test/com/csse3200/game/components/cutscenes/BackstoryCutsceneTest.java b/source/core/src/test/com/csse3200/game/components/cutscenes/BackstoryCutsceneTest.java index 72e1ac92..3cbef81e 100644 --- a/source/core/src/test/com/csse3200/game/components/cutscenes/BackstoryCutsceneTest.java +++ b/source/core/src/test/com/csse3200/game/components/cutscenes/BackstoryCutsceneTest.java @@ -88,7 +88,7 @@ public void testLoadAssets() { verify(resourceService, times(1)).loadTextures(new String[]{ "images/Cutscenes/Brooklyn_Bistro_Background.png", "images/Cutscenes/Kitchen_Background.png", - null, + "images/Cutscenes/Food_Critic_Background.png", "images/Cutscenes/Animals_in_Kitchen_Background.png", "images/Cutscenes/Farm_Background.png", "images/Cutscenes/graveyard_mafia.png", @@ -177,7 +177,7 @@ public void testDisposeUnloadsAssets() { verify(resourceService, times(1)).unloadAssets(new String[]{ "images/Cutscenes/Brooklyn_Bistro_Background.png", "images/Cutscenes/Kitchen_Background.png", - null, + "images/Cutscenes/Food_Critic_Background.png", "images/Cutscenes/Animals_in_Kitchen_Background.png", "images/Cutscenes/Farm_Background.png", "images/Cutscenes/graveyard_mafia.png", diff --git a/source/core/src/test/com/csse3200/game/components/tutorial/TutorialScreenDisplayTest.java b/source/core/src/test/com/csse3200/game/components/tutorial/TutorialScreenDisplayTest.java deleted file mode 100644 index 39caac0b..00000000 --- a/source/core/src/test/com/csse3200/game/components/tutorial/TutorialScreenDisplayTest.java +++ /dev/null @@ -1,88 +0,0 @@ -//package com.csse3200.game.components.tutorial; -// -//import com.badlogic.gdx.Gdx; -//import com.badlogic.gdx.Input; -//import com.badlogic.gdx.scenes.scene2d.Stage; -//import com.csse3200.game.GdxGame; -//import com.csse3200.game.components.player.PlayerActions; -//import com.csse3200.game.entities.Entity; -//import com.csse3200.game.extensions.GameExtension; -//import com.csse3200.game.rendering.RenderService; -//import com.csse3200.game.services.LevelService; -//import com.csse3200.game.services.PlayerService; -//import com.csse3200.game.services.ServiceLocator; -//import org.junit.jupiter.api.BeforeEach; -//import org.junit.jupiter.api.Test; -//import org.junit.jupiter.api.extension.ExtendWith; -// -//import static org.mockito.Mockito.*; -//import static org.junit.jupiter.api.Assertions.*; -// -//@ExtendWith(GameExtension.class) -//public class TutorialScreenDisplayTest { -// -// private TutorialScreenDisplay tutorialScreenDisplay; -// private GdxGame mockGame; -// private Stage mockStage; -// private LevelService mockLevelService; -// -// @BeforeEach -// public void setUp() { -// mockGame = mock(GdxGame.class); -// mockStage = mock(Stage.class); -// tutorialScreenDisplay = new TutorialScreenDisplay(mockGame); -// tutorialScreenDisplay.setStage(mockStage); -// -// // Mock services and entities -// ServiceLocator.registerRenderService(mock(RenderService.class)); // Ensure RenderService is registered -// ServiceLocator.registerPlayerService(mock(PlayerService.class)); -// -// mockLevelService = mock(LevelService.class); -// ServiceLocator.registerLevelService(mockLevelService); -// -// Gdx.input = mock(Input.class); -// } -// -// @Test -// public void testAdvanceTutorialStep_ValidSteps() { -// tutorialScreenDisplay.advanceTutorialStep(); -// assertEquals(1, tutorialScreenDisplay.getTutorialStep()); -// -// tutorialScreenDisplay.advanceTutorialStep(); -// assertEquals(2, tutorialScreenDisplay.getTutorialStep()); -// -// tutorialScreenDisplay.advanceTutorialStep(); -// assertEquals(3, tutorialScreenDisplay.getTutorialStep()); -// -// tutorialScreenDisplay.advanceTutorialStep(); -// assertEquals(4, tutorialScreenDisplay.getTutorialStep()); -// } -// -// @Test -// public void testAdvanceTutorialStep_InvalidStep() { -// tutorialScreenDisplay.setTutorialStep(5); -// tutorialScreenDisplay.advanceTutorialStep(); -// assertEquals(5, tutorialScreenDisplay.getTutorialStep()); -// } -// -//// @Test -//// public void testOnCreateOrderPressed() { -//// tutorialScreenDisplay.onCreateOrderPressed(); -//// assertTrue(tutorialScreenDisplay.isCreateOrderPressed()); -//// } -//// -// -// @Test -// public void testCompleteTutorial() { -// tutorialScreenDisplay.setTutorialStep(4); -// when(Gdx.input.isKeyJustPressed(Input.Keys.ENTER)).thenReturn(true); -// tutorialScreenDisplay.update(); -// verify(mockGame).setScreen(GdxGame.ScreenType.MAIN_GAME); -// } -// -// @Test -// public void testDispose() { -// tutorialScreenDisplay.dispose(); -// assertFalse(tutorialScreenDisplay.isCreateOrderPressed()); -// } -//} \ No newline at end of file