From 0b6250686dc35f8d2e592b0626f2d79059ccdc9a Mon Sep 17 00:00:00 2001
From: youtaol <youtaol@localhost>
Date: Wed, 19 Sep 2012 18:58:01 +0800
Subject: [PATCH] Change code style to test the voice frequency and split
 frequency menus.

---
 .../mytracks/endtoendtest/MenuItemsTest.java  | 42 +++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)

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 9c84e2aff..32d365496 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
@@ -153,40 +153,38 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
     }
     return null;
   }
-  
-  /**
-   * Checks the voice frequency and split frequency menus when no track is
-   * recording.
-   */
-  public void testFrequencyMenu_noRecording() {
-    EndToEndTestUtils.createTrackIfEmpty(0, false);
-    assertFalse(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_voice_frequency), false));
-    assertFalse(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_split_frequency), false));
 
+  /**
+   * Checks the voice frequency and split frequency menus during recording. When
+   * recording, they should be in both the menu and the recording settings. When
+   * not recording, they should only be in the recording settings.
+   */
+  public void testFrequencyMenu() {
+    EndToEndTestUtils.startRecording();
+    
+    assertTrue(EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_voice_frequency), false));
+    assertTrue(EndToEndTestUtils.findMenuItem(
+        activityMyTracks.getString(R.string.menu_split_frequency), false));
+    
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_recording));
-
     assertTrue(EndToEndTestUtils.SOLO.searchText(activityMyTracks.getString(R.string.menu_voice_frequency), 1, true, true));
     assertTrue(EndToEndTestUtils.SOLO.searchText(activityMyTracks.getString(R.string.menu_split_frequency), 1, true, true));
-  }
+    EndToEndTestUtils.SOLO.goBack();
+    EndToEndTestUtils.SOLO.goBack();
 
-  /**
-   * Checks the voice frequency and split frequency menus during recording.
-   */
-  public void testFrequencyMenu_underRecording() {
-    EndToEndTestUtils.startRecording();
-    assertTrue(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_voice_frequency), false));
-    assertTrue(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_split_frequency), false));
     EndToEndTestUtils.stopRecording(true);
     
     assertFalse(EndToEndTestUtils.findMenuItem(
         activityMyTracks.getString(R.string.menu_voice_frequency), false));
     assertFalse(EndToEndTestUtils.findMenuItem(
         activityMyTracks.getString(R.string.menu_split_frequency), false));
+    
+    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
+    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_recording));
+    assertTrue(EndToEndTestUtils.SOLO.searchText(activityMyTracks.getString(R.string.menu_voice_frequency), 1, true, true));
+    assertTrue(EndToEndTestUtils.SOLO.searchText(activityMyTracks.getString(R.string.menu_split_frequency), 1, true, true));
   }
 
   @Override