ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes in server.

Browse Source
This commit is contained in:
marcins78@gmail.com
2013-01-02 21:17:35 +00:00
parent eaefa96c42
commit 2848fccd32
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationPairing.java
View File

@@ -16,7 +16,9 @@ public class SingleEliminationPairing implements PairingMechanism {
}
@Override
public boolean pairPlayers(int round, Set<String> players, Set<String> droppedPlayers, Map<String, Integer> playerByes, List<PlayerStanding> currentStandings, Map<String, String> pairingResults, Set<String> byeResults) {
public boolean pairPlayers(int round, Set<String> players, Set<String> droppedPlayers, Map<String, Integer> playerByes, List<PlayerStanding> currentStandings,
Map<String, Set<String>> previouslyPaired,
Map<String, String> pairingResults, Set<String> byeResults) {
if (isFinished(round, players, droppedPlayers))
return true;

3
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/DefaultTournamentTest.java
View File

@@ -52,6 +52,7 @@ public class DefaultTournamentTest {
Mockito.when(pairingMechanism.pairPlayers(Mockito.eq(1), Mockito.eq(allPlayers), Mockito.eq(Collections.<String>emptySet()),
Mockito.eq(Collections.<String, Integer>emptyMap()), Mockito.<List<PlayerStanding>>any(),
Mockito.any(Map.class),
Mockito.eq(Collections.<String, String>emptyMap()), Mockito.eq(Collections.<String>emptySet()))).then(
new Answer<Boolean>() {
@Override
@@ -67,6 +68,7 @@ public class DefaultTournamentTest {
});
Mockito.when(pairingMechanism.pairPlayers(Mockito.eq(2), Mockito.eq(allPlayers), Mockito.eq(droppedAfterRoundOne),
Mockito.eq(Collections.<String, Integer>emptyMap()), Mockito.<List<PlayerStanding>>any(),
Mockito.any(Map.class),
Mockito.eq(Collections.<String, String>emptyMap()), Mockito.eq(Collections.<String>emptySet()))).then(
new Answer<Boolean>() {
@Override
@@ -80,6 +82,7 @@ public class DefaultTournamentTest {
});
Mockito.when(pairingMechanism.pairPlayers(Mockito.eq(3), Mockito.eq(allPlayers), Mockito.eq(droppedAfterRoundTwo),
Mockito.eq(Collections.<String, Integer>emptyMap()), Mockito.<List<PlayerStanding>>any(),
Mockito.any(Map.class),
Mockito.eq(Collections.<String, String>emptyMap()), Mockito.eq(Collections.<String>emptySet()))).then(
new Answer<Boolean>() {
@Override

8
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/SingleEliminationPairingTest.java
View File

@@ -34,7 +34,7 @@ public class SingleEliminationPairingTest {
Map<String, String> pairingResults = new HashMap<String, String>();
Set<String> byeResults = new HashSet<String>();
assertFalse(_pairing.pairPlayers(1, allPlayers, Collections.<String>emptySet(), Collections.<String, Integer>emptyMap(), null, pairingResults, byeResults));
assertFalse(_pairing.pairPlayers(1, allPlayers, Collections.<String>emptySet(), Collections.<String, Integer>emptyMap(), null, null, pairingResults, byeResults));
assertEquals(0, byeResults.size());
assertEquals(2, pairingResults.size());
@@ -55,7 +55,7 @@ public class SingleEliminationPairingTest {
Map<String, String> pairingResults = new HashMap<String, String>();
Set<String> byeResults = new HashSet<String>();
assertFalse(_pairing.pairPlayers(1, allPlayers, Collections.<String>emptySet(), Collections.<String, Integer>emptyMap(), null, pairingResults, byeResults));
assertFalse(_pairing.pairPlayers(1, allPlayers, Collections.<String>emptySet(), Collections.<String, Integer>emptyMap(), null, null, pairingResults, byeResults));
assertEquals(1, byeResults.size());
assertEquals(1, pairingResults.size());
@@ -82,7 +82,7 @@ public class SingleEliminationPairingTest {
playerByes.put("p2", 2);
playerByes.put("p3", 3);
assertFalse(_pairing.pairPlayers(1, allPlayers, Collections.<String>emptySet(), playerByes, null, pairingResults, byeResults));
assertFalse(_pairing.pairPlayers(1, allPlayers, Collections.<String>emptySet(), playerByes, null, null, pairingResults, byeResults));
assertEquals(1, byeResults.size());
assertTrue(byeResults.contains("p1"));
@@ -107,7 +107,7 @@ public class SingleEliminationPairingTest {
Map<String, String> pairingResults = new HashMap<String, String>();
Set<String> byeResults = new HashSet<String>();
assertFalse(_pairing.pairPlayers(1, allPlayers, droppedPlayers, Collections.<String, Integer>emptyMap(), null, pairingResults, byeResults));
assertFalse(_pairing.pairPlayers(1, allPlayers, droppedPlayers, Collections.<String, Integer>emptyMap(), null, null, pairingResults, byeResults));
assertEquals(1, byeResults.size());
assertEquals(1, pairingResults.size());

2
gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/AbstractResource.java
View File

@@ -70,7 +70,7 @@ public abstract class AbstractResource {
if (resourceOwner == null)
throw new WebApplicationException(Response.Status.UNAUTHORIZED);
if (resourceOwner.getType().contains("a") && participantId != null && !participantId.equals("null")) {
if (resourceOwner.getType().contains("a") && participantId != null && !participantId.equals("null") && !participantId.equals("")) {
resourceOwner = _playerDao.getPlayer(participantId);
if (resourceOwner == null)
throw new WebApplicationException(Response.Status.UNAUTHORIZED);