Skip to content

Update object models, and enable all tests to be run against production #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thelinmichael merged 10 commits into from
May 18, 2014
Merged

Update object models, and enable all tests to be run against production #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f1174ee
Update search URLs
thelinmichael May 16, 2014
741a61c
Update object model
thelinmichael May 16, 2014
cbf27f2
Optionally run album tests against live instead of mock
thelinmichael May 16, 2014
7fece77
Optionally run album search test against live instead of mock
thelinmichael May 16, 2014
248e9af
Optionally run album for artist search against live instead of mock
thelinmichael May 16, 2014
ff399e9
Bugfix for releasedates and make some tests for multigetting albums a…
thelinmichael May 16, 2014
b5555a4
Optional to run multiget albums against live instead of mock
thelinmichael May 16, 2014
3e0fa95
Can run artistrequests tests against live instead of mock
thelinmichael May 16, 2014
2239f5e
Can run artist multiget request tests against live instead of mock
thelinmichael May 16, 2014
24b8f5f
Can run all tests against production instead of mock
thelinmichael May 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update search URLs
  • Loading branch information
@thelinmichael
thelinmichael committed May 16, 2014
commit f1174ee3cbc370fc33a15d3a3cb13d000cc5e37b
1 change: 0 additions & 1 deletion src/main/java/se/michaelthelin/spotify/Api.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package se.michaelthelin.spotify;

