diff options
Diffstat (limited to 'tests')
7 files changed, 19 insertions, 19 deletions
diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java index f218518..960ddb6 100644 --- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java +++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java @@ -3,7 +3,7 @@ package cgeo.geocaching; import cgeo.CGeoTestCase; import cgeo.geocaching.connector.ConnectorFactory; import cgeo.geocaching.connector.gc.GCParser; -import cgeo.geocaching.connector.gc.Login; +import cgeo.geocaching.connector.gc.GCLogin; import cgeo.geocaching.connector.gc.Tile; import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.enumerations.LiveMapStrategy.Strategy; @@ -51,7 +51,7 @@ public class cgeoApplicationTest extends CGeoTestCase { @SuppressWarnings("static-method") @SmallTest public void testPreconditions() { - assertEquals(StatusCode.NO_ERROR, Login.login()); + assertEquals(StatusCode.NO_ERROR, GCLogin.login()); } /** @@ -143,7 +143,7 @@ public class cgeoApplicationTest extends CGeoTestCase { // restore user and password TestSettings.setLogin(login.left, login.right); Settings.setMemberStatus(memberStatus); - Login.login(); + GCLogin.login(); } } @@ -295,7 +295,7 @@ public class cgeoApplicationTest extends CGeoTestCase { final GC2CJPF mockedCache = new GC2CJPF(); deleteCacheFromDB(mockedCache.getGeocode()); - final String[] tokens = Login.getMapTokens(); + final String[] tokens = GCLogin.getMapTokens(); final Viewport viewport = new Viewport(mockedCache, 0.003, 0.003); // check coords for DETAILED @@ -417,7 +417,7 @@ public class cgeoApplicationTest extends CGeoTestCase { private static void deleteCacheFromDBAndLogout(String geocode) { deleteCacheFromDB(geocode); - Login.logout(); + GCLogin.logout(); // Modify login data to avoid an automatic login again TestSettings.setLogin("c:geo", "c:geo"); Settings.setMemberStatus("Basic member"); diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java index d3e7a27..b688ed6 100644 --- a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java +++ b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java @@ -20,9 +20,9 @@ public class GCConnectorTest extends AbstractResourceInstrumentationTestCase { // set up settings required for test TestSettings.setExcludeMine(false); Settings.setCacheType(CacheType.ALL); - Login.login(); + GCLogin.login(); - final String[] tokens = Login.getMapTokens(); + final String[] tokens = GCLogin.getMapTokens(); { final Viewport viewport = new Viewport(new Geopoint("N 52° 25.369 E 9° 35.499"), new Geopoint("N 52° 25.600 E 9° 36.200")); diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConstantsTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConstantsTest.java index 40062f1..60b8011 100644 --- a/tests/src/cgeo/geocaching/connector/gc/GCConstantsTest.java +++ b/tests/src/cgeo/geocaching/connector/gc/GCConstantsTest.java @@ -45,10 +45,10 @@ public class GCConstantsTest extends AndroidTestCase { */ public static void testCacheCountOnline() { - Login.logout(); - Login.setActualCachesFound(0); - Login.login(); - assertTrue(Login.getActualCachesFound() > 0); + GCLogin.logout(); + GCLogin.setActualCachesFound(0); + GCLogin.login(); + assertTrue(GCLogin.getActualCachesFound() > 0); } public static void testConstants() { diff --git a/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java b/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java index 1e4b527..09139f2 100644 --- a/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java +++ b/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java @@ -1,6 +1,6 @@ package cgeo.geocaching.test.mock; -import cgeo.geocaching.connector.gc.Login; +import cgeo.geocaching.connector.gc.GCLogin; import cgeo.geocaching.enumerations.CacheSize; import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.enumerations.LogType; @@ -86,7 +86,7 @@ public class GC1ZXX2 extends MockedCache { @Override public Date getHiddenDate() { try { - return Login.parseGcCustomDate("16/10/2009", getDateFormat()); + return GCLogin.parseGcCustomDate("16/10/2009", getDateFormat()); } catch (ParseException e) { // intentionally left blank } diff --git a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java index 9ca8552..c125422 100644 --- a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java +++ b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java @@ -1,6 +1,6 @@ package cgeo.geocaching.test.mock; -import cgeo.geocaching.connector.gc.Login; +import cgeo.geocaching.connector.gc.GCLogin; import cgeo.geocaching.enumerations.CacheSize; import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.enumerations.LogType; @@ -121,7 +121,7 @@ public class GC2CJPF extends MockedCache { @Override public Date getHiddenDate() { try { - return Login.parseGcCustomDate("31/07/2010", getDateFormat()); + return GCLogin.parseGcCustomDate("31/07/2010", getDateFormat()); } catch (ParseException e) { // intentionally left blank } diff --git a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java index e85c3b9..a1337cd 100644 --- a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java +++ b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java @@ -2,7 +2,7 @@ package cgeo.geocaching.test.mock; import cgeo.geocaching.Image; import cgeo.geocaching.Trackable; -import cgeo.geocaching.connector.gc.Login; +import cgeo.geocaching.connector.gc.GCLogin; import cgeo.geocaching.enumerations.CacheSize; import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.enumerations.LogType; @@ -89,7 +89,7 @@ public class GC2JVEH extends MockedCache { @Override public Date getHiddenDate() { try { - return Login.parseGcCustomDate("28/11/2010", getDateFormat()); + return GCLogin.parseGcCustomDate("28/11/2010", getDateFormat()); } catch (ParseException e) { // intentionally left blank } diff --git a/tests/src/cgeo/geocaching/test/mock/GC3XX5J.java b/tests/src/cgeo/geocaching/test/mock/GC3XX5J.java index ae3c87d..e9db12d 100644 --- a/tests/src/cgeo/geocaching/test/mock/GC3XX5J.java +++ b/tests/src/cgeo/geocaching/test/mock/GC3XX5J.java @@ -1,6 +1,6 @@ package cgeo.geocaching.test.mock; -import cgeo.geocaching.connector.gc.Login; +import cgeo.geocaching.connector.gc.GCLogin; import cgeo.geocaching.enumerations.CacheSize; import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.enumerations.LogType; @@ -86,7 +86,7 @@ public class GC3XX5J extends MockedCache { @Override public Date getHiddenDate() { try { - return Login.parseGcCustomDate("2012-10-01", getDateFormat()); + return GCLogin.parseGcCustomDate("2012-10-01", getDateFormat()); } catch (ParseException e) { // intentionally left blank } |