Skip to content

Commit 066a78f

Browse files
cthacker-udelcthacker-udel
committed
Added: Tests : Player API
1 parent eed25b4 commit 066a78f

File tree

3 files changed

+169
-33
lines changed

3 files changed

+169
-33
lines changed

‎src/main/java/Client/SpotifyRestAPI.java‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,9 +1240,9 @@ public boolean transferUserPlaybackToNewDevice(SpotifyClient client) throws IOEx
12401240

12411241
playerInterface playerInterface = retrofit.create(Model.playerInterface.class);
12421242

1243-
Call<Object> call = playerInterface.transferUsersPlayback(getTokenString(client.getToken()),client.getUser().jsonifyDeviceIds());
1243+
Call<Void> call = playerInterface.transferUsersPlayback(getTokenString(client.getLogin().getAccessToken()),client.getUser().jsonifyDeviceIds());
12441244

1245-
Response<Object> response = call.execute();
1245+
Response<Void> response = call.execute();
12461246

12471247
return response.isSuccessful();
12481248

@@ -1259,7 +1259,7 @@ public basePlayerDevice getUserAvailableDevices(SpotifyClient client) throws IOE
12591259

12601260
playerInterface playerInterface = retrofit.create(Model.playerInterface.class);
12611261

1262-
Call<basePlayerDevice> call = playerInterface.getCurrentUserAvailableDevices(getTokenString(client.getToken()));
1262+
Call<basePlayerDevice> call = playerInterface.getCurrentUserAvailableDevices(getTokenString(client.getLogin().getAccessToken()));
12631263

12641264
Response<basePlayerDevice> response = call.execute();
12651265

@@ -1277,7 +1277,7 @@ public baseCurrentTrack getUserCurrentPlayingTrack(SpotifyClient client) throws
12771277

12781278
playerInterface playerInterface = retrofit.create(Model.playerInterface.class);
12791279

1280-
Call<baseCurrentTrack> call = playerInterface.getCurrentUserTrack(getTokenString(client.getToken()),client.getISOCountryCode());
1280+
Call<baseCurrentTrack> call = playerInterface.getCurrentUserTrack(getTokenString(client.getLogin().getAccessToken()),client.getISOCountryCode());
12811281

12821282
Response<baseCurrentTrack> response = call.execute();
12831283

@@ -1295,9 +1295,9 @@ public boolean startOrResumeAUsersPlayback(SpotifyClient client) throws IOExcept
12951295

12961296
playerInterface playerInterface = retrofit.create(Model.playerInterface.class);
12971297

1298-
Call<Object> call = playerInterface.startOrResumeCurrentUserPlayback(getTokenString(client.getToken()));
1298+
Call<Void> call = playerInterface.startOrResumeCurrentUserPlayback(getTokenString(client.getLogin().getAccessToken()));
12991299

1300-
Response<Object> response = call.execute();
1300+
Response<Void> response = call.execute();
13011301

13021302
return response.isSuccessful();
13031303

