From ccdd33bcca8acb2bd6df9ae6c05621e60513e915 Mon Sep 17 00:00:00 2001
From: youtaol <youtaol@localhost>
Date: Wed, 7 Nov 2012 17:59:09 +0800
Subject: [PATCH] Fix errors of e2e tests.

---
 .../apps/mytracks/endtoendtest/ExportAndImportTest.java     | 2 --
 .../android/apps/mytracks/endtoendtest/MenuItemsTest.java   | 1 -
 .../apps/mytracks/endtoendtest/PauseRecordingTest.java      | 6 ++++++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
index 921497818..33d71eae8 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
@@ -57,8 +57,6 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
     // Create a empty track.
     EndToEndTestUtils.createSimpleTrack(0, true);
     instrumentation.waitForIdleSync();
-    EndToEndTestUtils.SOLO.goBack();
-    instrumentation.waitForIdleSync();
     checkExportAndImport();
   }
   
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
index ad13ba386..1c303a552 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
@@ -86,7 +86,6 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
    */
   public void testSearch() {
     EndToEndTestUtils.createSimpleTrack(0, true);
-    EndToEndTestUtils.SOLO.goBack();
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_search), true);
     EndToEndTestUtils.enterTextAvoidSoftKeyBoard(0, EndToEndTestUtils.trackName);
     sendKeys(KeyEvent.KEYCODE_ENTER);
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/PauseRecordingTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/PauseRecordingTest.java
index ff422c55f..15115c9ac 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/PauseRecordingTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/PauseRecordingTest.java
@@ -144,5 +144,11 @@ public class PauseRecordingTest extends ActivityInstrumentationTestCase2<TrackLi
       assertEquals(expectResumeNumber, numberOfResumePoint);
     }
   }
+  
+  @Override
+  protected void tearDown() throws Exception {
+    EndToEndTestUtils.SOLO.finishOpenedActivities();
+    super.tearDown();
+  }
 
 }