karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2012-03-14 15:17:55 -07:00
parent ead6249580 f3112c3acb
commit 3ab54c7d67
3 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest/src/com/google/android/apps/mytracks/ChartActivityTest.java
+2 -2
View File
@@ -64,7 +64,7 @@ public class ChartActivityTest extends ActivityInstrumentationTestCase2<ChartAct
} }
/** /**
* Tests {@link ChartActivity#zoomIn()} and {@link ChartActivity#zoomOut()}. * Tests zooming in and zooming out.
*/ */
public void testZoomInAndZoomOut() { public void testZoomInAndZoomOut() {
currentZoomLevel = chartActivity.getChartView().getZoomLevel(); currentZoomLevel = chartActivity.getChartView().getZoomLevel();
@@ -382,7 +382,7 @@ public class ChartActivityTest extends ActivityInstrumentationTestCase2<ChartAct
* Helper method to test fillDataPoint. * Helper method to test fillDataPoint.
* *
* @param location location to fill * @param location location to fill
* @param operation a flag to do some operations * @param isNeedClear true to clear the track points
* @return data of this location * @return data of this location
*/ */
private double[] fillDataPointTestHelper(Location location, boolean isNeedClear) { private double[] fillDataPointTestHelper(Location location, boolean isNeedClear) {
MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/SendRequestTest.java
+2 -2
View File
@@ -171,7 +171,7 @@ public class SendRequestTest extends AndroidTestCase {
} }
/** /**
* Tests {@link SendRequest#SendRequest(Parcel in)} when all values are true. * Tests SendRequest.CREATOR.createFromParcel when all values are true.
*/ */
public void testCreateFromParcel_true() { public void testCreateFromParcel_true() {
Parcel sourceParcel = Parcel.obtain(); Parcel sourceParcel = Parcel.obtain();
@@ -208,7 +208,7 @@ public class SendRequestTest extends AndroidTestCase {
} }
/** /**
* Tests {@link SendRequest#SendRequest(Parcel in)} when all values are false. * Tests SendRequest.CREATOR.createFromParcel when all values are false.
*/ */
public void testCreateFromParcel_false() { public void testCreateFromParcel_false() {
Parcel sourceParcel = Parcel.obtain(); Parcel sourceParcel = Parcel.obtain();
MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java
+7 -23
View File
@@ -50,10 +50,7 @@ public class UploadServiceChooserActivityTest extends
} }
/** /**
* Tests the logic to control display all send options. This test cover code * Tests the logic to display all options.
* in method {@link UploadServiceChooserActivity#onCreateDialog(int)},
* {@link UploadServiceChooserActivity#updateStateBySendRequest()} and
* {@link UploadServiceChooserActivity#updateStateBySelection()}.
*/ */
public void testOnCreateDialog_displayAll() { public void testOnCreateDialog_displayAll() {
// Initials activity to display all send items. // Initials activity to display all send items.
@@ -90,10 +87,7 @@ public class UploadServiceChooserActivityTest extends
} }
/** /**
* Tests the logic to check the send to Google Maps option. This test cover * Tests the logic to display only the "Send to Google Maps" option.
* code in method {@link UploadServiceChooserActivity#onCreateDialog(int)},
* {@link UploadServiceChooserActivity#updateStateBySendRequest()} and
* {@link UploadServiceChooserActivity#updateStateBySelection()}.
*/ */
public void testOnCreateDialog_displayOne() { public void testOnCreateDialog_displayOne() {
// Initials activity to display all send items. // Initials activity to display all send items.
@@ -119,10 +113,7 @@ public class UploadServiceChooserActivityTest extends
} }
/** /**
* Tests the logic to control display none. This test cover code in method * Tests the logic to display no option.
* {@link UploadServiceChooserActivity#onCreateDialog(int)},
* {@link UploadServiceChooserActivity#updateStateBySendRequest()} and
* {@link UploadServiceChooserActivity#updateStateBySelection()}.
*/ */
public void testOnCreateDialog_displayNone() { public void testOnCreateDialog_displayNone() {
initialActivity(false, false, false); initialActivity(false, false, false);
@@ -193,11 +184,8 @@ public class UploadServiceChooserActivityTest extends
/** /**
* Tests the logic of saveState when click send button. This test cover code * Tests the logic of saveState when click send button. This test cover code
* in method {@link UploadServiceChooserActivity#saveState()}, * in method {@link UploadServiceChooserActivity#initState()} and
* {@link UploadServiceChooserActivity#initState()} , * {@link UploadServiceChooserActivity#saveState()},
* {@link UploadServiceChooserActivity#sendMaps()},
* {@link UploadServiceChooserActivity#sendFusionTables()}, and
* {@link UploadServiceChooserActivity#sendDocs()}.
*/ */
public void testOnCreateDialog_saveState() { public void testOnCreateDialog_saveState() {
initialActivity(true, true, true); initialActivity(true, true, true);
@@ -228,12 +216,8 @@ public class UploadServiceChooserActivityTest extends
/** /**
* Tests the logic of startNextActivity when click send button. This test * Tests the logic of startNextActivity when click send button. This test
* cover code in method * cover code in method {@link UploadServiceChooserActivity#initState()} and
* {@link UploadServiceChooserActivity#startNextActivity()} , * {@link UploadServiceChooserActivity#startNextActivity()}.
* {@link UploadServiceChooserActivity#initState()} ,
* {@link UploadServiceChooserActivity#sendMaps()},
* {@link UploadServiceChooserActivity#sendFusionTables()}, and
* {@link UploadServiceChooserActivity#sendDocs()}.
*/ */
public void testOnCreateDialog_startNextActivity() { public void testOnCreateDialog_startNextActivity() {
initialActivity(true, true, true); initialActivity(true, true, true);