From afcccdf9d8b1935c4b40049c5e0b09427abbb1dd Mon Sep 17 00:00:00 2001
From: youtaol <youtaol@localhost>
Date: Tue, 18 Sep 2012 20:46:11 +0800
Subject: [PATCH] Move testFrequencyMenu from CreateAndSendTrackTest to
 MenuItemsTest and make some change as the new UI.

---
 .../endtoendtest/CreateAndSendTrackTest.java  | 17 ---------
 .../mytracks/endtoendtest/MenuItemsTest.java  | 35 +++++++++++++++++++
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
index cd523ccfe..bdc25ef4e 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
@@ -132,23 +132,6 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
     assertTrue(EndToEndTestUtils.SOLO.searchText(newTrackName));
     assertTrue(EndToEndTestUtils.SOLO.searchText(newDesc));
   }
-  
-  /**
-   * Checks the voice frequency and split frequency menus.
-   */
-  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.stopRecording(true);
-    
-    assertTrue(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_voice_frequency), false));
-    assertTrue(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_split_frequency), false));
-  }
 
   /**
    * Creates one track with a two locations, a way point and a statistics point.
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 e43c505c8..c30c040fd 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
@@ -151,6 +151,41 @@ 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));
+
+    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));
+  }
+
+  /**
+   * 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));
+  }
 
   @Override
   protected void tearDown() throws Exception {