Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into configme-integration

This commit is contained in:
ljacqu
2016-09-03 10:31:05 +02:00
14 changed files with 88 additions and 126 deletions
@@ -153,7 +153,6 @@ public class CaptchaManagerTest {
}
private static void assertHasCount(CaptchaManager manager, String player, Integer count) {
@SuppressWarnings("unchecked")
Map<String, Integer> playerCounts = ReflectionTestUtils
.getFieldValue(CaptchaManager.class, manager, "playerCounts");
assertThat(playerCounts.get(player.toLowerCase()), equalTo(count));
@@ -244,9 +244,9 @@ public class TempbanManagerTest {
}
private static void assertHasNoEntries(TempbanManager manager, String address) {
Map<String, Map<?, ?>> playerCounts = ReflectionTestUtils
Map<String, Map<String, TimedCounter>> playerCounts = ReflectionTestUtils
.getFieldValue(TempbanManager.class, manager, "ipLoginFailureCounts");
Map map = playerCounts.get(address);
Map<String, TimedCounter> map = playerCounts.get(address);
assertThat(map == null || map.isEmpty(), equalTo(true));
}