aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-08-20 23:05:08 +0200
committerSamuel Tardieu <sam@rfc1149.net>2014-08-20 23:05:08 +0200
commit77e4b874816fdb1e633f0a13adc523d311414361 (patch)
tree7e42ff0924531b4a2d76e8a2a5a62953ccf5b52b /tests
parentd8eca78f75b7250cc2b44fd322975c11a2aae061 (diff)
parent49cfb4a627092e160ccb7c854ef4e289cb1108f3 (diff)
downloadcgeo-77e4b874816fdb1e633f0a13adc523d311414361.zip
cgeo-77e4b874816fdb1e633f0a13adc523d311414361.tar.gz
cgeo-77e4b874816fdb1e633f0a13adc523d311414361.tar.bz2
Merge branch 'release' into upstream
Conflicts: main/src/cgeo/geocaching/connector/gc/GCParser.java
Diffstat (limited to 'tests')
-rw-r--r--tests/src/cgeo/geocaching/connector/gc/GCParserTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java b/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
index 1c64568..be96cf3 100644
--- a/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
@@ -157,7 +157,7 @@ public class GCParserTest extends AbstractResourceInstrumentationTestCase {
// upload coordinates
GCParser.editModifiedCoordinates(cache, new Geopoint("N51 21.544", "E07 02.566"));
cache.dropSynchronous();
- final String page = GCParser.requestHtmlPage(cache.getGeocode(), null, "n", "0");
+ final String page = GCParser.requestHtmlPage(cache.getGeocode(), null, "n");
final Geocache cache2 = GCParser.parseAndSaveCacheFromText(page, null).getFirstCacheFromResult(LoadFlags.LOAD_CACHE_ONLY);
assertThat(cache2).isNotNull();
assert (cache2 != null); // eclipse bug
@@ -166,7 +166,7 @@ public class GCParserTest extends AbstractResourceInstrumentationTestCase {
// delete coordinates
GCParser.deleteModifiedCoordinates(cache2);
cache2.dropSynchronous();
- final String page2 = GCParser.requestHtmlPage(cache.getGeocode(), null, "n", "0");
+ final String page2 = GCParser.requestHtmlPage(cache.getGeocode(), null, "n");
final Geocache cache3 = GCParser.parseAndSaveCacheFromText(page2, null).getFirstCacheFromResult(LoadFlags.LOAD_CACHE_ONLY);
assertThat(cache3).isNotNull();
assert (cache3 != null); // eclipse bug