Add unit tests.

Author: arriolac

src/main/java/com/google/maps/GeoApiContext.java

@@ -38,6 +38,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 import javax.print.DocFlavor.STRING;
 
@@ -170,6 +171,14 @@ public void shutdown() {
     requestHandler.shutdown();
   }
 
+  private void addDefaultHeaders(Map<String, String> headers) {
+    for (Entry<String, String> entry : defaultHeaders.entrySet()) {
+      if (!headers.containsKey(entry.getKey())) {
+        headers.put(entry.getKey(), entry.getValue());
+      }
+    }
+  }
+
   <T, R extends ApiResponse<T>> PendingResult<T> get(
       ApiConfig config, Class<? extends R> clazz, Map<String, String> headers, Map<String, List<String>> params) {
     if (channel != null && !channel.isEmpty() && !params.containsKey("channel")) {
@@ -238,6 +247,8 @@ <T, R extends ApiResponse<T>> PendingResult<T> get(
       query.append("&channel=").append(channel);
     }
 
+    addDefaultHeaders(headers);
+
     return getWithPath(
         clazz,
         config.fieldNamingPolicy,
@@ -275,6 +286,8 @@ <T, R extends ApiResponse<T>> PendingResult<T> post(
       hostName = baseUrlOverride;
     }
 
+    addDefaultHeaders(headers);
+
     return requestHandler.handlePost(
         hostName,
         url.toString(),

src/test/java/com/google/maps/GeoApiContextTest.java

@@ -33,13 +33,13 @@
 import com.google.maps.internal.ApiConfig;
 import com.google.maps.internal.ApiResponse;
 import com.google.maps.internal.HttpHeaders;
+import com.google.maps.internal.StringJoin;
 import com.google.maps.model.GeocodingResult;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import okhttp3.Headers;
 import okhttp3.mockwebserver.MockResponse;
@@ -374,42 +374,13 @@ public void testToggleIfExceptionIsAllowedToRetry() throws Exception {
     fail("OverQueryLimitException was expected but not observed.");
   }
 
-  @Test
-  public void testSingleExperienceId() {
-    final String experienceId = "experienceId";
-    final GeoApiContext context = builder.experienceId(experienceId).build();
-    assertEquals(experienceId, context.getExperienceId());
-  }
-
-  @Test
-  public void testMultipleExperienceId() {
-    final String experienceId1 = "experienceId1";
-    final String experienceId2 = "experienceId2";
-    final GeoApiContext context = builder.experienceId(experienceId1, experienceId2).build();
-    assertEquals(experienceId1 + "," + experienceId2, context.getExperienceId());
-  }
-
-  @Test
-  public void testNoExperienceId() {
-    final GeoApiContext context = builder.build();
-    assertNull(context.getExperienceId());
-  }
-
-  @Test
-  public void testClearingExperienceId() {
-    final String experienceId = "experienceId";
-    final GeoApiContext context = builder.experienceId(experienceId).build();
-    assertEquals(experienceId, context.getExperienceId());
-
-    context.clearExperienceId();
-    assertNull(context.getExperienceId());
-  }
-
   @Test
   public void testExperienceIdIsInHeader() throws Exception {
     final String experienceId = "exp1";
-    final RecordedRequest request = makeMockRequest(experienceId);
-    assertEquals(experienceId, request.getHeader(HttpHeaders.X_GOOG_MAPS_EXPERIENCE_ID));
+    final String experienceId2 = "exp2";
+    final RecordedRequest request = makeMockRequest(experienceId, experienceId2);
+    assertEquals(experienceId + "," + experienceId2,
+        request.getHeader(HttpHeaders.X_GOOG_MAPS_EXPERIENCE_ID));
   }
 
   @Test
@@ -419,32 +390,6 @@ public void testExperienceIdNotInHeader() throws Exception {
     assertNull(value);
   }
 
-  @Test
-  public void testExperienceIdSample() {
-    // [START maps_experience_id]
-    final String experienceId = UUID.randomUUID().toString();
-
-    // instantiate context with experience id
-    final GeoApiContext context =
-        new GeoApiContext.Builder().apiKey("AIza-Maps-API-Key").experienceId(experienceId).build();
-
-    // clear the current experience id
-    context.clearExperienceId();
-
-    // set a new experience id
-    final String otherExperienceId = UUID.randomUUID().toString();
-    context.setExperienceId(experienceId, otherExperienceId);
-
-    // make API request, the client will set the header
-    // X-GOOG-MAPS-EXPERIENCE-ID: experienceId,otherExperienceId
-
-    // get current experience id
-    final String ids = context.getExperienceId();
-    // [END maps_experience_id]
-
-    assertEquals(experienceId + "," + otherExperienceId, ids);
-  }
-
   @SuppressWarnings("unchecked")
   private RecordedRequest makeMockRequest(String... experienceId) throws Exception {
     // Set up a mock request
@@ -458,9 +403,16 @@ private RecordedRequest makeMockRequest(String... experienceId) throws Exception
     server.start();
     setMockBaseUrl();
 
+    // Create headers
+    Map<String, String> headers = new HashMap<>();
+    if (experienceId != null && experienceId.length > 0) {
+      String experienceIds = StringJoin.join(",", experienceId);
+      headers.put(HttpHeaders.X_GOOG_MAPS_EXPERIENCE_ID, experienceIds);
+    }
+
     // Build & execute the request using our context
-    final GeoApiContext context = builder.experienceId(experienceId).build();
-    context.get(new ApiConfig(path), fakeResponse.getClass(), params).awaitIgnoreError();
+    final GeoApiContext context = builder.build();
+    context.get(new ApiConfig(path), fakeResponse.getClass(), headers, params).awaitIgnoreError();
 
     // Read the header
     server.shutdown();

src/test/java/com/google/maps/GeocodingApiTest.java

@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
+import com.google.maps.internal.HttpHeaders;
 import com.google.maps.model.AddressComponentType;
 import com.google.maps.model.AddressType;
 import com.google.maps.model.ComponentFilter;
@@ -32,6 +33,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
+import okhttp3.Headers;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -93,6 +96,68 @@ public void testPlaceGeocode() throws Exception {
     }
   }
 
+  private void testExperienceIdSample() {
+    // [START maps_experience_id]
+    final String experienceId = UUID.randomUUID().toString();
+
+    // instantiate context
+    final GeoApiContext context =
+        new GeoApiContext.Builder().apiKey("AIza-Maps-API-Key").build();
+
+    // set the experience id on a request
+    final GeocodingApiRequest request =
+        GeocodingApi.newRequest(context).experienceIds(experienceId);
+
+    // set a new experience id on another request
+    final String otherExperienceId = UUID.randomUUID().toString();
+    final GeocodingApiRequest request2 =
+        GeocodingApi.newRequest(context).experienceIds(otherExperienceId);
+
+    // make API request, the client will set the header
+    // X-GOOG-MAPS-EXPERIENCE-ID: experienceId,otherExperienceId
+    // [END maps_experience_id]
+  }
+
+  @Test
+  public void testNoExperienceId() throws Exception {
+    try (LocalTestServerContext sc = new LocalTestServerContext(placeGeocodeResponse)) {
+      String placeID = "ChIJP3Sa8ziYEmsRUKgyFmh9AQM";
+      GeocodingResult[] results = GeocodingApi.newRequest(sc.context).place(placeID).await();
+      final Headers headers = sc.headers();
+      final List<String> experienceIds = headers.values(HttpHeaders.X_GOOG_MAPS_EXPERIENCE_ID);
+      assertEquals(0, experienceIds.size());
+    }
+  }
+
+  @Test
+  public void testExperienceId() throws Exception {
+    try (LocalTestServerContext sc = new LocalTestServerContext(placeGeocodeResponse)) {
+      String placeID = "ChIJP3Sa8ziYEmsRUKgyFmh9AQM";
+      String expId = "experienceId";
+      GeocodingApi.newRequest(sc.context).experienceIds(expId)
+          .place(placeID).await();
+      final Headers headers = sc.headers();
+      final List<String> experienceIds = headers.values(HttpHeaders.X_GOOG_MAPS_EXPERIENCE_ID);
+      assertEquals(1, experienceIds.size());
+      assertEquals(expId, experienceIds.get(0));
+    }
+  }
+
+  @Test
+  public void testExperienceIds() throws Exception {
+    try (LocalTestServerContext sc = new LocalTestServerContext(placeGeocodeResponse)) {
+      String placeID = "ChIJP3Sa8ziYEmsRUKgyFmh9AQM";
+      String expId = "experienceId";
+      String expId2 = "experienceId2";
+      GeocodingResult[] results = GeocodingApi.newRequest(sc.context).experienceIds(expId, expId2)
+          .place(placeID).await();
+      final Headers headers = sc.headers();
+      final List<String> experienceIds = headers.values(HttpHeaders.X_GOOG_MAPS_EXPERIENCE_ID);
+      assertEquals(1, experienceIds.size());
+      assertEquals(expId + "," + expId2, experienceIds.get(0));
+    }
+  }
+
   @Test
   public void testAsync() throws Exception {
     try (LocalTestServerContext sc = new LocalTestServerContext(simpleGeocodeResponse)) {
@@ -148,8 +213,7 @@ public void testReverseGeocode() throws Exception {
   }
 
   /**
-   * Simple geocode sample: <a
-   * href="https://maps.googleapis.com/maps/api/geocode/json?address=1600+Amphitheatre+Parkway,+Mountain+View,+CA">
+   * Simple geocode sample: <a href="https://maps.googleapis.com/maps/api/geocode/json?address=1600+Amphitheatre+Parkway,+Mountain+View,+CA">
    * Address Geocode for "1600 Amphitheatre Parkway, Mountain View, CA"</a>.
    */
   @Test
@@ -249,8 +313,7 @@ public void testGeocodeTheGoogleplex() throws Exception {
   }
 
   /**
-   * Address geocode with bounds: <a
-   * href="https://maps.googleapis.com/maps/api/geocode/json?address=Winnetka&bounds=34.172684,-118.604794|34.236144,-118.500938">
+   * Address geocode with bounds: <a href="https://maps.googleapis.com/maps/api/geocode/json?address=Winnetka&bounds=34.172684,-118.604794|34.236144,-118.500938">
    * Winnetka within (34.172684,-118.604794) - (34.236144,-118.500938)</a>.
    */
   @Test
@@ -339,9 +402,8 @@ public void testGeocodeWithBounds() throws Exception {
   }
 
   /**
-   * Geocode with region biasing: <a
-   * href="https://maps.googleapis.com/maps/api/geocode/json?address=Toledo&region=es">Geocode for
-   * Toledo in Spain</a>.
+   * Geocode with region biasing: <a href="https://maps.googleapis.com/maps/api/geocode/json?address=Toledo&region=es">Geocode
+   * for Toledo in Spain</a>.
    */
   @Test
   public void testGeocodeWithRegionBiasing() throws Exception {
@@ -423,8 +485,7 @@ public void testGeocodeWithRegionBiasing() throws Exception {
   }
 
   /**
-   * Geocode with component filtering: <a
-   * href="https://maps.googleapis.com/maps/api/geocode/json?address=santa+cruz&components=country:ES">
+   * Geocode with component filtering: <a href="https://maps.googleapis.com/maps/api/geocode/json?address=santa+cruz&components=country:ES">
    * Geocoding "santa cruz" with country set to ES</a>.
    */
   @Test
@@ -508,8 +569,7 @@ public void testGeocodeWithComponentFilter() throws Exception {
   }
 
   /**
-   * Geocode with multiple component filters: <a
-   * href="https://maps.googleapis.com/maps/api/geocode/json?address=Torun&components=administrative_area:TX|country:US">
+   * Geocode with multiple component filters: <a href="https://maps.googleapis.com/maps/api/geocode/json?address=Torun&components=administrative_area:TX|country:US">
    * Geocoding Torun, with administrative area of "TX" and country of "US"</a>.
    */
   @Test
@@ -595,8 +655,7 @@ public void testGeocodeWithMultipleComponentFilters() throws Exception {
   }
 
   /**
-   * Making a request using just components filter: <a
-   * href="https://maps.googleapis.com/maps/api/geocode/json?components=route:Annegatan|administrative_area:Helsinki|country:Finland">
+   * Making a request using just components filter: <a href="https://maps.googleapis.com/maps/api/geocode/json?components=route:Annegatan|administrative_area:Helsinki|country:Finland">
    * Searching for a route of Annegatan, in the administrative area of Helsinki, and the country of
    * Finland </a>.
    */
@@ -683,8 +742,7 @@ public void testGeocodeWithJustComponents() throws Exception {
   }
 
   /**
-   * Simple reverse geocoding. <a
-   * href="https://maps.googleapis.com/maps/api/geocode/json?latlng=40.714224,-73.961452">Reverse
+   * Simple reverse geocoding. <a href="https://maps.googleapis.com/maps/api/geocode/json?latlng=40.714224,-73.961452">Reverse
    * geocode (40.714224,-73.961452)</a>.
    */
   @Test
@@ -706,8 +764,7 @@ public void testSimpleReverseGeocode() throws Exception {
   }
 
   /**
-   * Reverse geocode restricted by type: <a
-   * href="https://maps.googleapis.com/maps/api/geocode/json?latlng=40.714224,-73.961452&location_type=ROOFTOP&result_type=street_address">
+   * Reverse geocode restricted by type: <a href="https://maps.googleapis.com/maps/api/geocode/json?latlng=40.714224,-73.961452&location_type=ROOFTOP&result_type=street_address">
    * Reverse Geocode (40.714224,-73.961452) with location type of ROOFTOP and result type of
    * street_address</a>.
    */
@@ -805,7 +862,9 @@ public void testReverseGeocodeRestrictedByType() throws Exception {
     }
   }
 
-  /** Testing UTF8 result parsing. */
+  /**
+   * Testing UTF8 result parsing.
+   */
   @Test
   public void testUtfResult() throws Exception {
     try (LocalTestServerContext sc = new LocalTestServerContext(utfResultGeocodeResponse)) {
@@ -924,7 +983,9 @@ public void testCustomParameterPassThrough() throws Exception {
     }
   }
 
-  /** Testing Kita Ward reverse geocode. */
+  /**
+   * Testing Kita Ward reverse geocode.
+   */
   @Test
   public void testReverseGeocodeWithKitaWard() throws Exception {
     try (LocalTestServerContext sc =
@@ -947,7 +1008,9 @@ public void testReverseGeocodeWithKitaWard() throws Exception {
     }
   }
 
-  /** Testing supported Address Types for Geocoding. */
+  /**
+   * Testing supported Address Types for Geocoding.
+   */
   @Test
   public void testSupportedAddressTypesFood() throws Exception {
     try (LocalTestServerContext sc =
@@ -1038,7 +1101,9 @@ public void testSupportedAddressTypesFood() throws Exception {
     }
   }
 
-  /** Testing supported Address Types for Geocoding - Synagogue. */
+  /**
+   * Testing supported Address Types for Geocoding - Synagogue.
+   */
   @Test
   public void testSupportedAddressTypesSynagogue() throws Exception {
     try (LocalTestServerContext sc =

src/test/java/com/google/maps/LocalTestServerContext.java

@@ -25,6 +25,7 @@
 import java.nio.charset.Charset;
 import java.util.List;
 import javax.imageio.ImageIO;
+import okhttp3.Headers;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
@@ -102,6 +103,11 @@ public String path() throws InterruptedException {
     return request.getPath().split("\\?", -1)[0];
   }
 
+  public Headers headers() throws InterruptedException {
+    takeRequest();
+    return request.getHeaders();
+  }
+
   void assertParamValue(String expected, String paramName)
       throws URISyntaxException, InterruptedException {
     if (this.params == null) {