From 68569c05fb4be377baed5cd0ecb1b75176d24f01 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 31 Dec 2016 11:35:58 +1300 Subject: Rename geocode package to geocoder --- test/org/traccar/geocode/AddressFormatTest.java | 32 ------ test/org/traccar/geocode/ReverseGeocoderTest.java | 114 --------------------- test/org/traccar/geocoder/AddressFormatTest.java | 32 ++++++ test/org/traccar/geocoder/ReverseGeocoderTest.java | 114 +++++++++++++++++++++ 4 files changed, 146 insertions(+), 146 deletions(-) delete mode 100644 test/org/traccar/geocode/AddressFormatTest.java delete mode 100644 test/org/traccar/geocode/ReverseGeocoderTest.java create mode 100644 test/org/traccar/geocoder/AddressFormatTest.java create mode 100644 test/org/traccar/geocoder/ReverseGeocoderTest.java (limited to 'test/org') diff --git a/test/org/traccar/geocode/AddressFormatTest.java b/test/org/traccar/geocode/AddressFormatTest.java deleted file mode 100644 index 325ae1433..000000000 --- a/test/org/traccar/geocode/AddressFormatTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.traccar.geocode; - -import org.junit.Assert; -import org.junit.Test; - -public class AddressFormatTest { - - private void test(Address address, String format, String expected) { - Assert.assertEquals(expected, new AddressFormat(format).format(address)); - } - - @Test - public void testFormat() { - - Address address = new Address(); - address.setCountry("NZ"); - address.setSettlement("Auckland"); - address.setStreet("Queen St"); - address.setHouse("1A"); - - test(address, "%h %r %t %d %s %c %p", "1A Queen St Auckland NZ"); - test(address, "%h %r %t", "1A Queen St Auckland"); - test(address, "%h %r, %t", "1A Queen St, Auckland"); - test(address, "%h %r, %t %p", "1A Queen St, Auckland"); - test(address, "%t %d %c", "Auckland NZ"); - test(address, "%t, %d, %c", "Auckland, NZ"); - test(address, "%d %c", "NZ"); - test(address, "%d, %c", "NZ"); - test(address, "%p", ""); - } - -} diff --git a/test/org/traccar/geocode/ReverseGeocoderTest.java b/test/org/traccar/geocode/ReverseGeocoderTest.java deleted file mode 100644 index eab147cd5..000000000 --- a/test/org/traccar/geocode/ReverseGeocoderTest.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.traccar.geocode; - -import org.junit.Assert; -import org.junit.Test; - -public class ReverseGeocoderTest { - - private boolean enable = false; - - @Test - public void test() throws InterruptedException { - if (enable) { - testGeocodeFarm(); - } - } - - private String address; - - private synchronized String waitAddress() { - try { - wait(5000); - return address; - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - } - - private synchronized void setAddress(String address) { - this.address = address; - notifyAll(); - } - - public void testGoogle() throws InterruptedException { - ReverseGeocoder reverseGeocoder = new GoogleReverseGeocoder(); - - reverseGeocoder.getAddress(new AddressFormat(), 37.4217550, -122.0846330, new ReverseGeocoder.ReverseGeocoderCallback() { - @Override - public void onSuccess(String address) { - setAddress(address); - } - - @Override - public void onFailure(Throwable e) { - } - }); - Assert.assertEquals("1600 Amphitheatre Pkwy, Mountain View, CA, US", waitAddress()); - } - - public void testNominatim() throws InterruptedException { - ReverseGeocoder reverseGeocoder = new NominatimReverseGeocoder(); - - reverseGeocoder.getAddress(new AddressFormat(), 40.7337807, -73.9974401, new ReverseGeocoder.ReverseGeocoderCallback() { - @Override - public void onSuccess(String address) { - setAddress(address); - } - - @Override - public void onFailure(Throwable e) { - } - }); - Assert.assertEquals("35 West 9th Street, NYC, New York, US", waitAddress()); - } - - public void testGisgraphy() throws InterruptedException { - ReverseGeocoder reverseGeocoder = new GisgraphyReverseGeocoder(); - - reverseGeocoder.getAddress(new AddressFormat(), 48.8530000, 2.3400000, new ReverseGeocoder.ReverseGeocoderCallback() { - @Override - public void onSuccess(String address) { - setAddress(address); - } - - @Override - public void onFailure(Throwable e) { - } - }); - Assert.assertEquals("Rue du Jardinet, Paris, FR", waitAddress()); - } - - public void testOpenCage() throws InterruptedException { - ReverseGeocoder reverseGeocoder = new OpenCageReverseGeocoder( - "http://api.opencagedata.com/geocode/v1", "SECRET", 0); - - reverseGeocoder.getAddress(new AddressFormat(), 34.116302, -118.051519, new ReverseGeocoder.ReverseGeocoderCallback() { - @Override - public void onSuccess(String address) { - setAddress(address); - } - - @Override - public void onFailure(Throwable e) { - } - }); - Assert.assertEquals("Charleston Road, California, US", waitAddress()); - } - - public void testGeocodeFarm() throws InterruptedException { - ReverseGeocoder reverseGeocoder = new GeocodeFarmReverseGeocoder(0); - - reverseGeocoder.getAddress(new AddressFormat(), 34.116302, -118.051519, new ReverseGeocoder.ReverseGeocoderCallback() { - @Override - public void onSuccess(String address) { - setAddress(address); - } - - @Override - public void onFailure(Throwable e) { - } - }); - Assert.assertEquals("Estrella Avenue, Arcadia, California, United States", waitAddress()); - } - -} diff --git a/test/org/traccar/geocoder/AddressFormatTest.java b/test/org/traccar/geocoder/AddressFormatTest.java new file mode 100644 index 000000000..85bb44fd1 --- /dev/null +++ b/test/org/traccar/geocoder/AddressFormatTest.java @@ -0,0 +1,32 @@ +package org.traccar.geocoder; + +import org.junit.Assert; +import org.junit.Test; + +public class AddressFormatTest { + + private void test(Address address, String format, String expected) { + Assert.assertEquals(expected, new AddressFormat(format).format(address)); + } + + @Test + public void testFormat() { + + Address address = new Address(); + address.setCountry("NZ"); + address.setSettlement("Auckland"); + address.setStreet("Queen St"); + address.setHouse("1A"); + + test(address, "%h %r %t %d %s %c %p", "1A Queen St Auckland NZ"); + test(address, "%h %r %t", "1A Queen St Auckland"); + test(address, "%h %r, %t", "1A Queen St, Auckland"); + test(address, "%h %r, %t %p", "1A Queen St, Auckland"); + test(address, "%t %d %c", "Auckland NZ"); + test(address, "%t, %d, %c", "Auckland, NZ"); + test(address, "%d %c", "NZ"); + test(address, "%d, %c", "NZ"); + test(address, "%p", ""); + } + +} diff --git a/test/org/traccar/geocoder/ReverseGeocoderTest.java b/test/org/traccar/geocoder/ReverseGeocoderTest.java new file mode 100644 index 000000000..73753c96c --- /dev/null +++ b/test/org/traccar/geocoder/ReverseGeocoderTest.java @@ -0,0 +1,114 @@ +package org.traccar.geocoder; + +import org.junit.Assert; +import org.junit.Test; + +public class ReverseGeocoderTest { + + private boolean enable = false; + + @Test + public void test() throws InterruptedException { + if (enable) { + testGeocodeFarm(); + } + } + + private String address; + + private synchronized String waitAddress() { + try { + wait(5000); + return address; + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + + private synchronized void setAddress(String address) { + this.address = address; + notifyAll(); + } + + public void testGoogle() throws InterruptedException { + ReverseGeocoder reverseGeocoder = new GoogleReverseGeocoder(); + + reverseGeocoder.getAddress(new AddressFormat(), 37.4217550, -122.0846330, new ReverseGeocoder.ReverseGeocoderCallback() { + @Override + public void onSuccess(String address) { + setAddress(address); + } + + @Override + public void onFailure(Throwable e) { + } + }); + Assert.assertEquals("1600 Amphitheatre Pkwy, Mountain View, CA, US", waitAddress()); + } + + public void testNominatim() throws InterruptedException { + ReverseGeocoder reverseGeocoder = new NominatimReverseGeocoder(); + + reverseGeocoder.getAddress(new AddressFormat(), 40.7337807, -73.9974401, new ReverseGeocoder.ReverseGeocoderCallback() { + @Override + public void onSuccess(String address) { + setAddress(address); + } + + @Override + public void onFailure(Throwable e) { + } + }); + Assert.assertEquals("35 West 9th Street, NYC, New York, US", waitAddress()); + } + + public void testGisgraphy() throws InterruptedException { + ReverseGeocoder reverseGeocoder = new GisgraphyReverseGeocoder(); + + reverseGeocoder.getAddress(new AddressFormat(), 48.8530000, 2.3400000, new ReverseGeocoder.ReverseGeocoderCallback() { + @Override + public void onSuccess(String address) { + setAddress(address); + } + + @Override + public void onFailure(Throwable e) { + } + }); + Assert.assertEquals("Rue du Jardinet, Paris, FR", waitAddress()); + } + + public void testOpenCage() throws InterruptedException { + ReverseGeocoder reverseGeocoder = new OpenCageReverseGeocoder( + "http://api.opencagedata.com/geocode/v1", "SECRET", 0); + + reverseGeocoder.getAddress(new AddressFormat(), 34.116302, -118.051519, new ReverseGeocoder.ReverseGeocoderCallback() { + @Override + public void onSuccess(String address) { + setAddress(address); + } + + @Override + public void onFailure(Throwable e) { + } + }); + Assert.assertEquals("Charleston Road, California, US", waitAddress()); + } + + public void testGeocodeFarm() throws InterruptedException { + ReverseGeocoder reverseGeocoder = new GeocodeFarmReverseGeocoder(0); + + reverseGeocoder.getAddress(new AddressFormat(), 34.116302, -118.051519, new ReverseGeocoder.ReverseGeocoderCallback() { + @Override + public void onSuccess(String address) { + setAddress(address); + } + + @Override + public void onFailure(Throwable e) { + } + }); + Assert.assertEquals("Estrella Avenue, Arcadia, California, United States", waitAddress()); + } + +} -- cgit v1.2.3