Skip to content

Commit 5903371

Browse files
author
Łukasz Paczos
committed
added deserialization test for directions response metadata
1 parent 92df497 commit 5903371

4 files changed

Lines changed: 25 additions & 7 deletions

File tree

services-directions-models/src/main/java/com/mapbox/api/directions/v5/models/DirectionsResponse.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ public static Builder builder() {
9696
public abstract String uuid();
9797

9898
/**
99-
* A complex data structure that provides versioning information.
99+
* A complex data structure that provides information about the source of the response.
100100
*
101-
* @return a Metadata holding versioning information
101+
* @return a Metadata with additional source information
102102
*/
103103
@Nullable
104104
public abstract Metadata metadata();
@@ -243,9 +243,9 @@ public abstract static class Builder {
243243
public abstract Builder uuid(@Nullable String uuid);
244244

245245
/**
246-
* A complex data structure that provides versioning information.
246+
* A complex data structure that provides information about the source of the response.
247247
*
248-
* @param metadata a Metadata holding versioning information
248+
* @param metadata a Metadata with additional source information
249249
* @return this builder for chaining options together
250250
*/
251251
public abstract Builder metadata(@Nullable Metadata metadata);

services-directions-models/src/main/java/com/mapbox/api/directions/v5/models/Metadata.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static Builder builder() {
3333
*/
3434
@Nullable
3535
@SerializedName("map")
36-
public abstract Map<String, String> mapInfo();
36+
public abstract Map<String, String> infoMap();
3737

3838
/**
3939
* Convert the current {@link Metadata} to its builder holding the currently assigned
@@ -80,7 +80,7 @@ public abstract static class Builder {
8080
* @param mapInfo indicating the key/value pairs
8181
* @return a {@link Metadata.Builder} object
8282
*/
83-
public abstract Builder mapInfo(Map<String, String> mapInfo);
83+
public abstract Builder infoMap(Map<String, String> mapInfo);
8484

8585
/**
8686
* Build a new {@link Metadata} object.

services-directions/src/test/java/com/mapbox/api/directions/v5/MapboxDirectionsTest.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.mapbox.api.directions.v5.models.DirectionsRoute;
1212
import com.mapbox.api.directions.v5.models.Incident;
1313
import com.mapbox.api.directions.v5.models.LegAnnotation;
14+
import com.mapbox.api.directions.v5.models.Metadata;
1415
import com.mapbox.api.directions.v5.models.RouteOptions;
1516
import com.mapbox.core.MapboxService;
1617
import com.mapbox.core.TestUtils;
@@ -21,6 +22,7 @@
2122
import java.util.ArrayList;
2223
import java.util.List;
2324
import java.util.Locale;
25+
import java.util.Map;
2426
import java.util.Random;
2527
import okhttp3.Call;
2628
import okhttp3.EventListener;
@@ -746,6 +748,22 @@ public void token_required() throws Exception {
746748
.build();
747749
}
748750

751+
@Test
752+
public void metadata_doesGetCreatedInResponse() throws IOException {
753+
Gson gson = new GsonBuilder()
754+
.registerTypeAdapterFactory(DirectionsAdapterFactory.create()).create();
755+
String body = loadJsonFixture(DIRECTIONS_V5_FIXTURE);
756+
DirectionsResponse response = gson.fromJson(body, DirectionsResponse.class);
757+
758+
Metadata metadata = response.metadata();
759+
assertNotNull(metadata);
760+
Map<String, String> infoMap = metadata.infoMap();
761+
assertNotNull(infoMap);
762+
763+
assertEquals("2021_07_14-03_00_00", infoMap.get("tileset_version"));
764+
assertEquals("and its value", infoMap.get("some_other_property"));
765+
}
766+
749767
class TestDispatcher extends okhttp3.mockwebserver.Dispatcher {
750768

751769
String currentResource;

0 commit comments

Comments
 (0)