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:
youtaol
2013-07-12 10:43:51 +08:00
parent a484963572
commit f4ccb8dbd4
94 changed files with 829 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+1 -1
View File
@@ -56,7 +56,7 @@ import junit.framework.Assert;
* @author Youtao Liu
*/
public class EndToEndTestUtils {
public static int emulatorPort = 5556;
public static int emulatorPort = 5554;
// usually 5554.
private static final int ORIENTATION_PORTRAIT = 1;
private static final int ORIENTATION_LANDSCAPE = 0;
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ExportAllAndImportAllTest.java
+2 -2
View File
@@ -43,7 +43,7 @@ public class ExportAllAndImportAllTest extends ActivityInstrumentationTestCase2<
private final static String tracksName = "testTrackName1373523959524";
private final static String maxAltitude = "33.3";
private final static String minAltitude = "33.3";
private final static String minAltitude = "22.2";
public ExportAllAndImportAllTest() {
super(TrackListActivity.class);
@@ -54,7 +54,7 @@ public class ExportAllAndImportAllTest extends ActivityInstrumentationTestCase2<
super.setUp();
instrumentation = getInstrumentation();
activityMyTracks = getActivity();
EndToEndTestUtils.setupForDebug(instrumentation, activityMyTracks);
EndToEndTestUtils.setupForAllTest(instrumentation, activityMyTracks);
trackNumber = EndToEndTestUtils.SOLO.getCurrentViews(ListView.class).get(0).getCount();
EndToEndTestUtils.createTrackIfEmpty(1, true);
}