Skip to content

Tidying up tests #461

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
domesticmouse merged 2 commits into from
Jul 3, 2018
Merged

Tidying up tests #461

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3ce1dd
Tidying up tests
domesticmouse Jul 3, 2018
eb72951
Merge upstream master
domesticmouse Jul 3, 2018
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
64 changes: 31 additions & 33 deletions src/test/java/com/google/maps/PlacesApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,7 @@ public void testNearbySearchRequest() throws Exception {
}

@Test
@SuppressWarnings("deprecation") // Testing a deprecated method
public void testNearbySearchRequestWithMultipleType() throws Exception {
try (LocalTestServerContext sc = new LocalTestServerContext("{\"status\" : \"OK\"}")) {
LatLng location = new LatLng(10, 20);
Expand Down Expand Up @@ -969,17 +970,16 @@ public void testFindPlaceFromTextPoint() throws Exception {

String input = "Museum of Contemporary Art Australia";

FindPlaceFromText response =
PlacesApi.findPlaceFromText(sc.context, input, InputType.TEXT_QUERY)
.fields(
FindPlaceFromTextRequest.FieldMask.PHOTOS,
FindPlaceFromTextRequest.FieldMask.FORMATTED_ADDRESS,
FindPlaceFromTextRequest.FieldMask.NAME,
FindPlaceFromTextRequest.FieldMask.RATING,
FindPlaceFromTextRequest.FieldMask.OPENING_HOURS,
FindPlaceFromTextRequest.FieldMask.GEOMETRY)
.locationBias(new LocationBiasPoint(new LatLng(1, 2)))
.await();
PlacesApi.findPlaceFromText(sc.context, input, InputType.TEXT_QUERY)
.fields(
FindPlaceFromTextRequest.FieldMask.PHOTOS,
FindPlaceFromTextRequest.FieldMask.FORMATTED_ADDRESS,
FindPlaceFromTextRequest.FieldMask.NAME,
FindPlaceFromTextRequest.FieldMask.RATING,
FindPlaceFromTextRequest.FieldMask.OPENING_HOURS,
FindPlaceFromTextRequest.FieldMask.GEOMETRY)
.locationBias(new LocationBiasPoint(new LatLng(1, 2)))
.await();

sc.assertParamValue(input, "input");
sc.assertParamValue("textquery", "inputtype");
Expand All @@ -995,17 +995,16 @@ public void testFindPlaceFromTextCircular() throws Exception {

String input = "Museum of Contemporary Art Australia";

FindPlaceFromText response =
PlacesApi.findPlaceFromText(sc.context, input, InputType.TEXT_QUERY)
.fields(
FindPlaceFromTextRequest.FieldMask.PHOTOS,
FindPlaceFromTextRequest.FieldMask.FORMATTED_ADDRESS,
FindPlaceFromTextRequest.FieldMask.NAME,
FindPlaceFromTextRequest.FieldMask.RATING,
FindPlaceFromTextRequest.FieldMask.OPENING_HOURS,
FindPlaceFromTextRequest.FieldMask.GEOMETRY)
.locationBias(new LocationBiasCircular(new LatLng(1, 2), 3000))
.await();
PlacesApi.findPlaceFromText(sc.context, input, InputType.TEXT_QUERY)
.fields(
FindPlaceFromTextRequest.FieldMask.PHOTOS,
FindPlaceFromTextRequest.FieldMask.FORMATTED_ADDRESS,
FindPlaceFromTextRequest.FieldMask.NAME,
FindPlaceFromTextRequest.FieldMask.RATING,
FindPlaceFromTextRequest.FieldMask.OPENING_HOURS,
FindPlaceFromTextRequest.FieldMask.GEOMETRY)
.locationBias(new LocationBiasCircular(new LatLng(1, 2), 3000))
.await();

sc.assertParamValue(input, "input");
sc.assertParamValue("textquery", "inputtype");
Expand All @@ -1021,17 +1020,16 @@ public void testFindPlaceFromTextRectangular() throws Exception {

String input = "Museum of Contemporary Art Australia";

FindPlaceFromText response =
PlacesApi.findPlaceFromText(sc.context, input, InputType.TEXT_QUERY)
.fields(
FindPlaceFromTextRequest.FieldMask.PHOTOS,
FindPlaceFromTextRequest.FieldMask.FORMATTED_ADDRESS,
FindPlaceFromTextRequest.FieldMask.NAME,
FindPlaceFromTextRequest.FieldMask.RATING,
FindPlaceFromTextRequest.FieldMask.OPENING_HOURS,
FindPlaceFromTextRequest.FieldMask.GEOMETRY)
.locationBias(new LocationBiasRectangular(new LatLng(1, 2), new LatLng(3, 4)))
.await();
PlacesApi.findPlaceFromText(sc.context, input, InputType.TEXT_QUERY)
.fields(
FindPlaceFromTextRequest.FieldMask.PHOTOS,
FindPlaceFromTextRequest.FieldMask.FORMATTED_ADDRESS,
FindPlaceFromTextRequest.FieldMask.NAME,
FindPlaceFromTextRequest.FieldMask.RATING,
FindPlaceFromTextRequest.FieldMask.OPENING_HOURS,
FindPlaceFromTextRequest.FieldMask.GEOMETRY)
.locationBias(new LocationBiasRectangular(new LatLng(1, 2), new LatLng(3, 4)))
.await();

sc.assertParamValue(input, "input");
sc.assertParamValue("textquery", "inputtype");
Expand Down