diff --git a/src/main/resources/story-files/eilo2.paths b/src/main/resources/story-files/eilo2.paths new file mode 100644 index 0000000000000000000000000000000000000000..dca84151bc4315a77f2cdf0464ec77379a8bf927 --- /dev/null +++ b/src/main/resources/story-files/eilo2.paths @@ -0,0 +1,10 @@ +eilor + +::eeee +eeeee +[schni](Eilor ) + +::Eilor +eilor aaa +[eee](eeee) + diff --git a/src/test/java/edu/ntnu/idatt2001/group_30/paths/model/goals/GoalFactoryTest.java b/src/test/java/edu/ntnu/idatt2001/group_30/paths/model/goals/GoalFactoryTest.java index 04b20f582a43f3bc2bcb498792566a6db1589d5c..b46ce4037943d8fce3dd402673df3c3d02934ab7 100644 --- a/src/test/java/edu/ntnu/idatt2001/group_30/paths/model/goals/GoalFactoryTest.java +++ b/src/test/java/edu/ntnu/idatt2001/group_30/paths/model/goals/GoalFactoryTest.java @@ -49,4 +49,14 @@ class GoalFactoryTest { Arguments.of(GoalType.SCORE_GOAL, "", ScoreGoal.class) ); } + + @Test + void getGoal_withValidInventoryGoalValue_returnsInventoryGoalObject() { + GoalType goalType = GoalType.INVENTORY_GOAL; + Object goalValue = "item"; + + Goal<?> goal = GoalFactory.getGoal(goalType, goalValue); + + assertEquals(InventoryGoal.class, goal.getClass()); + } } diff --git a/src/test/java/edu/ntnu/idatt2001/group_30/paths/model/goals/InventoryGoalTest.java b/src/test/java/edu/ntnu/idatt2001/group_30/paths/model/goals/InventoryGoalTest.java index 0fb16f45b04486c4eeeefbc3939ec4c227336eee..a97a096a9d0068297c9dbada004bea3880b0640b 100644 --- a/src/test/java/edu/ntnu/idatt2001/group_30/paths/model/goals/InventoryGoalTest.java +++ b/src/test/java/edu/ntnu/idatt2001/group_30/paths/model/goals/InventoryGoalTest.java @@ -63,5 +63,13 @@ class InventoryGoalTest { assertThrows(NullPointerException.class, () -> inventoryGoal.isFulfilled(player)); } + + @Test + public void can_concatenate_two_InventoryGoals() { + InventoryGoal inventoryGoal1 = new InventoryGoal(getMandatoryInventory()); + InventoryGoal inventoryGoal2 = new InventoryGoal(getMandatoryInventory()); + inventoryGoal1.concatGoals(inventoryGoal2); + assertEquals(4, inventoryGoal1.getGoalValue().size()); + } } }