@@ -1314,9 +1314,9 @@ public boolean pauseUserPlayback(SpotifyClient client) throws IOException {
13141314

13151315
playerInterface playerInterface = retrofit.create(Model.playerInterface.class);
13161316

1317-
Call<Object> call = playerInterface.pauseUsersPlayback(getTokenString(client.getToken()));
1317+
Call<Void> call = playerInterface.pauseUsersPlayback(getTokenString(client.getLogin().getAccessToken()));
13181318

1319-
Response<Object> response = call.execute();
1319+
Response<Void> response = call.execute();
13201320

13211321
return response.isSuccessful();
13221322

@@ -1334,9 +1334,9 @@ public boolean skipUserPlaybackToNextTrack(SpotifyClient client) throws IOExcept
13341334

13351335
playerInterface playerInterface = retrofit.create(Model.playerInterface.class);
13361336

1337-
Call<Object> call = playerInterface.skipUserPlaybackToNextTrack(getTokenString(client.getToken()));
1337+
Call<Void> call = playerInterface.skipUserPlaybackToNextTrack(getTokenString(client.getLogin().getAccessToken()));
13381338

1339-
Response<Object> response = call.execute();
1339+
Response<Void> response = call.execute();
13401340

13411341
return response.isSuccessful();
13421342

@@ -1353,9 +1353,9 @@ public boolean skipUserPlaybackToPreviousTrack(SpotifyClient client) throws IOEx
13531353

13541354
playerInterface playerInterface = retrofit.create(Model.playerInterface.class);
13551355

1356-
Call<Object> call = playerInterface.skipUserPlaybackToPreviousTrack(getTokenString(client.getToken()));
1356+
Call<Void> call = playerInterface.skipUserPlaybackToPreviousTrack(getTokenString(client.getLogin().getAccessToken()));
13571357

1358-
Response<Object> response = call.execute();
1358+
Response<Void> response = call.execute();
13591359

13601360
return response.isSuccessful();
13611361

@@ -1372,9 +1372,9 @@ public boolean seekToPositionInCurrentUserTrack(SpotifyClient client) throws IOE
13721372

13731373
playerInterface playerInterface = retrofit.create(Model.playerInterface.class);
13741374

1375-
Call<Object> call = playerInterface.seekToCurrentUserTrackPosition(getTokenString(client.getToken()),client.getPlayer().getSeekPosition());
1375+
Call<Void> call = playerInterface.seekToCurrentUserTrackPosition(getTokenString(client.getLogin().getAccessToken()),client.getPlayer().getSeekPosition());
13761376

1377-
Response<Object> response = call.execute();
1377+
Response<Void> response = call.execute();
13781378

13791379
return response.isSuccessful();
13801380

@@ -1391,9 +1391,9 @@ public boolean setRepeatModeOnUserPlayback(SpotifyClient client) throws IOExcept
13911391

13921392
playerInterface playerInterface = retrofit.create(Model.playerInterface.class);
13931393

1394-
Call<Object> call = playerInterface.setRepeatModeOnUserPlayback(getTokenString(client.getToken()),client.getPlayer().getRepeatState());
1394+
Call<Void> call = playerInterface.setRepeatModeOnUserPlayback(getTokenString(client.getLogin().getAccessToken()),client.getPlayer().getRepeatState());
13951395

1396-
Response<Object> response = call.execute();
1396+
Response<Void> response = call.execute();
13971397

13981398
return response.isSuccessful();
13991399

@@ -1410,9 +1410,9 @@ public boolean setVolumeUserPlayback(SpotifyClient client) throws IOException {
14101410

14111411
playerInterface playerInterface = retrofit.create(Model.playerInterface.class);
14121412

1413-
Call<Object> call = playerInterface.setVolumeForUserPlayback(getTokenString(client.getToken()),client.getPlayer().getVolume_percent());
1413+
Call<Void> call = playerInterface.setVolumeForUserPlayback(getTokenString(client.getLogin().getAccessToken()),client.getPlayer().getVolume_percent());
14141414

1415-
Response<Object> response = call.execute();
1415+
Response<Void> response = call.execute();
14161416

14171417
return response.isSuccessful();
14181418

@@ -1429,9 +1429,9 @@ public boolean toggleShuffleForUserPlayback(SpotifyClient client) throws IOExcep
14291429

14301430
playerInterface playerInterface = retrofit.create(Model.playerInterface.class);
14311431

1432-
Call<Object> call = playerInterface.toggleShuffleForUserPlayback(getTokenString(client.getToken()),client.getPlayer().getShuffleState());
1432+
Call<Void> call = playerInterface.toggleShuffleForUserPlayback(getTokenString(client.getLogin().getAccessToken()),client.getPlayer().getShuffleState());
14331433

1434-
Response<Object> response = call.execute();
1434+
Response<Void> response = call.execute();
14351435

14361436
return response.isSuccessful();
14371437

@@ -1448,7 +1448,7 @@ public Controller.PlayerController.CurrentUserRecentTrack.BaseTrack getCurrUserR
14481448

14491449
playerInterface playerInterface = retrofit.create(Model.playerInterface.class);
14501450

1451-
Call<Controller.PlayerController.CurrentUserRecentTrack.BaseTrack> call = playerInterface.getCurrentUserRecentlyPlayedTracks(getTokenString(client.getToken()));
1451+
Call<Controller.PlayerController.CurrentUserRecentTrack.BaseTrack> call = playerInterface.getCurrentUserRecentlyPlayedTracks(getTokenString(client.getLogin().getAccessToken()));
14521452

14531453
Response<Controller.PlayerController.CurrentUserRecentTrack.BaseTrack> response = call.execute();
14541454

@@ -1466,9 +1466,9 @@ public boolean addItemtoQueue(SpotifyClient client) throws IOException {
14661466

14671467
playerInterface playerInterface = retrofit.create(Model.playerInterface.class);
14681468

1469-
Call<Object> call = playerInterface.addItemToUserQueue(getTokenString(client.getToken()),client.getPlayer().getUri());
1469+
Call<Void> call = playerInterface.addItemToUserQueue(getTokenString(client.getLogin().getAccessToken()),client.getPlayer().getUri());
14701470

1471-
Response<Object> response = call.execute();
1471+
Response<Void> response = call.execute();
14721472

14731473
return response.isSuccessful();
14741474

‎src/main/java/Model/playerInterface.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public interface playerInterface {
1515
Call<baseUserPlayback> getCurrentUserPlayback(@Header("Authorization") String auth);
1616

1717
@PUT("https://api.spotify.com/v1/me/player")
18-
Call<Object> transferUsersPlayback(@Header("Authorization") String auth, @Body String deviceIds);
18+
Call<Void> transferUsersPlayback(@Header("Authorization") String auth, @Body String deviceIds);
1919

2020
@GET("https://api.spotify.com/v1/me/player/devices")
2121
Call<basePlayerDevice> getCurrentUserAvailableDevices(@Header("Authorization") String auth);
@@ -24,33 +24,33 @@ public interface playerInterface {
2424
Call<baseCurrentTrack> getCurrentUserTrack(@Header("Authorization") String auth, @Query("market") String isoCountryCode);
2525

2626
@PUT("https://api.spotify.com/v1/me/player/play")
27-
Call<Object> startOrResumeCurrentUserPlayback(@Header("Authorization") String auth);
27+
Call<Void> startOrResumeCurrentUserPlayback(@Header("Authorization") String auth);
2828

2929
@PUT("https://api.spotify.com/v1/me/player/pause")
30-
Call<Object> pauseUsersPlayback(@Header("Authorization") String auth);
30+
Call<Void> pauseUsersPlayback(@Header("Authorization") String auth);
3131

3232
@POST("https://api.spotify.com/v1/me/player/next")
33-
Call<Object> skipUserPlaybackToNextTrack(@Header("Authorization") String auth);
33+
Call<Void> skipUserPlaybackToNextTrack(@Header("Authorization") String auth);
3434

3535
@POST("https://api.spotify.com/v1/me/player/previous")
36-
Call<Object> skipUserPlaybackToPreviousTrack(@Header("Authorization") String auth);
36+
Call<Void> skipUserPlaybackToPreviousTrack(@Header("Authorization") String auth);
3737

3838
@PUT("https://api.spotify.com/v1/me/player/seek")
39-
Call<Object> seekToCurrentUserTrackPosition(@Header("Authorization") String auth, @Query("position_ms") Integer position);
39+
Call<Void> seekToCurrentUserTrackPosition(@Header("Authorization") String auth, @Query("position_ms") Integer position);
4040

4141
@PUT("https://api.spotify.com/v1/me/player/repeat")
42-
Call<Object> setRepeatModeOnUserPlayback(@Header("Authorization") String auth, @Query("state") String state);
42+
Call<Void> setRepeatModeOnUserPlayback(@Header("Authorization") String auth, @Query("state") String state);
4343

4444
@PUT("https://api.spotify.com/v1/me/player/volume")
45-
Call<Object> setVolumeForUserPlayback(@Header("Authorization") String auth, @Query("volume_percent") Integer volume_percent);
45+
Call<Void> setVolumeForUserPlayback(@Header("Authorization") String auth, @Query("volume_percent") Integer volume_percent);
4646

4747
@PUT("https://api.spotify.com/v1/me/player/shuffle")
48-
Call<Object> toggleShuffleForUserPlayback(@Header("Authorization") String auth, @Query("state") String shuffleState);
48+
Call<Void> toggleShuffleForUserPlayback(@Header("Authorization") String auth, @Query("state") String shuffleState);
4949

5050
@GET("https://api.spotify.com/v1/me/player/recently-played")
5151
Call<BaseTrack> getCurrentUserRecentlyPlayedTracks(@Header("Authorization") String auth);
5252

5353
@POST("https://api.spotify.com/v1/me/playr/queue")
54-
Call<Object> addItemToUserQueue(@Header("Authorization") String auth, @Query("uri") String uri);
54+
Call<Void> addItemToUserQueue(@Header("Authorization") String auth, @Query("uri") String uri);
5555

5656
}

‎src/test/java/getRequests/PlayerTest.java‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
package getRequests;
2+
3+
import Client.SpotifyClient;
4+
import Client.SpotifyLogin;
5+
import org.junit.jupiter.api.Test;
6+
7+
import java.io.IOException;
8+
9+
import static org.junit.jupiter.api.Assertions.assertNotNull;
10+
import static org.junit.jupiter.api.Assertions.assertTrue;
11+
12+
public class PlayerTest {
13+
14+
static SpotifyClient client;
15+
16+
static {
17+
try {
18+
client = new SpotifyClient("d56c8c3f79a1459bba2c286cfa7aa15b", "9dcd475a773d467990dd75eede0af55f");
19+
20+
SpotifyLogin login = client.getLogin();
21+
login.setEmailOrUsername("exampleEmail");
22+
login.setPassword("examplePasword");
23+
login.setRedirectUri("exampleRedirectURI");
24+
login.addScope("user-modify-playback-state");
25+
client.requestAuthCodeFlowCode(client);
26+
client.generateAccessTokenAndRefreshToken(client);
27+
28+
29+
} catch (IOException | InterruptedException e) {
30+
e.printStackTrace();
31+
}
32+
}
33+
34+
@Test
35+
void getInfoCurrUserPlayback() throws IOException {
36+
37+
assertNotNull(client.getInfoCurrentUserPlayback(client));
38+
39+
}
40+
41+
@Test
42+
void testTransferUserPlayback() throws IOException{
43+
44+
assertTrue(client.transferUserPlaybackToNewDevice(client));
45+
46+
}
47+
48+
@Test
49+
void testGetUserAvailableDevices() throws IOException{
50+
51+
assertNotNull(client.getUserAvailableDevices(client));
52+
53+
}
54+
55+
@Test
56+
void getCurrUserPlayingTrack() throws IOException{
57+
58+
assertNotNull(client.getUserCurrentPlayingTrack(client));
59+
60+
}
61+
62+
@Test
63+
void startResumeUserPlayback() throws IOException{
64+
65+
assertTrue(client.startOrResumeAUsersPlayback(client));
66+
67+
}
68+
69+
@Test
70+
void testPauseUserPlayback() throws IOException{
71+
72+
assertTrue(client.pauseUserPlayback(client));
73+
74+
}
75+
76+
@Test
77+
void testSkipUserPlaybackNextTrack() throws IOException{
78+
79+
80+
assertTrue(client.skipUserPlaybackToNextTrack(client));
81+
82+
}
83+
84+
@Test
85+
void testSkipUserPlaybackToPreviousTrack() throws IOException{
86+
87+
assertTrue(client.skipUserPlaybackToPreviousTrack(client));
88+
89+
}
90+
91+
@Test
92+
void testSeekToPositionInCurrPlayingTrack() throws IOException{
93+
94+
assertTrue(client.seekToPositionInCurrentUserTrack(client));
95+
96+
}
97+
98+
@Test
99+
void testSetRepeatModeCurrUserPlayback() throws IOException{
100+
101+
assertTrue(client.setRepeatModeOnUserPlayback(client));
102+
103+
}
104+
105+
@Test
106+
void testSetVolumeCurrUserPlayback() throws IOException{
107+
108+
assertTrue(client.setVolumeUserPlayback(client));
109+
110+
}
111+
112+
@Test
113+
void testToggleShuffleCurrUserPlayback() throws IOException{
114+
115+
assertTrue(client.toggleShuffleForUserPlayback(client));
116+
117+
}
118+
119+
@Test
120+
void testGetCurrUserRecentPlayedTracks() throws IOException{
121+
122+
assertNotNull(client.getCurrUserRecentPlayedTracks(client));
123+
124+
}
125+
126+
@Test
127+
void testAddItemToQueue() throws IOException{
128+
129+
assertTrue(client.addItemtoQueue(client));
130+
131+
}
132+
133+
134+
135+
136+
}

0 commit comments

Comments
 (0)