1 files changed, 32 insertions, 0 deletions
diff --git a/test/org/traccar/geocode/AddressFormatTest.java b/test/org/traccar/geocode/AddressFormatTest.java
new file mode 100644
index 000000000..325ae1433
--- /dev/null
+++ b/test/org/traccar/geocode/AddressFormatTest.java
@@ -0,0 +1,32 @@
+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", "");
+    }
+
+}