From ca6857ad07d228441b7b644187abfb81ebc7bf3d Mon Sep 17 00:00:00 2001 From: Marco Jacob Date: Mon, 11 Mar 2013 10:39:13 +0100 Subject: extract constant for mocked cache user to GCConstantsTest and removed duplicate test for cachesFound already done in GCConstantsTest --- tests/src/cgeo/geocaching/utils/BaseUtilsTest.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'tests/src') diff --git a/tests/src/cgeo/geocaching/utils/BaseUtilsTest.java b/tests/src/cgeo/geocaching/utils/BaseUtilsTest.java index 07ad7fe..78a833c 100644 --- a/tests/src/cgeo/geocaching/utils/BaseUtilsTest.java +++ b/tests/src/cgeo/geocaching/utils/BaseUtilsTest.java @@ -1,6 +1,7 @@ package cgeo.geocaching.utils; import cgeo.geocaching.connector.gc.GCConstants; +import cgeo.geocaching.connector.gc.GCConstantsTest; import cgeo.geocaching.test.mock.MockedCache; import android.test.AndroidTestCase; @@ -10,15 +11,8 @@ import java.util.regex.Pattern; public class BaseUtilsTest extends AndroidTestCase { public static void testRegEx() { final String page = MockedCache.readCachePage("GC2CJPF"); - assertEquals("blafoo", BaseUtils.getMatch(page, GCConstants.PATTERN_LOGIN_NAME, true, "???")); + assertEquals(GCConstantsTest.MOCK_LOGIN_NAME, BaseUtils.getMatch(page, GCConstants.PATTERN_LOGIN_NAME, true, "???")); assertTrue(page.contains("id=\"ctl00_hlRenew\"") || GCConstants.MEMBER_STATUS_PM.equals(BaseUtils.getMatch(page, GCConstants.PATTERN_MEMBER_STATUS, true, "???"))); - int cachesFound = 0; - try { - cachesFound = Integer.parseInt(BaseUtils.getMatch(page, GCConstants.PATTERN_CACHES_FOUND, true, "0").replaceAll("[,.]", "")); - } catch (NumberFormatException e) { - fail(); - } - assertTrue(cachesFound >= 491); } public static void testReplaceWhitespaces() { -- cgit v1.1 From 4b48cfbdc9301e67ae1422e4ed2cd0daacc3d720 Mon Sep 17 00:00:00 2001 From: Marco Jacob Date: Mon, 11 Mar 2013 10:41:57 +0100 Subject: extracted constants for mocked caches login name to adapt only this file --- tests/src/cgeo/geocaching/connector/gc/GCConstantsTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests/src') diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConstantsTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConstantsTest.java index 15ad7a3..8298ad7 100644 --- a/tests/src/cgeo/geocaching/connector/gc/GCConstantsTest.java +++ b/tests/src/cgeo/geocaching/connector/gc/GCConstantsTest.java @@ -8,6 +8,10 @@ import android.text.Html; public class GCConstantsTest extends AndroidTestCase { + // adapt the following after downloading new mock html files + public static final String MOCK_LOGIN_NAME = "JoSaMaJa"; + public static final int MOCK_CACHES_FOUND = 419; + public static void testLocation() { // GC37GFJ assertEquals("Bretagne, France", parseLocation(" In Bretagne, France
")); @@ -22,7 +26,7 @@ public class GCConstantsTest extends AndroidTestCase { public static void testCacheCount() { assertCacheCount(1510, " 1.510 Caches Found"); assertCacheCount(1510, " 1,510 Caches Found"); - assertCacheCount(725, MockedCache.readCachePage("GC2CJPF")); // # of caches found by blafoo at the point of time creating the mocked data + assertCacheCount(MOCK_CACHES_FOUND, MockedCache.readCachePage("GC2CJPF")); } private static void assertCacheCount(final int count, final String html) { -- cgit v1.1 From 39a01a589e85afecd58e138e5f1fe212bc985079 Mon Sep 17 00:00:00 2001 From: Marco Jacob Date: Mon, 11 Mar 2013 10:42:56 +0100 Subject: decrypted hint --- tests/src/cgeo/geocaching/test/mock/GC2CJPF.html | 2 +- tests/src/cgeo/geocaching/test/mock/GC3XX5J.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/src') diff --git a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.html b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.html index 64d5f6b..6321f1d 100644 --- a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.html +++ b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.html @@ -643,7 +643,7 @@ P.S. An warmen Tagen Badesachen und Handtuch mitnehmen. Additional Hints (Decrypt)

- Qnf Svany vfg hagre Fgrvara
+ Das Final ist unter Steinen

Decryption Key

A|B|C|D|E|F|G|H|I|J|K|L|M
-------------------------
N|O|P|Q|R|S|T|U|V|W|X|Y|Z

(letter above equals below, and vice versa)
diff --git a/tests/src/cgeo/geocaching/test/mock/GC3XX5J.html b/tests/src/cgeo/geocaching/test/mock/GC3XX5J.html index e696625..db89925 100644 --- a/tests/src/cgeo/geocaching/test/mock/GC3XX5J.html +++ b/tests/src/cgeo/geocaching/test/mock/GC3XX5J.html @@ -614,7 +614,7 @@ PRINESI SVOJE PISALO / BRING YOUR OWN PEN
Additional Hints (Decrypt)

- Bqznxav xnzra bo gveh / Erzbir gur fgbar jvpu yvrf orfvqr gur envy
+ Odmakni kamen ob tiru / Remove the stone wich lies beside the rail

Decryption Key

A|B|C|D|E|F|G|H|I|J|K|L|M
-------------------------
N|O|P|Q|R|S|T|U|V|W|X|Y|Z

(letter above equals below, and vice versa)
-- cgit v1.1