Index: /trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java	(revision 15369)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/OverpassTurboQueryWizardTest.java	(revision 15370)
@@ -4,4 +4,5 @@
 import static org.junit.Assert.assertEquals;
 
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
@@ -22,5 +23,5 @@
 
     /**
-     * Test key=value.
+     * Test {@code key=value}.
      */
     @Test
@@ -39,4 +40,175 @@
 
     /**
+     * Test {@code key!=value}.
+     */
+    @Test
+    public void testKeyNotValue() {
+        final String query = OverpassTurboQueryWizard.getInstance().constructQuery("amenity!=drinking_water");
+        assertEquals("" +
+                "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
+                "(\n" +
+                "  node[\"amenity\"!=\"drinking_water\"];\n" +
+                "  way[\"amenity\"!=\"drinking_water\"];\n" +
+                "  relation[\"amenity\"!=\"drinking_water\"];\n" +
+                ");\n" +
+                "(._;>;);\n" +
+                "out meta;", query);
+    }
+
+    /**
+     * Test {@code foo=bar and baz=42}.
+     */
+    @Test
+    public void testBooleanAnd() {
+        final String expected = "" +
+                "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
+                "(\n" +
+                "  node[\"foo\"=\"bar\"][\"baz\"=\"42\"];\n" +
+                "  way[\"foo\"=\"bar\"][\"baz\"=\"42\"];\n" +
+                "  relation[\"foo\"=\"bar\"][\"baz\"=\"42\"];\n" +
+                ");\n" +
+                "(._;>;);\n" +
+                "out meta;";
+        assertEquals(expected, OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar and baz=42"));
+        assertEquals(expected, OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar && baz=42"));
+        assertEquals(expected, OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar & baz=42"));
+    }
+
+    /**
+     * Test {@code foo=bar or baz=42}.
+     */
+    @Test
+    public void testBooleanOr() {
+        final String expected = "" +
+                "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
+                "(\n" +
+                "  node[\"foo\"=\"bar\"];\n" +
+                "  way[\"foo\"=\"bar\"];\n" +
+                "  relation[\"foo\"=\"bar\"];\n" +
+                "  node[\"baz\"=\"42\"];\n" +
+                "  way[\"baz\"=\"42\"];\n" +
+                "  relation[\"baz\"=\"42\"];\n" +
+                ");\n" +
+                "(._;>;);\n" +
+                "out meta;";
+        assertEquals(expected, OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar or baz=42"));
+        assertEquals(expected, OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar || baz=42"));
+        assertEquals(expected, OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar | baz=42"));
+    }
+
+    /**
+     * Test {@code (foo=* or bar=*) and (asd=* or fasd=*)}.
+     */
+    @Test
+    public void testBoolean() {
+        final String query = OverpassTurboQueryWizard.getInstance().constructQuery("(foo=* or bar=*) and (asd=* or fasd=*)");
+        assertEquals("" +
+                "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
+                "(\n" +
+                "  node[\"foo\"][\"asd\"];\n" +
+                "  way[\"foo\"][\"asd\"];\n" +
+                "  relation[\"foo\"][\"asd\"];\n" +
+                "  node[\"foo\"][\"fasd\"];\n" +
+                "  way[\"foo\"][\"fasd\"];\n" +
+                "  relation[\"foo\"][\"fasd\"];\n" +
+                "  node[\"bar\"][\"asd\"];\n" +
+                "  way[\"bar\"][\"asd\"];\n" +
+                "  relation[\"bar\"][\"asd\"];\n" +
+                "  node[\"bar\"][\"fasd\"];\n" +
+                "  way[\"bar\"][\"fasd\"];\n" +
+                "  relation[\"bar\"][\"fasd\"];\n" +
+                ");\n" +
+                "(._;>;);\n" +
+                "out meta;", query);
+    }
+
+    /**
+     * Test {@code foo=bar and (type:node or type:way)}.
+     */
+    @Test
+    public void testType() {
+        final String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar and (type:node or type:way)");
+        assertEquals("" +
+                "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
+                "(\n" +
+                "  node[\"foo\"=\"bar\"];\n" +
+                "  way[\"foo\"=\"bar\"];\n" +
+                ");\n" +
+                "(._;>;);\n" +
+                "out meta;", query);
+    }
+
+    /**
+     * Test {@code user:foo or uid:42}.
+     */
+    @Test
+    public void testUser() {
+        final String query = OverpassTurboQueryWizard.getInstance().constructQuery("user:foo or uid:42");
+        assertEquals("" +
+                "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
+                "(\n" +
+                "  node(user:\"foo\");\n" +
+                "  way(user:\"foo\");\n" +
+                "  relation(user:\"foo\");\n" +
+                "  node(uid:42);\n" +
+                "  way(uid:42);\n" +
+                "  relation(uid:42);\n" +
+                ");\n" +
+                "(._;>;);\n" +
+                "out meta;", query);
+    }
+
+    /**
+     * Test {@code foo=bar and (type:node or type:way)}.
+     */
+    @Test
+    public void testEmpty() {
+        final String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo='' and type:way");
+        assertEquals("" +
+                "[out:xml][timeout:90][bbox:{{bbox}}];\n" +
+                "(\n" +
+                "  way[\"foo\"~\"^$\"];\n" +
+                ");\n" +
+                "(._;>;);\n" +
+                "out meta;", query);
+    }
+
+    /**
+     * Test geocodeArea.
+     */
+    @Test
+    public void testInArea() {
+        final String query = OverpassTurboQueryWizard.getInstance().constructQuery("foo=bar in Josmland");
+        assertEquals("" +
+                "[out:xml][timeout:90];\n" +
+                "{{geocodeArea:Josmland}}->.searchArea;\n" +
+                "(\n" +
+                "  node[\"foo\"=\"bar\"](area.searchArea);\n" +
+                "  way[\"foo\"=\"bar\"](area.searchArea);\n" +
+                "  relation[\"foo\"=\"bar\"](area.searchArea);\n" +
+                ");\n" +
+                "(._;>;);\n" +
+                "out meta;", query);
+    }
+
+    /**
+     * Test building an Overpass query based on a preset name.
+     */
+    @Test
+    @Ignore("preset handling not implemented")
+    public void testPreset() {
+        final String query = OverpassTurboQueryWizard.getInstance().constructQuery("Hospital");
+        assertEquals("" +
+                "[out:xml][timeout:90];\n" +
+                "(\n" +
+                "  node[\"amenity\"=\"hospital\"];\n" +
+                "  way[\"amenity\"=\"hospital\"];\n" +
+                "  relation[\"amenity\"=\"hospital\"];\n" +
+                ");\n" +
+                "(._;>;);\n" +
+                "out meta;", query);
+    }
+
+    /**
      * Test erroneous value.
      */