fixed JUnit test failures

UQcsse3200 · Oct 14, 2023 · bbc58df · bbc58df
1 parent 5b7dd16
commit bbc58df
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/source/core/src/main/com/csse3200/game/entities/factories/PauseMenuFactory.java b/source/core/src/main/com/csse3200/game/entities/factories/PauseMenuFactory.java
@@ -22,15 +22,10 @@ public static Entity createPauseMenu(GdxGame game) {
 
             Entity pauseMenu = new Entity()
                     .addComponent(new PauseMenuTimeStopComponent())
-<<<<<<< Updated upstream
                     .addComponent(new PauseMenuContinueButton())
                     .addComponent(new PauseMenuSettingsButton(game))
                     .addComponent(new PauseMenuPlanetSelectButton(game))
-                    .addComponent(new PauseMenuMainMenuButton(game))
-                    .addComponent(new TextureRenderComponent("images/ui/Sprites/UI_Glass_Toggle_Bar_01a.png"));
-=======
-                    .addComponent(new PauseMenuButtonComponent(game));
->>>>>>> Stashed changes
+                    .addComponent(new PauseMenuMainMenuButton(game));
             pauseMenu.setScale(8, 8);
             pauseMenu.setPosition(6.3f, 2f);
             ServiceLocator.getEntityService().register(pauseMenu);

diff --git a/source/core/src/test/com/csse3200/game/entities/factories/PauseMenuFactoryTest.java b/source/core/src/test/com/csse3200/game/entities/factories/PauseMenuFactoryTest.java
@@ -52,7 +52,6 @@ void entityHasRequiredComponents() {
         assertNotNull(entity.getComponent(PauseMenuSettingsButton.class));
         assertNotNull(entity.getComponent(PauseMenuPlanetSelectButton.class));
         assertNotNull(entity.getComponent(PauseMenuMainMenuButton.class));
-        assertNotNull(entity.getComponent(TextureRenderComponent.class));
     }
 
     @Test