diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-11-10 00:10:46 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-11-10 00:10:46 +0100 |
| commit | dd6abd1628e020070d1366691ac69f6601304b35 (patch) | |
| tree | b973f9eb916d6bc241a19832d76a64d4f66824aa /tests | |
| parent | 686151a7f9eb8c430edb8a01d8f75d915d8460b2 (diff) | |
| parent | c467e0369916d5462f00bc43dc494740c4b99812 (diff) | |
| download | cgeo-dd6abd1628e020070d1366691ac69f6601304b35.zip cgeo-dd6abd1628e020070d1366691ac69f6601304b35.tar.gz cgeo-dd6abd1628e020070d1366691ac69f6601304b35.tar.bz2 | |
Merge branch 'issue-4470' into upstream
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/cgeo/geocaching/SettingsTest.java | 3 | ||||
| -rw-r--r-- | tests/src/cgeo/geocaching/utils/TextUtilsTest.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/src/cgeo/geocaching/SettingsTest.java b/tests/src/cgeo/geocaching/SettingsTest.java index b722292..c210ab7 100644 --- a/tests/src/cgeo/geocaching/SettingsTest.java +++ b/tests/src/cgeo/geocaching/SettingsTest.java @@ -2,7 +2,6 @@ package cgeo.geocaching; import static org.assertj.core.api.Assertions.assertThat; -import cgeo.geocaching.connector.gc.GCConstants; import cgeo.geocaching.maps.mapsforge.MapsforgeMapProvider; import cgeo.geocaching.settings.Settings; @@ -27,7 +26,7 @@ public class SettingsTest extends ActivityInstrumentationTestCase2<MainActivity> public static void testSettings() { // unfortunately, several other tests depend on being a premium member and will fail if run by a basic member - assertThat(Settings.getGCMemberStatus()).isEqualTo(GCConstants.MEMBER_STATUS_PM); + assertThat(Settings.isGCPremiumMember()).isTrue(); } public static void testDeviceHasNormalLogin() { diff --git a/tests/src/cgeo/geocaching/utils/TextUtilsTest.java b/tests/src/cgeo/geocaching/utils/TextUtilsTest.java index 709fcc4..bc49c30 100644 --- a/tests/src/cgeo/geocaching/utils/TextUtilsTest.java +++ b/tests/src/cgeo/geocaching/utils/TextUtilsTest.java @@ -14,7 +14,7 @@ public class TextUtilsTest extends AndroidTestCase { public static void testRegEx() { final String page = MockedCache.readCachePage("GC2CJPF"); assertThat(TextUtils.getMatch(page, GCConstants.PATTERN_LOGIN_NAME, true, "???")).isEqualTo(GCConstantsTest.MOCK_LOGIN_NAME); - assertThat(page.contains("id=\"ctl00_hlRenew\"") || GCConstants.MEMBER_STATUS_PM.equals(TextUtils.getMatch(page, GCConstants.PATTERN_MEMBER_STATUS, true, "???"))).isTrue(); + assertThat(page.contains("id=\"ctl00_hlRenew\"") || GCConstants.MEMBER_STATUS_PREMIUM.equals(TextUtils.getMatch(page, GCConstants.PATTERN_MEMBER_STATUS, true, "???"))).isTrue(); } public static void testReplaceWhitespaces() { |