From 08cb93c889da63d71fc8c1804231ff3c761901e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Vitor=20Retamero?= Date: Thu, 5 Oct 2017 23:22:21 -0300 Subject: [PATCH] Fixed source and destination formatting from DirectionsMatrix request builder --- .../v1/MapboxDirectionsMatrix.java | 10 +++++++++ .../v1/MapboxDirectionsMatrixTest.java | 22 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directionsmatrix/v1/MapboxDirectionsMatrix.java b/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directionsmatrix/v1/MapboxDirectionsMatrix.java index 7e20a0dd5..147e5d427 100644 --- a/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directionsmatrix/v1/MapboxDirectionsMatrix.java +++ b/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directionsmatrix/v1/MapboxDirectionsMatrix.java @@ -299,6 +299,11 @@ public String getDestinations() { } String[] destinationsFormatted = new String[destinations.length]; + + for (int i = 0; i < destinations.length; i++) { + destinationsFormatted[i] = String.valueOf(destinations[i]); + } + return TextUtils.join(";", destinationsFormatted); } @@ -312,6 +317,11 @@ public String getSources() { } String[] sourcesFormatted = new String[sources.length]; + + for (int i = 0; i < sources.length; i++) { + sourcesFormatted[i] = String.valueOf(sources[i]); + } + return TextUtils.join(";", sourcesFormatted); } diff --git a/mapbox/libjava-services/src/test/java/com/mapbox/services/api/directionsmatrix/v1/MapboxDirectionsMatrixTest.java b/mapbox/libjava-services/src/test/java/com/mapbox/services/api/directionsmatrix/v1/MapboxDirectionsMatrixTest.java index 0ab8b5a3b..5125be1c8 100644 --- a/mapbox/libjava-services/src/test/java/com/mapbox/services/api/directionsmatrix/v1/MapboxDirectionsMatrixTest.java +++ b/mapbox/libjava-services/src/test/java/com/mapbox/services/api/directionsmatrix/v1/MapboxDirectionsMatrixTest.java @@ -184,4 +184,26 @@ public void testResponse() throws ServicesException, IOException { assertEquals(response.body().getDurations()[0][1], 1888.3, DELTA); assertEquals(response.body().getDestinations().get(0).getName(), "McAllister Street"); } + + @Test + public void testDestinationsAreFormatted() { + MapboxDirectionsMatrix.Builder builder = new MapboxDirectionsMatrix.Builder() + .setDestinations(1, 2); + + String formattedDestinations = builder.getDestinations(); + + assertNotNull(formattedDestinations); + assertEquals(formattedDestinations, "1;2"); + } + + @Test + public void testSourcesAreFormatted() { + MapboxDirectionsMatrix.Builder builder = new MapboxDirectionsMatrix.Builder() + .setSources(1, 2); + + String formattedSources = builder.getSources(); + + assertNotNull(formattedSources); + assertEquals(formattedSources, "1;2"); + } }