forked from upstream-mirrors/OpenTracks
merge heads
This commit is contained in:
-5
@@ -128,11 +128,6 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
|
|||||||
if (EndToEndTestUtils.SOLO.waitForText(
|
if (EndToEndTestUtils.SOLO.waitForText(
|
||||||
activityMyTracks.getString(R.string.send_google_choose_account_title), 1,
|
activityMyTracks.getString(R.string.send_google_choose_account_title), 1,
|
||||||
EndToEndTestUtils.SHORT_WAIT_TIME)) {
|
EndToEndTestUtils.SHORT_WAIT_TIME)) {
|
||||||
// Use test account if has.
|
|
||||||
if (EndToEndTestUtils.SOLO.waitForText(GoogleUtils.DETAULT_ACCOUNT, 1,
|
|
||||||
EndToEndTestUtils.SHORT_WAIT_TIME)) {
|
|
||||||
EndToEndTestUtils.SOLO.clickOnText(GoogleUtils.DETAULT_ACCOUNT);
|
|
||||||
}
|
|
||||||
EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), false,
|
EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), false,
|
||||||
true);
|
true);
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -64,7 +64,6 @@ import java.util.Locale;
|
|||||||
public class GoogleUtils {
|
public class GoogleUtils {
|
||||||
public static final String DOCUMENT_NAME_PREFIX = "My Tracks";
|
public static final String DOCUMENT_NAME_PREFIX = "My Tracks";
|
||||||
public static final String SPREADSHEET_NAME = DOCUMENT_NAME_PREFIX + "-" + EndToEndTestUtils.DEFAULTACTIVITY;
|
public static final String SPREADSHEET_NAME = DOCUMENT_NAME_PREFIX + "-" + EndToEndTestUtils.DEFAULTACTIVITY;
|
||||||
public static final String DETAULT_ACCOUNT = "mytrackstest@gmail.com";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the account to access Google Services.
|
* Gets the account to access Google Services.
|
||||||
|
|||||||
Reference in New Issue
Block a user