-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Added parsing of county * Fix gisgraphy * Removed ADM3 parsing for Gisgraphy * Add Environment Variable support to OCD tests * Use environment variable in config * Use environment variable for gisgraphy as well
- Loading branch information
Showing
12 changed files
with
212 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
193 changes: 96 additions & 97 deletions
193
src/test/java/com/graphhopper/converter/resource/ConverterResourceGisgraphyTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,113 +1,112 @@ | ||
| package com.graphhopper.converter.resource; | ||
|
|
||
| import static junit.framework.TestCase.assertTrue; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import com.graphhopper.converter.ConverterApplication; | ||
| import com.graphhopper.converter.ConverterConfiguration; | ||
| import com.graphhopper.converter.api.GHResponse; | ||
| import io.dropwizard.client.JerseyClientBuilder; | ||
| import io.dropwizard.testing.ResourceHelpers; | ||
| import io.dropwizard.testing.junit.DropwizardAppRule; | ||
|
|
||
| import javax.ws.rs.client.Client; | ||
| import javax.ws.rs.core.Response; | ||
|
|
||
| import org.glassfish.jersey.client.ClientProperties; | ||
| import org.junit.ClassRule; | ||
| import org.junit.Test; | ||
|
|
||
| import com.graphhopper.converter.ConverterApplication; | ||
| import com.graphhopper.converter.ConverterConfiguration; | ||
| import com.graphhopper.converter.api.GHResponse; | ||
| import javax.ws.rs.client.Client; | ||
| import javax.ws.rs.core.Response; | ||
|
|
||
| import static junit.framework.TestCase.assertTrue; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| /** | ||
| * @author Robin Boldt | ||
| */ | ||
| public class ConverterResourceGisgraphyTest { | ||
| @ClassRule | ||
| public static final DropwizardAppRule<ConverterConfiguration> RULE = | ||
| new DropwizardAppRule<>(ConverterApplication.class, ResourceHelpers.resourceFilePath("converter.yml")); | ||
|
|
||
| @Test | ||
| public void testHandleForward() { | ||
| Client client = new JerseyClientBuilder(RULE.getEnvironment()).build("test forward client"); | ||
|
|
||
| client.property(ClientProperties.CONNECT_TIMEOUT, 100000); | ||
| client.property(ClientProperties.READ_TIMEOUT, 100000); | ||
|
|
||
| Response response = client.target( | ||
| String.format("http://localhost:%d/gisgraphy?q=berlin", RULE.getLocalPort())) | ||
| .request() | ||
| .get(); | ||
|
|
||
| assertThat(response.getStatus()).isEqualTo(200); | ||
| GHResponse entry = response.readEntity(GHResponse.class); | ||
| assertTrue(entry.getHits().size()>0); | ||
|
|
||
| //now try with an Address | ||
| response = client.target( | ||
| String.format("http://localhost:%d/gisgraphy?q=103+avenue+des+champs+elysees,paris", RULE.getLocalPort())) | ||
| .request() | ||
| .get(); | ||
|
|
||
| assertThat(response.getStatus()).isEqualTo(200); | ||
| entry = response.readEntity(GHResponse.class); | ||
| assertTrue(entry.getHits().size()>0); | ||
| } | ||
|
|
||
| @Test | ||
| public void testHandleReverse() { | ||
| Client client = new JerseyClientBuilder(RULE.getEnvironment()).build("test reverse client"); | ||
|
|
||
| client.property(ClientProperties.CONNECT_TIMEOUT, 100000); | ||
| client.property(ClientProperties.READ_TIMEOUT, 100000); | ||
|
|
||
| Response response = client.target( | ||
| String.format("http://localhost:%d/gisgraphy/?point=52.5487429714954,-1.81602098644987&reverse=true", RULE.getLocalPort())) | ||
| .request() | ||
| .get(); | ||
|
|
||
| assertThat(response.getStatus()).isEqualTo(200); | ||
| GHResponse entry = response.readEntity(GHResponse.class); | ||
| assertTrue(entry.getHits().size()>0); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void testHandleAutocomplete() { | ||
| Client client = new JerseyClientBuilder(RULE.getEnvironment()).build("test autocomplete client"); | ||
|
|
||
| client.property(ClientProperties.CONNECT_TIMEOUT, 100000); | ||
| client.property(ClientProperties.READ_TIMEOUT, 100000); | ||
|
|
||
| Response response = client.target( | ||
| String.format("http://localhost:%d/gisgraphy?q=pari&autocomplete=true", RULE.getLocalPort())) | ||
| .request() | ||
| .get(); | ||
|
|
||
| assertThat(response.getStatus()).isEqualTo(200); | ||
| GHResponse entry = response.readEntity(GHResponse.class); | ||
| assertTrue(entry.getHits().size()>0); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void testHandleAutocompleteWithReverseShouldThrows() { | ||
| Client client = new JerseyClientBuilder(RULE.getEnvironment()).build("test autocomplete-reverse client"); | ||
|
|
||
| client.property(ClientProperties.CONNECT_TIMEOUT, 100000); | ||
| client.property(ClientProperties.READ_TIMEOUT, 100000); | ||
|
|
||
| Response response = null; | ||
| try { | ||
| response = client.target( | ||
| String.format("http://localhost:%d/gisgraphy?q=pari&point=52.5487429714954,-1.81602098644987&autocomplete=true&reverse=true", RULE.getLocalPort())) | ||
| .request() | ||
| .get(); | ||
| } catch (Exception e) { | ||
| // TODO Auto-generated catch block | ||
| e.printStackTrace(); | ||
| } | ||
|
|
||
| assertThat(response.getStatus()).isEqualTo(400); | ||
|
|
||
| } | ||
| @ClassRule | ||
| public static final DropwizardAppRule<ConverterConfiguration> RULE = | ||
| new DropwizardAppRule<>(ConverterApplication.class, ResourceHelpers.resourceFilePath("converter.yml")); | ||
|
|
||
| @Test | ||
| public void testHandleForward() { | ||
| Client client = new JerseyClientBuilder(RULE.getEnvironment()).build("test forward client"); | ||
|
|
||
| client.property(ClientProperties.CONNECT_TIMEOUT, 100000); | ||
| client.property(ClientProperties.READ_TIMEOUT, 100000); | ||
|
|
||
| Response response = client.target( | ||
| String.format("http://localhost:%d/gisgraphy?q=berlin", RULE.getLocalPort())) | ||
| .request() | ||
| .get(); | ||
|
|
||
| assertThat(response.getStatus()).isEqualTo(200); | ||
| GHResponse entry = response.readEntity(GHResponse.class); | ||
| assertTrue(entry.getHits().size() > 0); | ||
|
|
||
| //now try with an Address | ||
| response = client.target( | ||
| String.format("http://localhost:%d/gisgraphy?q=103+avenue+des+champs+elysees,paris", RULE.getLocalPort())) | ||
| .request() | ||
| .get(); | ||
|
|
||
| assertThat(response.getStatus()).isEqualTo(200); | ||
| entry = response.readEntity(GHResponse.class); | ||
| assertTrue(entry.getHits().size() > 0); | ||
| } | ||
|
|
||
| @Test | ||
| public void testHandleReverse() { | ||
| Client client = new JerseyClientBuilder(RULE.getEnvironment()).build("test reverse client"); | ||
|
|
||
| client.property(ClientProperties.CONNECT_TIMEOUT, 100000); | ||
| client.property(ClientProperties.READ_TIMEOUT, 100000); | ||
|
|
||
| Response response = client.target( | ||
| String.format("http://localhost:%d/gisgraphy/?point=52.5487429714954,-1.81602098644987&reverse=true", RULE.getLocalPort())) | ||
| .request() | ||
| .get(); | ||
|
|
||
| assertThat(response.getStatus()).isEqualTo(200); | ||
| GHResponse entry = response.readEntity(GHResponse.class); | ||
| assertTrue(entry.getHits().size() > 0); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void testHandleAutocomplete() { | ||
| Client client = new JerseyClientBuilder(RULE.getEnvironment()).build("test autocomplete client"); | ||
|
|
||
| client.property(ClientProperties.CONNECT_TIMEOUT, 100000); | ||
| client.property(ClientProperties.READ_TIMEOUT, 100000); | ||
|
|
||
| Response response = client.target( | ||
| String.format("http://localhost:%d/gisgraphy?q=pari&autocomplete=true", RULE.getLocalPort())) | ||
| .request() | ||
| .get(); | ||
|
|
||
| assertThat(response.getStatus()).isEqualTo(200); | ||
| GHResponse entry = response.readEntity(GHResponse.class); | ||
| assertTrue(entry.getHits().size() > 0); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void testHandleAutocompleteWithReverseShouldThrows() { | ||
| Client client = new JerseyClientBuilder(RULE.getEnvironment()).build("test autocomplete-reverse client"); | ||
|
|
||
| client.property(ClientProperties.CONNECT_TIMEOUT, 100000); | ||
| client.property(ClientProperties.READ_TIMEOUT, 100000); | ||
|
|
||
| Response response = null; | ||
| try { | ||
| response = client.target( | ||
| String.format("http://localhost:%d/gisgraphy?q=pari&point=52.5487429714954,-1.81602098644987&autocomplete=true&reverse=true", RULE.getLocalPort())) | ||
| .request() | ||
| .get(); | ||
| } catch (Exception e) { | ||
| // TODO Auto-generated catch block | ||
| e.printStackTrace(); | ||
| } | ||
|
|
||
| assertThat(response.getStatus()).isEqualTo(400); | ||
|
|
||
| } | ||
|
|
||
| } |
Oops, something went wrong.