diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-01-07 21:54:54 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-01-07 21:54:54 +0100 |
| commit | 1515e2fd5a136c71344ad06664c1a347846eb0ae (patch) | |
| tree | b4ba0861840831be085ca3c5860492326d7deadf /tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java | |
| parent | 3fb0e5f2d74b851836473a780a593cc7893cca9a (diff) | |
| download | cgeo-1515e2fd5a136c71344ad06664c1a347846eb0ae.zip cgeo-1515e2fd5a136c71344ad06664c1a347846eb0ae.tar.gz cgeo-1515e2fd5a136c71344ad06664c1a347846eb0ae.tar.bz2 | |
Refactoring: rename cgTrackable into Trackable
Diffstat (limited to 'tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java')
| -rw-r--r-- | tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java b/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java index 4c2655d..0c2c997 100644 --- a/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java +++ b/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java @@ -3,7 +3,7 @@ package cgeo.geocaching.connector.gc; import cgeo.geocaching.LogEntry; import cgeo.geocaching.TrackableLog; import cgeo.geocaching.cgImage; -import cgeo.geocaching.cgTrackable; +import cgeo.geocaching.Trackable; import cgeo.geocaching.enumerations.LogType; import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase; import cgeo.geocaching.test.R; @@ -29,20 +29,20 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase { } public void testTrackable() { - final cgTrackable trackable = getTB2R124(); + final Trackable trackable = getTB2R124(); assertEquals("TB2R124", trackable.getGeocode()); assertEquals("Bor. Dortmund - FC Schalke 04", trackable.getName()); assertEquals("Spiridon Lui", trackable.getOwner()); } public void testTrackableWithoutImage() { - final cgTrackable trackable = getTB2R124(); + final Trackable trackable = getTB2R124(); assertNull(trackable.getImage()); assertNotNull(trackable.getDetails()); } public void testTrackableWithLogImages() { - final cgTrackable trackable = getTBXATG(); + final Trackable trackable = getTBXATG(); assertEquals("TBXATG", trackable.getGeocode()); List<LogEntry> log = trackable.getLogs(); @@ -72,7 +72,7 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase { } public void testParseTrackableWithoutReleaseDate() { - cgTrackable trackable = parseTrackable(R.raw.tb14wfv); + Trackable trackable = parseTrackable(R.raw.tb14wfv); assertNotNull(trackable); assertEquals("The Brickster", trackable.getName()); assertEquals("Adrian C", trackable.getOwner()); @@ -85,7 +85,7 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase { } public void testParseRelativeLink() { - final cgTrackable trackable = parseTrackable(R.raw.tb4cwjx); + final Trackable trackable = parseTrackable(R.raw.tb4cwjx); assertNotNull(trackable); assertEquals("The Golden Lisa", trackable.getName()); final String goal = trackable.getGoal(); @@ -94,13 +94,13 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase { assertTrue(goal.contains("href=\"http://www.geocaching.com/seek/cache_details.aspx?wp=GC3B7PD#\"")); } - private cgTrackable parseTrackable(int trackablePage) { + private Trackable parseTrackable(int trackablePage) { String pageContent = getFileContent(trackablePage); return GCParser.parseTrackable(BaseUtils.replaceWhitespace(pageContent), null); } public void testParseMarkMissing() { - final cgTrackable trackable = parseTrackable(R.raw.tb29ggq); + final Trackable trackable = parseTrackable(R.raw.tb29ggq); assertNotNull(trackable); final List<LogEntry> logs = trackable.getLogs(); assertNotNull(logs); @@ -109,16 +109,16 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase { assertEquals(LogType.MARKED_MISSING, marked.type); } - private cgTrackable getTB2R124() { + private Trackable getTB2R124() { return parseTrackable(R.raw.trackable_tb2r124); } - private cgTrackable getTBXATG() { + private Trackable getTBXATG() { return parseTrackable(R.raw.trackable_tbxatg); } public void testParseTrackableNotExisting() { - cgTrackable trackable = GCParser.parseTrackable(getFileContent(R.raw.tb_not_existing), null); + Trackable trackable = GCParser.parseTrackable(getFileContent(R.raw.tb_not_existing), null); assertNull(trackable); } |
