From e4481ca3e68517e5afa04bff0c56da82a4868ce0 Mon Sep 17 00:00:00 2001 From: youtaol Date: Wed, 25 Apr 2012 15:20:41 +0800 Subject: [PATCH] Change code style, remove useless method of MyTracksSmokeTest --- .../mytracks/smoketest/MyTracksSmokeTest.java | 125 +++++++----------- .../mytracks/smoketest/SmokeTestUtils.java | 15 ++- 2 files changed, 60 insertions(+), 80 deletions(-) diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/smoketest/MyTracksSmokeTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/smoketest/MyTracksSmokeTest.java index d77235d63..11bc52e26 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/smoketest/MyTracksSmokeTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/smoketest/MyTracksSmokeTest.java @@ -53,9 +53,10 @@ public class MyTracksSmokeTest extends ActivityInstrumentationTestCase2 allViews = solo.getViews(); for (View view : allViews) { if (view instanceof MapView) { - if (isMapMode) { - assertFalse(((MapView) view).isSatellite()); - } else { - assertTrue(((MapView) view).isSatellite()); - } + assertFalse(isMapMode ? ((MapView) view).isSatellite() : !(((MapView) view).isSatellite())); } } instrumentation.waitForIdleSync(); // Switches back. sendKeys(KeyEvent.KEYCODE_MENU); instrumentation.waitForIdleSync(); - if (isMapMode) { - solo.clickOnText(activityMyTracks.getString(R.string.menu_satellite_mode)); - } else { - solo.clickOnText(activityMyTracks.getString(R.string.menu_map_mode)); - } + solo.clickOnText(activityMyTracks.getString(isMapMode ? R.string.menu_satellite_mode + : R.string.menu_map_mode)); isMapMode = !isMapMode; allViews = solo.getViews(); for (View view : allViews) { if (view instanceof MapView) { - if (isMapMode) { - assertFalse(((MapView) view).isSatellite()); - } else { - assertTrue(((MapView) view).isSatellite()); - } + assertFalse(isMapMode ? ((MapView) view).isSatellite() : !(((MapView) view).isSatellite())); } } @@ -451,23 +445,6 @@ public class MyTracksSmokeTest extends ActivityInstrumentationTestCase2 0) { return true; } - return false; + return pathname.getName().indexOf("." + trackKind) > 0; } }; return (new File(filePath)).listFiles(filter); } /** - * Save a track to a kind of file in SD card. + * Saves a track to a kind of file in SD card. * * @param trackKind the kind of track */ - private void saveTrackToSDCard(String trackKind) { + private void saveTrackToSdCard(String trackKind) { deleteExportedFiles(trackKind); instrumentation.waitForIdleSync(); sendKeys(KeyEvent.KEYCODE_MENU); @@ -622,32 +597,34 @@ public class MyTracksSmokeTest extends ActivityInstrumentationTestCase2 currentButtons = solo.getCurrentButtons(); - Button resultButton = null; for (Button button : currentButtons) { - if (((String) button.getText()).equalsIgnoreCase(buttonName)) { return button; } + if (((String) button.getText()).equalsIgnoreCase(buttonName)) { + return button; + } } - return resultButton; + return null; } /** - * Check whether the version of Android is ICS. + * Checks whether an action bar is shown. */ - private void setVersionOfOS() { - // If can find record button without pressing Menu, it should be ICS. + private void setHasActionBar() { + // If can find record button without pressing Menu, it should be an action + // bar. Button startButton = getButtonOnScreen(activityMyTracks.getString(R.string.menu_record_track)); Button stopButton = getButtonOnScreen(activityMyTracks.getString(R.string.menu_stop_recording)); if (startButton != null || stopButton != null) { - ICSFlag = true; + hasActionBar = true; } else { sendKeys(KeyEvent.KEYCODE_MENU); if (solo.searchText(activityMyTracks.getString(R.string.menu_record_track)) || solo.searchText(activityMyTracks.getString(R.string.menu_stop_recording))) { - ICSFlag = false; + hasActionBar = false; } else { fail(); } @@ -656,7 +633,7 @@ public class MyTracksSmokeTest extends ActivityInstrumentationTestCase2