aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2012-03-03 10:27:59 +0100
committerBananeweizen <bananeweizen@gmx.de>2012-03-03 10:27:59 +0100
commitf2835856dbb0b2865d842dd381f4e90601710438 (patch)
treefcfa45b0c427282ba31599ead6fd422815a4af42 /tests/src
parentcf88273bd153ddc46c0f3496c7f86343369ff176 (diff)
downloadcgeo-f2835856dbb0b2865d842dd381f4e90601710438.zip
cgeo-f2835856dbb0b2865d842dd381f4e90601710438.tar.gz
cgeo-f2835856dbb0b2865d842dd381f4e90601710438.tar.bz2
refactoring: never set listId of cache to TEMPORARY_ID
* TEMPORARY_LIST_ID is already set in constructor * setting it again afterwards can be wrong due to merging with caches from DB * setting listId is not necessary during parsing at all, it is set when storing, moving or importing.
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/cgeo/geocaching/cgBaseTest.java4
-rw-r--r--tests/src/cgeo/geocaching/cgeoApplicationTest.java6
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/src/cgeo/geocaching/cgBaseTest.java b/tests/src/cgeo/geocaching/cgBaseTest.java
index 8b59185..bfb0cc7 100644
--- a/tests/src/cgeo/geocaching/cgBaseTest.java
+++ b/tests/src/cgeo/geocaching/cgBaseTest.java
@@ -86,7 +86,7 @@ public class cgBaseTest extends AndroidTestCase {
for (MockedCache mockedCache : RegExPerformanceTest.MOCKED_CACHES) {
// to get the same results we have to use the date format used when the mocked data was created
Settings.setGcCustomDate(MockedCache.getDateFormat());
- SearchResult searchResult = cgBase.parseCacheFromText(mockedCache.getData(), 0, null);
+ SearchResult searchResult = cgBase.parseCacheFromText(mockedCache.getData(), null);
cgCache parsedCache = searchResult.getFirstCacheFromResult(LoadFlags.LOAD_CACHE_OR_DB);
assertTrue(StringUtils.isNotBlank(mockedCache.getMockedDataUser()));
cgBaseTest.testCompareCaches(mockedCache, parsedCache);
@@ -146,7 +146,7 @@ public class cgBaseTest extends AndroidTestCase {
final MockedCache mockedCache = RegExPerformanceTest.MOCKED_CACHES.get(index);
// to get the same results we have to use the date format used when the mocked data was created
Settings.setGcCustomDate(MockedCache.getDateFormat());
- final SearchResult searchResult = cgBase.parseCacheFromText(mockedCache.getData(), 0, null);
+ final SearchResult searchResult = cgBase.parseCacheFromText(mockedCache.getData(), null);
return searchResult.getFirstCacheFromResult(LoadFlags.LOAD_CACHE_OR_DB);
}
} \ No newline at end of file
diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
index 258e6d2..0f985a3 100644
--- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
@@ -163,7 +163,7 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
*/
@MediumTest
public static void testSearchByCoords() {
- final SearchResult search = cgBase.searchByCoords(null, new Geopoint("N 52° 24.972 E 009° 35.647"), CacheType.MYSTERY, 0, false);
+ final SearchResult search = cgBase.searchByCoords(null, new Geopoint("N 52° 24.972 E 009° 35.647"), CacheType.MYSTERY, false);
assertNotNull(search);
assertTrue(18 <= search.getGeocodes().size());
assertTrue(search.getGeocodes().contains("GC1RMM2"));
@@ -174,7 +174,7 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
*/
@MediumTest
public static void testSearchByOwner() {
- final SearchResult search = cgBase.searchByOwner(null, "blafoo", CacheType.MYSTERY, 0, false);
+ final SearchResult search = cgBase.searchByOwner(null, "blafoo", CacheType.MYSTERY, false);
assertNotNull(search);
assertEquals(3, search.getGeocodes().size());
assertTrue(search.getGeocodes().contains("GC36RT6"));
@@ -185,7 +185,7 @@ public class cgeoApplicationTest extends ApplicationTestCase<cgeoapplication> {
*/
@MediumTest
public static void testSearchByUsername() {
- final SearchResult search = cgBase.searchByUsername(null, "blafoo", CacheType.WEBCAM, 0, false);
+ final SearchResult search = cgBase.searchByUsername(null, "blafoo", CacheType.WEBCAM, false);
assertNotNull(search);
assertEquals(3, search.totalCnt);
assertTrue(search.getGeocodes().contains("GCP0A9"));