import com.google.protobuf.RepeatedFieldBuilder;
import se.michaelthelin.spotify.UtilProtos.Url.Scheme;
import se.michaelthelin.spotify.methods.*;

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/se/michaelthelin/spotify/methods/AlbumSearchRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ public static final class Builder extends AbstractRequest.Builder<Builder> {

public Builder query(String query) {
assert (query != null);
path("/v1/albums/search");
path("/v1/search");
String massagedQuery = query.replace(" ", "+");
parameter("type","album");
return parameter("q", massagedQuery);
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/se/michaelthelin/spotify/methods/ArtistSearchRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ public static final class Builder extends AbstractRequest.Builder<Builder> {

public Builder query(String query) {
assert (query != null);
path("/v1/artists/search");
path("/v1/search");
String massagedQuery = query.replace(" ", "+");
parameter("type","artist");
return parameter("q", massagedQuery);
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/se/michaelthelin/spotify/methods/TrackSearchRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ public static final class Builder extends AbstractRequest.Builder<Builder> {

public Builder query(String query) {
assert (query != null);
path("/v1/tracks/search");
path("/v1/search");
String massagedQuery = query.replace(" ", "+");
parameter("type","track");
return parameter("q", massagedQuery);
}

Expand Down
43 changes: 36 additions & 7 deletions src/test/java/se/michaelthelin/spotify/ApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,29 @@ public void shouldCreateAUrlForArtistsAlbum() {
}

@Test
public void shouldHaveAlbumTypeParametersInArtistsAlbumUrl() {
public void shouldHaveMultipleAlbumTypeParametersInArtistsAlbumUrl() {
Api api = Api.DEFAULT_API;
Request request = api.getAlbumsForArtist("4AK6F7OLvEQ5QYCBNiQWHq").types(AlbumType.ALBUM, AlbumType.SINGLE).build();
assertEquals("https://api.spotify.com:443/v1/artists/4AK6F7OLvEQ5QYCBNiQWHq/albums", request.toString());
assertHasParameter(request.toUrl(), "album_type", "ALBUM,SINGLE");
}

@Test
public void shouldHaveSingleAlbumTypeParametersInArtistsAlbumUrl() {
Api api = Api.DEFAULT_API;
Request request = api.getAlbumsForArtist("4AK6F7OLvEQ5QYCBNiQWHq").types(AlbumType.SINGLE).build();
assertEquals("https://api.spotify.com:443/v1/artists/4AK6F7OLvEQ5QYCBNiQWHq/albums", request.toString());
assertHasParameter(request.toUrl(), "album_type", "SINGLE");
}

@Test
public void shouldFailIfAlbumTypeParametersIsInArtistsAlbumUrl() {
Api api = Api.DEFAULT_API;
Request request = api.getAlbumsForArtist("4AK6F7OLvEQ5QYCBNiQWHq").types(AlbumType.SINGLE).build();
assertEquals("https://api.spotify.com:443/v1/artists/4AK6F7OLvEQ5QYCBNiQWHq/albums", request.toString());
assertHasParameter(request.toUrl(), "album_type", "SINGLE");
}

@Test
public void shouldHaveLimitParameterInArtistsAlbumUrl() {
Api api = Api.DEFAULT_API;
Expand Down Expand Up @@ -120,42 +136,47 @@ public void shouldCreateAGetArtistsUrl() {
public void shouldCreateSearchUrl() {
Api api = Api.DEFAULT_API;
Request request = api.searchTracks("moulat swalf").build();
assertEquals("https://api.spotify.com:443/v1/tracks/search", request.toString());
assertEquals("https://api.spotify.com:443/v1/search", request.toString());
assertHasParameter(request.toUrl(), "q", "moulat+swalf");
assertHasParameter(request.toUrl(), "type", "track");
}

@Test
public void shouldCreateSearchUrlForAlbum() {
Api api = Api.DEFAULT_API;
Request request = api.searchAlbums("meeep").build();
assertEquals("https://api.spotify.com:443/v1/albums/search", request.toString());
assertEquals("https://api.spotify.com:443/v1/search", request.toString());
assertHasParameter(request.toUrl(), "q", "meeep");
assertHasParameter(request.toUrl(), "type", "album");
}

@Test
public void shouldCreateSearchUrlForArtist() {
Api api = Api.DEFAULT_API;
Request request = api.searchArtists("meeep").build();
assertEquals("https://api.spotify.com:443/v1/artists/search", request.toString());
assertEquals("https://api.spotify.com:443/v1/search", request.toString());
assertHasParameter(request.toUrl(), "q", "meeep");
assertHasParameter(request.toUrl(), "type", "artist");
}

@Test
public void shouldCreateSearchUrlWithLimitParameter() {
Api api = Api.DEFAULT_API;
Request request = api.searchTracks("moulat swalf").limit(2).build();
assertEquals("https://api.spotify.com:443/v1/tracks/search", request.toString());
assertEquals("https://api.spotify.com:443/v1/search", request.toString());
assertHasParameter(request.toUrl(), "q", "moulat+swalf");
assertHasParameter(request.toUrl(), "limit", "2");
assertHasParameter(request.toUrl(), "type", "track");
}

@Test
public void shouldCreateSearchUrlWithOffsetParameter() {
Api api = Api.DEFAULT_API;
Request request = api.searchTracks("moulat swalf").offset(2).build();
assertEquals("https://api.spotify.com:443/v1/tracks/search", request.toString());
assertEquals("https://api.spotify.com:443/v1/search", request.toString());
assertHasParameter(request.toUrl(), "q", "moulat+swalf");
assertHasParameter(request.toUrl(), "offset", "2");
assertHasParameter(request.toUrl(), "type", "track");
}

@Test
Expand Down Expand Up @@ -194,7 +215,7 @@ public void shouldCreateUserProfileUrl() {
assertEquals("https://api.spotify.com:443/v1/users/wizzler", request.toString());
}

void assertHasParameter(Url url, String name, Object value) {
private void assertHasParameter(Url url, String name, Object value) {
Parameter expected = Parameter.newBuilder().setName(name).setValue(value.toString()).build();
for (Parameter actual : url.getParametersList()) {
if (actual.equals(expected)) {
Expand All @@ -204,4 +225,12 @@ void assertHasParameter(Url url, String name, Object value) {
fail(String.format("Actual URL %s does not contain parameter %s", url, expected));
}

private void assertNoParameter(Url url, String name) {
for (Parameter actual : url.getParametersList()) {
if (actual.getName().equals(name)) {
fail(String.format("Actual URL %s contains parameter %s", url, name));
}
}
}

}