Commit 9d4a535d authored by Aneta Steimarova's avatar Aneta Steimarova

#946 Update test + i-tests to be up-to-date with new trophies

parent cdee031d
......@@ -44,6 +44,7 @@ public class TrophyHelperTest {
expectedTrophies.add(GameTrophyDefinition.ROBBERY_PLAY3);
expectedTrophies.add(GameTrophyDefinition.ROBBERY_DIFF1);
expectedTrophies.add(GameTrophyDefinition.ROBBERY_DIFF2);
expectedTrophies.add(GameTrophyDefinition.ROBBERY_BONUS);
checkPossibleTrophies(expectedTrophies, TrophyHelper.getPossibleTrophiesForGame(GameDefinition.ROBBERY));
......@@ -54,6 +55,7 @@ public class TrophyHelperTest {
expectedTrophies.add(GameTrophyDefinition.PURSUIT_PLAY3);
expectedTrophies.add(GameTrophyDefinition.PURSUIT_DIFF1);
expectedTrophies.add(GameTrophyDefinition.PURSUIT_DIFF2);
expectedTrophies.add(GameTrophyDefinition.PURSUIT_BONUS);
checkPossibleTrophies(expectedTrophies, TrophyHelper.getPossibleTrophiesForGame(GameDefinition.PURSUIT));
......@@ -64,6 +66,7 @@ public class TrophyHelperTest {
expectedTrophies.add(GameTrophyDefinition.KIDNAPPING_PLAY3);
expectedTrophies.add(GameTrophyDefinition.KIDNAPPING_DIFF1);
expectedTrophies.add(GameTrophyDefinition.KIDNAPPING_DIFF2);
expectedTrophies.add(GameTrophyDefinition.KIDNAPPING_BONUS);
checkPossibleTrophies(expectedTrophies, TrophyHelper.getPossibleTrophiesForGame(GameDefinition.KIDNAPPING));
......@@ -74,6 +77,7 @@ public class TrophyHelperTest {
expectedTrophies.add(GameTrophyDefinition.NIGHT_WATCH_PLAY3);
expectedTrophies.add(GameTrophyDefinition.NIGHT_WATCH_DIFF1);
expectedTrophies.add(GameTrophyDefinition.NIGHT_WATCH_DIFF2);
expectedTrophies.add(GameTrophyDefinition.NIGHT_WATCH_BONUS);
checkPossibleTrophies(expectedTrophies, TrophyHelper.getPossibleTrophiesForGame(GameDefinition.NIGHT_WATCH));
......@@ -84,6 +88,7 @@ public class TrophyHelperTest {
expectedTrophies.add(GameTrophyDefinition.SHOOTING_RANGE_PLAY3);
expectedTrophies.add(GameTrophyDefinition.SHOOTING_RANGE_DIFF1);
expectedTrophies.add(GameTrophyDefinition.SHOOTING_RANGE_DIFF2);
expectedTrophies.add(GameTrophyDefinition.SHOOTING_RANGE_BONUS);
checkPossibleTrophies(expectedTrophies, TrophyHelper.getPossibleTrophiesForGame(GameDefinition.SHOOTING_RANGE));
......@@ -94,6 +99,7 @@ public class TrophyHelperTest {
expectedTrophies.add(GameTrophyDefinition.IN_THE_DARKNESS_PLAY3);
expectedTrophies.add(GameTrophyDefinition.IN_THE_DARKNESS_DIFF1);
expectedTrophies.add(GameTrophyDefinition.IN_THE_DARKNESS_DIFF2);
expectedTrophies.add(GameTrophyDefinition.IN_THE_DARKNESS_BONUS);
checkPossibleTrophies(expectedTrophies, TrophyHelper.getPossibleTrophiesForGame(GameDefinition.IN_THE_DARKNESS));
expectedTrophies = new ArrayList<>();
......@@ -103,6 +109,7 @@ public class TrophyHelperTest {
expectedTrophies.add(GameTrophyDefinition.RUNES_PLAY3);
expectedTrophies.add(GameTrophyDefinition.RUNES_DIFF1);
expectedTrophies.add(GameTrophyDefinition.RUNES_DIFF2);
expectedTrophies.add(GameTrophyDefinition.RUNES_BONUS);
checkPossibleTrophies(expectedTrophies, TrophyHelper.getPossibleTrophiesForGame(GameDefinition.RUNES));
......@@ -113,8 +120,31 @@ public class TrophyHelperTest {
expectedTrophies.add(GameTrophyDefinition.CRIME_SCENE_PLAY3);
expectedTrophies.add(GameTrophyDefinition.CRIME_SCENE_DIFF1);
expectedTrophies.add(GameTrophyDefinition.CRIME_SCENE_DIFF2);
expectedTrophies.add(GameTrophyDefinition.CRIME_SCENE_BONUS);
checkPossibleTrophies(expectedTrophies, TrophyHelper.getPossibleTrophiesForGame(GameDefinition.CRIME_SCENE));
expectedTrophies = new ArrayList<>();
Collections.addAll(expectedTrophies, UserTrophyDefinition.values());
expectedTrophies.add(GameTrophyDefinition.PROTOCOL_PLAY1);
expectedTrophies.add(GameTrophyDefinition.PROTOCOL_PLAY2);
expectedTrophies.add(GameTrophyDefinition.PROTOCOL_PLAY3);
expectedTrophies.add(GameTrophyDefinition.PROTOCOL_DIFF1);
expectedTrophies.add(GameTrophyDefinition.PROTOCOL_DIFF2);
expectedTrophies.add(GameTrophyDefinition.PROTOCOL_BONUS);
checkPossibleTrophies(expectedTrophies, TrophyHelper.getPossibleTrophiesForGame(GameDefinition.PROTOCOL));
expectedTrophies = new ArrayList<>();
Collections.addAll(expectedTrophies, UserTrophyDefinition.values());
expectedTrophies.add(GameTrophyDefinition.SAFE_PLAY1);
expectedTrophies.add(GameTrophyDefinition.SAFE_PLAY2);
expectedTrophies.add(GameTrophyDefinition.SAFE_PLAY3);
expectedTrophies.add(GameTrophyDefinition.SAFE_DIFF1);
expectedTrophies.add(GameTrophyDefinition.SAFE_DIFF2);
expectedTrophies.add(GameTrophyDefinition.SAFE_BONUS);
checkPossibleTrophies(expectedTrophies, TrophyHelper.getPossibleTrophiesForGame(GameDefinition.SAFE));
}
......
TestGameInTheDarknessEasyNoneStar
TestGameInTheDarknessEasyOneStar
TestGameInTheDarknessEasyTwoStars
TestGameInTheDarknessEasyThreeStars
TestGameInTheDarknessMediumNoneStar
TestGameInTheDarknessMediumOneStar
TestGameInTheDarknessMediumTwoStars
TestGameInTheDarknessMediumThreeStars
TestGameInTheDarknessHardNoneStar
TestGameInTheDarknessHardOneStar
TestGameInTheDarknessHardTwoStars
TestGameInTheDarknessHardThreeStars
TestGameInTheDarknessBonusNoneStar
TestGameInTheDarknessBonusOneStar
TestGameInTheDarknessBonusTwoStars
TestGameInTheDarknessBonusThreeStars
TestGameInTheDarknessEasyScenario
TestGameInTheDarknessMediumScenario
TestGameInTheDarknessHardScenario
TestGameInTheDarknessBonusScenario
\ No newline at end of file
TestScenarioHallOfFameRobberyTrophies
TestScenarioHallOfFamePursuitTrophies
TestScenarioHallOfFameKidnappingTrophies
TestScenarioHallOfFameNightWatchTrophies
TestScenarioHallOfFameShootingRangeTrophies
TestScenarioHallOfFameInTheDarknessTrophies
TestScenarioHallOfFameCrimeSceneTrophies
TestScenarioHallOfFameRunesTrophies
TestScenarioHallOfFameProtocolTrophies
TestScenarioHallOfFameSafeTrophies
TestScenarioHeapOfTrophies
\ No newline at end of file
......@@ -59,7 +59,7 @@ public class TestScenarioHeapOfTrophies extends AbstractTestScenario {
waitForScreen("5. Wait for screen HallOfFameScreen", HallOfFameScreen.class);
checkHeapImage(6, 0);
openAndCheckScoreTable(7, user, 0, 0, 0, 0, 0, 0, 0, 0);
openAndCheckScoreTable(7, user, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
writeToLogFile("\nADD GAME ROBBERY EASY 0 STARS ---> CHECK TABLE SCORE [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]\n");
addNewScoreAndGoToHallOfFame(8, user, GameDefinition.ROBBERY, GameDifficulty.EASY, AbstractTablexiaGame.GameResult.NO_STAR);
......@@ -69,7 +69,7 @@ public class TestScenarioHeapOfTrophies extends AbstractTestScenario {
writeToLogFile("\nADD GAME ROBBERY EASY 1 STARS ---> CHECK TABLE SCORE [1, 0, 0, 0, 0, 0, 0, 0, 0, 0]\n");
addNewScoreAndGoToHallOfFame(11, user, GameDefinition.ROBBERY, GameDifficulty.EASY, AbstractTablexiaGame.GameResult.ONE_STAR);
checkHeapImage(12, 1);
openAndCheckScoreTable(13, user, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
openAndCheckScoreTable(13, user, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0);
writeToLogFile("\nADD GAME PURSUIT MEDIUM 0 STARS ---> CHECK TABLE SCORE [1, 0, 0, 0, 0, 0, 0, 0, 0, 0]\n");
addNewScoreAndGoToHallOfFame(14, user, GameDefinition.PURSUIT, GameDifficulty.MEDIUM, AbstractTablexiaGame.GameResult.NO_STAR);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment