MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle player id as an Integer instead of String

Browse Source
This commit is contained in:
snw35
2018-06-04 20:19:12 +01:00
parent b3f432a545
commit 6a44c5c815
21 changed files with 102 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/test/java/org/airsonic/player/dao/PlayerDaoTestCase.java
+10 -10
View File
@@ -65,25 +65,25 @@ public class PlayerDaoTestCase extends DaoTestCaseBean2 {
Player player = new Player();
playerDao.createPlayer(player);
assertEquals("Wrong ID", "1", player.getId());
assertEquals("Wrong ID", (Integer)1, player.getId());
assertEquals("Wrong number of players.", 1, playerDao.getAllPlayers().size());
playerDao.createPlayer(player);
assertEquals("Wrong ID", "2", player.getId());
assertEquals("Wrong ID", (Integer)2, player.getId());
assertEquals("Wrong number of players.", 2, playerDao.getAllPlayers().size());
playerDao.createPlayer(player);
assertEquals("Wrong ID", "3", player.getId());
assertEquals("Wrong ID", (Integer)3, player.getId());
assertEquals("Wrong number of players.", 3, playerDao.getAllPlayers().size());
playerDao.deletePlayer("3");
playerDao.deletePlayer(3);
playerDao.createPlayer(player);
assertEquals("Wrong ID", "3", player.getId());
assertEquals("Wrong ID", (Integer)3, player.getId());
assertEquals("Wrong number of players.", 3, playerDao.getAllPlayers().size());
playerDao.deletePlayer("2");
playerDao.deletePlayer(2);
playerDao.createPlayer(player);
assertEquals("Wrong ID", "4", player.getId());
assertEquals("Wrong ID", (Integer)4, player.getId());
assertEquals("Wrong number of players.", 3, playerDao.getAllPlayers().size());
}
@@ -153,10 +153,10 @@ public class PlayerDaoTestCase extends DaoTestCaseBean2 {
playerDao.createPlayer(new Player());
assertEquals("Wrong number of players.", 2, playerDao.getAllPlayers().size());
playerDao.deletePlayer("1");
playerDao.deletePlayer(1);
assertEquals("Wrong number of players.", 1, playerDao.getAllPlayers().size());
playerDao.deletePlayer("2");
playerDao.deletePlayer(2);
assertEquals("Wrong number of players.", 0, playerDao.getAllPlayers().size());
}
@@ -173,4 +173,4 @@ public class PlayerDaoTestCase extends DaoTestCaseBean2 {
assertEquals("Wrong last seen.", expected.getLastSeen(), actual.getLastSeen());
assertEquals("Wrong transcode scheme.", expected.getTranscodeScheme(), actual.getTranscodeScheme());
}
}
}
airsonic-main/src/test/java/org/airsonic/player/service/StatusServiceTestCase.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class StatusServiceTestCase extends TestCase {
super.setUp();
service = new StatusService();
player1 = new Player();
player1.setId("1");
player1.setId(1);
}
public void testSimpleAddRemove() {