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

merge conflicts, update ids

Browse Source
This commit is contained in:
Jimmy Shih
2012-08-31 15:08:39 -07:00
parent 544eb798b0
commit af4a24053b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
+1 -1
View File
@@ -114,7 +114,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
EndToEndTestUtils EndToEndTestUtils
.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true); .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
instrumentation.waitForIdleSync(); instrumentation.waitForIdleSync();
assertFalse(EndToEndTestUtils.SOLO.getCurrentActivity().findViewById(R.id.track_list_stop_recording_button).isEnabled()); assertFalse(EndToEndTestUtils.SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop).isEnabled());
} }
@Override @Override
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+5 -5
View File
@@ -383,7 +383,7 @@ public class EndToEndTestUtils {
* Starts recoding track. * Starts recoding track.
*/ */
static void startRecording() { static void startRecording() {
View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_record_track_button); View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_record);
if(startButton != null && startButton.isShown()) { if(startButton != null && startButton.isShown()) {
SOLO.clickOnView(startButton); SOLO.clickOnView(startButton);
} else if (hasActionBar) { } else if (hasActionBar) {
@@ -416,7 +416,7 @@ public class EndToEndTestUtils {
* Pauses recoding track. * Pauses recoding track.
*/ */
static void pauseRecording() { static void pauseRecording() {
View pauseButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_record_track_button); View pauseButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_record);
if(pauseButton != null && pauseButton.isShown()) { if(pauseButton != null && pauseButton.isShown()) {
SOLO.clickOnView(pauseButton); SOLO.clickOnView(pauseButton);
} else if (hasActionBar) { } else if (hasActionBar) {
@@ -434,7 +434,7 @@ public class EndToEndTestUtils {
* Resume recoding track. * Resume recoding track.
*/ */
static void resumeRecording() { static void resumeRecording() {
View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_record_track_button); View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_record);
if(startButton != null && startButton.isShown()) { if(startButton != null && startButton.isShown()) {
SOLO.clickOnView(startButton); SOLO.clickOnView(startButton);
} else if (hasActionBar) { } else if (hasActionBar) {
@@ -454,7 +454,7 @@ public class EndToEndTestUtils {
* @return true if it is under recording. * @return true if it is under recording.
*/ */
static boolean isUnderRecording() { static boolean isUnderRecording() {
View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_record_track_button); View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_record);
if(startButton != null && startButton.isShown()) { if(startButton != null && startButton.isShown()) {
return false; return false;
} }
@@ -479,7 +479,7 @@ public class EndToEndTestUtils {
* @param isSave true means should save this track * @param isSave true means should save this track
*/ */
static void stopRecording(boolean isSave) { static void stopRecording(boolean isSave) {
View stopButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_stop_recording_button); View stopButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop);
if(stopButton != null && stopButton.isShown() ) { if(stopButton != null && stopButton.isShown() ) {
SOLO.clickOnView(stopButton); SOLO.clickOnView(stopButton);
} else if (hasActionBar) { } else if (hasActionBar) {