Add exception classes and more renames

1 files changed, 11 insertions, 11 deletions

diff --git a/test/org/traccar/geocoder/ReverseGeocoderTest.java b/test/org/traccar/geocoder/GeocoderTest.java
index 73753c96c..012f8bacd 100644
--- a/test/org/traccar/geocoder/ReverseGeocoderTest.java
+++ b/test/org/traccar/geocoder/GeocoderTest.java
@@ -3,7 +3,7 @@ package org.traccar.geocoder;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class ReverseGeocoderTest {
+public class GeocoderTest {
 
     private boolean enable = false;
 
@@ -31,9 +31,9 @@ public class ReverseGeocoderTest {
     }
 
     public void testGoogle() throws InterruptedException {
-        ReverseGeocoder reverseGeocoder = new GoogleReverseGeocoder();
+        Geocoder geocoder = new GoogleGeocoder();
 
-        reverseGeocoder.getAddress(new AddressFormat(), 37.4217550, -122.0846330, new ReverseGeocoder.ReverseGeocoderCallback() {
+        geocoder.getAddress(new AddressFormat(), 37.4217550, -122.0846330, new Geocoder.ReverseGeocoderCallback() {
             @Override
             public void onSuccess(String address) {
                 setAddress(address);
@@ -47,9 +47,9 @@ public class ReverseGeocoderTest {
     }
 
     public void testNominatim() throws InterruptedException {
-        ReverseGeocoder reverseGeocoder = new NominatimReverseGeocoder();
+        Geocoder geocoder = new NominatimGeocoder();
 
-        reverseGeocoder.getAddress(new AddressFormat(), 40.7337807, -73.9974401, new ReverseGeocoder.ReverseGeocoderCallback() {
+        geocoder.getAddress(new AddressFormat(), 40.7337807, -73.9974401, new Geocoder.ReverseGeocoderCallback() {
             @Override
             public void onSuccess(String address) {
                 setAddress(address);
@@ -63,9 +63,9 @@ public class ReverseGeocoderTest {
     }
 
     public void testGisgraphy() throws InterruptedException {
-        ReverseGeocoder reverseGeocoder = new GisgraphyReverseGeocoder();
+        Geocoder geocoder = new GisgraphyGeocoder();
 
-        reverseGeocoder.getAddress(new AddressFormat(), 48.8530000, 2.3400000, new ReverseGeocoder.ReverseGeocoderCallback() {
+        geocoder.getAddress(new AddressFormat(), 48.8530000, 2.3400000, new Geocoder.ReverseGeocoderCallback() {
             @Override
             public void onSuccess(String address) {
                 setAddress(address);
@@ -79,10 +79,10 @@ public class ReverseGeocoderTest {
     }
 
     public void testOpenCage() throws InterruptedException {
-        ReverseGeocoder reverseGeocoder = new OpenCageReverseGeocoder(
+        Geocoder geocoder = new OpenCageGeocoder(
                 "http://api.opencagedata.com/geocode/v1", "SECRET", 0);
 
-        reverseGeocoder.getAddress(new AddressFormat(), 34.116302, -118.051519, new ReverseGeocoder.ReverseGeocoderCallback() {
+        geocoder.getAddress(new AddressFormat(), 34.116302, -118.051519, new Geocoder.ReverseGeocoderCallback() {
             @Override
             public void onSuccess(String address) {
                 setAddress(address);
@@ -96,9 +96,9 @@ public class ReverseGeocoderTest {
     }
 
     public void testGeocodeFarm() throws InterruptedException {
-        ReverseGeocoder reverseGeocoder = new GeocodeFarmReverseGeocoder(0);
+        Geocoder geocoder = new GeocodeFarmGeocoder(0);
 
-        reverseGeocoder.getAddress(new AddressFormat(), 34.116302, -118.051519, new ReverseGeocoder.ReverseGeocoderCallback() {
+        geocoder.getAddress(new AddressFormat(), 34.116302, -118.051519, new Geocoder.ReverseGeocoderCallback() {
             @Override
             public void onSuccess(String address) {
                 setAddress(address);