<NME> WaypointsTest.java
<BEF> package cgeo.geocaching.connector.gc;

import static org.assertj.core.api.Assertions.assertThat;

import cgeo.CGeoTestCase;
import cgeo.geocaching.storage.DataStore;
import cgeo.geocaching.models.Geocache;
import cgeo.geocaching.SearchResult;
import cgeo.geocaching.enumerations.LoadFlags;
import cgeo.geocaching.utils.CancellableHandler;

import android.os.Message;

public class WaypointsTest extends CGeoTestCase {

    public static final CancellableHandler handler = new CancellableHandler() {
    public static void testDownloadWaypoints() {
        // Check that repeated loads of geocache hold the right number of waypoints (issue #2430).
        final String geocode = "GC3KE70";
        DataStore.removeCache(geocode, LoadFlags.REMOVE_ALL);
    };

    private static Geocache downloadCache(final String geocode) {
        final SearchResult searchResult = Geocache.searchByGeocode(geocode, null, 0, true, handler);
        assertThat(searchResult.getCount()).isEqualTo(1);
        return searchResult.getFirstCacheFromResult(LoadFlags.LOAD_WAYPOINTS);
    }

<MSG> cleanup multiple lists code

* unused imports
* broken JavaDoc
* unnecessary semicolon
* move guard conditions to earliest place possible
* unused variable
* non compiling test
<DFF> @@ -3,14 +3,16 @@ package cgeo.geocaching.connector.gc;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import cgeo.CGeoTestCase;
-import cgeo.geocaching.storage.DataStore;
-import cgeo.geocaching.models.Geocache;
 import cgeo.geocaching.SearchResult;
 import cgeo.geocaching.enumerations.LoadFlags;
+import cgeo.geocaching.models.Geocache;
+import cgeo.geocaching.storage.DataStore;
 import cgeo.geocaching.utils.CancellableHandler;
 
 import android.os.Message;
 
+import java.util.Collections;
+
 public class WaypointsTest extends CGeoTestCase {
 
     public static final CancellableHandler handler = new CancellableHandler() {
@@ -21,7 +23,7 @@ public class WaypointsTest extends CGeoTestCase {
     };
 
     private static Geocache downloadCache(final String geocode) {
-        final SearchResult searchResult = Geocache.searchByGeocode(geocode, null, 0, true, handler);
+        final SearchResult searchResult = Geocache.searchByGeocode(geocode, null, Collections.EMPTY_SET, true, handler);
         assertThat(searchResult.getCount()).isEqualTo(1);
         return searchResult.getFirstCacheFromResult(LoadFlags.LOAD_WAYPOINTS);
     }

cleanup multiple lists code