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

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

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

public class WaypointsTest extends CGeoTestCase {

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

    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, Collections.EMPTY_SET, true, handler);
        assertThat(searchResult.getCount()).isEqualTo(1);
        return searchResult.getFirstCacheFromResult(LoadFlags.LOAD_WAYPOINTS);
    }

<MSG> Fix compile error in WayPointsTest.java

- as they are currently excluded in gradle, this did not affect the build

<DFF> @@ -23,7 +23,7 @@ public class WaypointsTest extends CGeoTestCase {
     };
 
     private static Geocache downloadCache(final String geocode) {
-        final SearchResult searchResult = Geocache.searchByGeocode(geocode, null, Collections.EMPTY_SET, true, handler);
+        final SearchResult searchResult = Geocache.searchByGeocode(geocode, null, true, handler);
         assertThat(searchResult.getCount()).isEqualTo(1);
         return searchResult.getFirstCacheFromResult(LoadFlags.LOAD_WAYPOINTS);
     }

Fix compile error in WayPointsTest.java