diff options
| author | Torsten Keil <github@torsten-keil.net> | 2012-02-22 21:00:30 +0100 |
|---|---|---|
| committer | Torsten Keil <github@torsten-keil.net> | 2012-02-22 21:00:30 +0100 |
| commit | c1418a6ef61c6700f0850fdc5c10f73d96afa522 (patch) | |
| tree | 475448d2b6805c2f40c15dcbef48c00f5e1b85eb /tests/src | |
| parent | a5b5204d53489e0d257ffd5fcb1a41eae9e47835 (diff) | |
| download | cgeo-c1418a6ef61c6700f0850fdc5c10f73d96afa522.zip cgeo-c1418a6ef61c6700f0850fdc5c10f73d96afa522.tar.gz cgeo-c1418a6ef61c6700f0850fdc5c10f73d96afa522.tar.bz2 | |
Improved pattern to respect dot as thousands separator too
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/cgeo/geocaching/GCConstantsTest.java | 5 | ||||
| -rw-r--r-- | tests/src/cgeo/geocaching/cgBaseTest.java | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/src/cgeo/geocaching/GCConstantsTest.java b/tests/src/cgeo/geocaching/GCConstantsTest.java index 41b7dcb..e2e5420 100644 --- a/tests/src/cgeo/geocaching/GCConstantsTest.java +++ b/tests/src/cgeo/geocaching/GCConstantsTest.java @@ -23,9 +23,12 @@ public class GCConstantsTest extends AndroidTestCase { assertCacheCount(1510, "<strong><img src=\"/images/icons/icon_smile.png\" title=\"Caches Found\" /> 1,510 · <img src=\"/images/challenges/types/sm/challenge.png\" title=\"Challenges Completed\" /> 2</strong>"); assertCacheCount(67, "<strong><img title=\"Caches Found\" src=\"/images/icons/icon_smile.png\"/> 67</strong>"); assertCacheCount(1067, "<strong><img title=\"Caches Found\" src=\"/images/icons/icon_smile.png\"/> 1,067</strong>"); + // now checking usage of "." as thousands separator + assertCacheCount(1510, "<strong><img src=\"/images/icons/icon_smile.png\" title=\"Caches Found\" /> 1.510 · <img src=\"/images/challenges/types/sm/challenge.png\" title=\"Challenges Completed\" /> 2</strong>"); + assertCacheCount(1067, "<strong><img title=\"Caches Found\" src=\"/images/icons/icon_smile.png\"/> 1.067</strong>"); } private static void assertCacheCount(final int count, final String html) { - assertEquals(count, Integer.parseInt(BaseUtils.getMatch(html, GCConstants.PATTERN_CACHES_FOUND, true, "0").replaceAll(",", ""))); + assertEquals(count, Integer.parseInt(BaseUtils.getMatch(html, GCConstants.PATTERN_CACHES_FOUND, true, "0").replaceAll("[,\\.]", ""))); } } diff --git a/tests/src/cgeo/geocaching/cgBaseTest.java b/tests/src/cgeo/geocaching/cgBaseTest.java index e91005c..7181d4f 100644 --- a/tests/src/cgeo/geocaching/cgBaseTest.java +++ b/tests/src/cgeo/geocaching/cgBaseTest.java @@ -22,7 +22,7 @@ public class cgBaseTest extends AndroidTestCase { assertEquals("blafoo", BaseUtils.getMatch(page, GCConstants.PATTERN_LOGIN_NAME, true, "???")); // TODO blafoo reactivate // assertEquals("Premium Member", BaseUtils.getMatch(page, GCConstants.PATTERN_MEMBER_STATUS, true, "???")); - int cachesFound = Integer.parseInt(BaseUtils.getMatch(page, GCConstants.PATTERN_CACHES_FOUND, true, "0")); + int cachesFound = Integer.parseInt(BaseUtils.getMatch(page, GCConstants.PATTERN_CACHES_FOUND, true, "0").replaceAll("[,\\.]", "")); assertTrue(cachesFound >= 491); } |