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

Change some code style of EndToEndTestRunner.

Browse Source
This commit is contained in:
youtaol
2012-08-02 10:49:09 +08:00
parent 8796318335
commit d1c2d3df3d
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
-2
View File
@@ -297,8 +297,6 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_markers), true); EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_markers), true);
EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.marker_list_empty_message)); EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.marker_list_empty_message));
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_insert_marker), true); EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_insert_marker), true);
// Rotate when show insert page.
EndToEndTestUtils.rotateAllActivities();
EndToEndTestUtils.enterTextAvoidSoftKeyBoard(0, WAYPOINT_NAME); EndToEndTestUtils.enterTextAvoidSoftKeyBoard(0, WAYPOINT_NAME);
EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_add)); EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_add));
if (EndToEndTestUtils.hasGpsSingal) { if (EndToEndTestUtils.hasGpsSingal) {
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestRunner.java
+3 -3
View File
@@ -32,11 +32,11 @@ public class EndToEndTestRunner extends InstrumentationTestRunner {
@Override @Override
public void onCreate(Bundle arguments) { public void onCreate(Bundle arguments) {
try { try {
EndToEndTestUtils.ANDROID_LOCAL_PORT = Integer.parseInt(arguments.getString("port")); EndToEndTestUtils.emulatorPort = Integer.parseInt(arguments.getString("port"));
} catch (Exception e) { } catch (Exception e) {
Log.d(EndToEndTestUtils.LOG_TAG, "Unable to get port parameter, use default value." + EndToEndTestUtils.ANDROID_LOCAL_PORT); Log.e(EndToEndTestUtils.LOG_TAG, "Unable to get port parameter, use default value." + EndToEndTestUtils.emulatorPort, e);
} }
Log.d(EndToEndTestUtils.LOG_TAG, "Use port number when run test on emulator:" + EndToEndTestUtils.ANDROID_LOCAL_PORT); Log.d(EndToEndTestUtils.LOG_TAG, "Use port number when run test on emulator:" + EndToEndTestUtils.emulatorPort);
super.onCreate(arguments); super.onCreate(arguments);
} }
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+11 -2
View File
@@ -41,6 +41,7 @@ import java.net.Socket;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
/** /**
* Provides utilities to smoke test. * Provides utilities to smoke test.
@@ -51,7 +52,7 @@ public class EndToEndTestUtils {
private static final String ANDROID_LOCAL_IP = "10.0.2.2"; private static final String ANDROID_LOCAL_IP = "10.0.2.2";
// usually 5554. // usually 5554.
static int ANDROID_LOCAL_PORT = 5554; public static int emulatorPort = 5554;
private static final int ORIENTATION_PORTRAIT = 1; private static final int ORIENTATION_PORTRAIT = 1;
private static final int ORIENTATION_LANDSCAPE = 0; private static final int ORIENTATION_LANDSCAPE = 0;
@@ -135,6 +136,14 @@ public class EndToEndTestUtils {
* Checks the language, then sets the fields with right string. * Checks the language, then sets the fields with right string.
*/ */
private static void checkLanguage() { private static void checkLanguage() {
Locale locale = null;
Configuration config=null;
config = activityMytracks.getBaseContext().getResources().getConfiguration();
locale = new Locale("en");
Locale.setDefault(locale);
config.locale = locale;
deviceLanguage = instrumentation.getContext().getResources().getConfiguration().locale.getLanguage(); deviceLanguage = instrumentation.getContext().getResources().getConfiguration().locale.getLanguage();
if (RELATIVE_STARTTIME_POSTFIX_MULTILINGUAL.get(deviceLanguage) != null) { if (RELATIVE_STARTTIME_POSTFIX_MULTILINGUAL.get(deviceLanguage) != null) {
RELATIVE_STARTTIME_POSTFIX = RELATIVE_STARTTIME_POSTFIX_MULTILINGUAL.get(deviceLanguage); RELATIVE_STARTTIME_POSTFIX = RELATIVE_STARTTIME_POSTFIX_MULTILINGUAL.get(deviceLanguage);
@@ -166,7 +175,7 @@ public class EndToEndTestUtils {
PrintStream out = null; PrintStream out = null;
Socket socket = null; Socket socket = null;
try { try {
socket = new Socket(ANDROID_LOCAL_IP, ANDROID_LOCAL_PORT); socket = new Socket(ANDROID_LOCAL_IP, emulatorPort);
out = new PrintStream(socket.getOutputStream()); out = new PrintStream(socket.getOutputStream());
float longitude = START_LONGITUDE; float longitude = START_LONGITUDE;
float latitude = START_LATITUDE; float latitude = START_LATITUDE;