upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-03 09:53:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge heads

Browse Source
This commit is contained in:
youtaol
2012-06-25 11:08:12 +08:00
parent b337da3719
commit 1c20addf6d
122 changed files with 854 additions and 1252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
+51 -2
View File
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.endtoendtest;
import com.google.android.apps.mytracks.TrackListActivity;
import com.google.android.maps.mytracks.R;
import android.annotation.TargetApi;
import android.app.Instrumentation;
import android.test.ActivityInstrumentationTestCase2;
import android.view.KeyEvent;
@@ -38,6 +39,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
private Instrumentation instrumentation;
private TrackListActivity activityMyTracks;
@TargetApi(8)
public CreateAndSendTrackTest() {
super(TrackListActivity.class);
}
@@ -51,9 +53,9 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
}
/**
* Creates a track with markers and the setting to send to google.
* Does not check any service and try to send to google.
*/
public void testCreateAndSendTrack() {
public void testCreateAndSendTrack_notSend() {
EndToEndTestUtils.createTrackIfEmpty(1, false);
instrumentation.waitForIdleSync();
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_send_google), true);
@@ -84,6 +86,53 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
.getString(R.string.send_google_no_service_selected)));
// Stop here for do not really send.
}
/**
* Check all services and send to google.
*/
public void testCreateAndSendTrack_Send() {
EndToEndTestUtils.createTrackIfEmpty(1, false);
instrumentation.waitForIdleSync();
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_send_google), true);
EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.send_google_title));
ArrayList<CheckBox> checkBoxs = EndToEndTestUtils.SOLO.getCurrentCheckBoxes();
for (int i = 0; i < checkBoxs.size(); i++) {
if (!checkBoxs.get(i).isChecked()) {
EndToEndTestUtils.SOLO.clickOnCheckBox(i);
}
}
if (checkBoxs.size() < 3) {
EndToEndTestUtils.SOLO.scrollDown();
checkBoxs = EndToEndTestUtils.SOLO.getCurrentCheckBoxes();
for (int i = 0; i < checkBoxs.size(); i++) {
if (!checkBoxs.get(i).isChecked()) {
EndToEndTestUtils.SOLO.clickOnCheckBox(i);
}
}
}
instrumentation.waitForIdleSync();
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.send_google_send_now));
// If no account is binded with this device.
if (EndToEndTestUtils.SOLO.waitForText(activityMyTracks
.getString(R.string.send_google_no_account_title), 1, 500)) {
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
} else {
assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
.getString(R.string.generic_progress_title)));
// Waiting the send is finish.
while (EndToEndTestUtils.SOLO.waitForText(activityMyTracks
.getString(R.string.generic_progress_title), 1, 500)) {
}
// For we not sure the send will be successful, just check whether the result dialog is display.
assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
.getString(R.string.share_track_share_url)));
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
}
}
/**
* Tests editing a track.
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
+2
View File
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.endtoendtest;
import com.google.android.apps.mytracks.TrackListActivity;
import com.google.android.maps.mytracks.R;
import android.annotation.TargetApi;
import android.app.Instrumentation;
import android.test.ActivityInstrumentationTestCase2;
import android.widget.ListView;
@@ -34,6 +35,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
private Instrumentation instrumentation;
private TrackListActivity activityMyTracks;
@TargetApi(8)
public DeleteTest() {
super(TrackListActivity.class);
}
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
+2
View File
@@ -19,6 +19,7 @@ import com.google.android.apps.mytracks.TrackListActivity;
import com.google.android.apps.mytracks.util.FileUtils;
import com.google.android.maps.mytracks.R;
import android.annotation.TargetApi;
import android.app.Instrumentation;
import android.test.ActivityInstrumentationTestCase2;
@@ -34,6 +35,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
private Instrumentation instrumentation;
private TrackListActivity activityMyTracks;
@TargetApi(8)
public ExportAndImportTest() {
super(TrackListActivity.class);
}
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/GoToMyLocationTest.java
+2
View File
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.endtoendtest;
import com.google.android.apps.mytracks.TrackListActivity;
import com.google.android.maps.mytracks.R;
import android.annotation.TargetApi;
import android.app.Instrumentation;
import android.test.ActivityInstrumentationTestCase2;
import android.view.View;
@@ -32,6 +33,7 @@ public class GoToMyLocationTest extends ActivityInstrumentationTestCase2<TrackLi
private Instrumentation instrumentation;
private TrackListActivity activityMyTracks;
@TargetApi(8)
public GoToMyLocationTest() {
super(TrackListActivity.class);
}
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
+21
View File
@@ -18,8 +18,13 @@ package com.google.android.apps.mytracks.endtoendtest;
import com.google.android.apps.mytracks.TrackListActivity;
import com.google.android.maps.mytracks.R;
import android.annotation.TargetApi;
import android.app.Instrumentation;
import android.test.ActivityInstrumentationTestCase2;
import android.view.KeyEvent;
import android.widget.EditText;
import java.util.ArrayList;
/**
* Tests some menu items of MyTracks.
@@ -31,6 +36,7 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
private Instrumentation instrumentation;
private TrackListActivity activityMyTracks;
@TargetApi(8)
public MenuItemsTest() {
super(TrackListActivity.class);
}
@@ -71,6 +77,21 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
}
/**
* Tests search menu item.
*/
public void testSearch() {
EndToEndTestUtils.createSimpleTrack(1);
EndToEndTestUtils.SOLO.goBack();
EndToEndTestUtils.SOLO.clickOnView(EndToEndTestUtils.getButtonOnScreen(activityMyTracks
.getString(R.string.menu_search)));
ArrayList<EditText> editTexts = EndToEndTestUtils.SOLO.getCurrentEditTexts();
EndToEndTestUtils.SOLO.enterText(editTexts.get(0), EndToEndTestUtils.trackName);
sendKeys(KeyEvent.KEYCODE_ENTER);
instrumentation.waitForIdleSync();
assertEquals(1, EndToEndTestUtils.SOLO.getCurrentListViews().size());
}
@Override
protected void tearDown() throws Exception {
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SaveToSdCardTest.java
+2
View File
@@ -17,6 +17,7 @@ package com.google.android.apps.mytracks.endtoendtest;
import com.google.android.apps.mytracks.TrackListActivity;
import android.annotation.TargetApi;
import android.app.Instrumentation;
import android.test.ActivityInstrumentationTestCase2;
@@ -30,6 +31,7 @@ public class SaveToSdCardTest extends ActivityInstrumentationTestCase2<TrackList
private Instrumentation instrumentation;
private TrackListActivity activityMyTracks;
@TargetApi(8)
public SaveToSdCardTest() {
super(TrackListActivity.class);
}
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
+2
View File
@@ -19,6 +19,7 @@ import com.google.android.apps.mytracks.ChartView;
import com.google.android.apps.mytracks.TrackListActivity;
import com.google.android.maps.mytracks.R;
import android.annotation.TargetApi;
import android.app.Instrumentation;
import android.test.ActivityInstrumentationTestCase2;
import android.widget.CheckBox;
@@ -37,6 +38,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
private Instrumentation instrumentation;
private TrackListActivity activityMyTracks;
@TargetApi(8)
public SettingTest() {
super(TrackListActivity.class);
}
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
+2
View File
@@ -20,6 +20,7 @@ import com.google.android.apps.mytracks.fragments.MapFragment;
import com.google.android.maps.MapView;
import com.google.android.maps.mytracks.R;
import android.annotation.TargetApi;
import android.app.Instrumentation;
import android.test.ActivityInstrumentationTestCase2;
import android.view.KeyEvent;
@@ -37,6 +38,7 @@ public class ViewsTest extends ActivityInstrumentationTestCase2<TrackListActivit
private Instrumentation instrumentation;
private TrackListActivity activityMyTracks;
@TargetApi(8)
public ViewsTest() {
super(TrackListActivity.class);
}
MyTracksTest/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelperTest.java
+2
View File
@@ -15,6 +15,7 @@
*/
package com.google.android.apps.mytracks.io.backup;
import android.annotation.TargetApi;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
@@ -175,6 +176,7 @@ public class PreferenceBackupHelperTest extends TestCase {
preferenceBackupHelper = new PreferenceBackupHelper();
}
@TargetApi(9)
public void testExportImportPreferences() throws Exception {
// Populate with some initial values
Editor editor = preferences.edit();
MyTracksTest/src/com/google/android/apps/mytracks/io/file/KmlTrackWriterTest.java
+2
View File
@@ -19,6 +19,7 @@ import com.google.android.apps.mytracks.content.DescriptionGenerator;
import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.content.Waypoint;
import android.annotation.TargetApi;
import android.location.Location;
import java.util.List;
@@ -112,6 +113,7 @@ public class KmlTrackWriterTest extends TrackFormatWriterTest {
* @param tag the parent tag
* @param locations list of expected locations
*/
@TargetApi(8)
private void assertTagHasPoints(Element tag, Location... locations) {
List<Element> coordTags = getChildElements(tag, "gx:coord", locations.length);
for (int i = 0; i < locations.length; i++) {
MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivityTest.java
+2
View File
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.io.maps;
import com.google.android.apps.mytracks.io.gdata.maps.MapsMapMetadata;
import com.google.android.maps.mytracks.R;
import android.annotation.TargetApi;
import android.content.Intent;
import android.test.AndroidTestCase;
import android.widget.ArrayAdapter;
@@ -46,6 +47,7 @@ public class ChooseMapActivityTest extends AndroidTestCase {
*
* @author youtaol
*/
@TargetApi(11)
public class ChooseMapActivityMock extends ChooseMapActivity {
/**
* By overriding this method, avoids to start next activity.
MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java
+2
View File
@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.io.sendtogoogle;
import com.google.android.maps.mytracks.R;
import android.annotation.TargetApi;
import android.content.Intent;
import android.test.ActivityInstrumentationTestCase2;
import android.view.View;
@@ -49,6 +50,7 @@ public class UploadResultActivityTest extends
/**
* This method is necessary for ActivityInstrumentationTestCase2.
*/
@TargetApi(8)
public UploadResultActivityTest() {
super(UploadResultActivity.class);
}
MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
+2
View File
@@ -27,6 +27,7 @@ import com.google.android.apps.mytracks.stats.TripStatistics;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.maps.mytracks.R;
import android.annotation.TargetApi;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Context;
@@ -124,6 +125,7 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
super.shutdownService();
}
@TargetApi(9)
@Override
protected void setUp() throws Exception {
super.setUp();
MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/PolarMessageParserTest.java
+5 -2
View File
@@ -1,9 +1,11 @@
package com.google.android.apps.mytracks.services.sensors;
import java.util.Arrays;
import com.google.android.apps.mytracks.content.Sensor;
import android.annotation.TargetApi;
import java.util.Arrays;
import junit.framework.TestCase;
public class PolarMessageParserTest extends TestCase {
@@ -16,6 +18,7 @@ public class PolarMessageParserTest extends TestCase {
(byte) 0xF7, 0x02, (byte) 0xD1, 0x00, 0x11, 0x04};
private byte[] buf;
@TargetApi(9)
public void setUp() {
buf = Arrays.copyOf(originalBuf, originalBuf.length);
}
MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java
+2
View File
@@ -4,6 +4,7 @@ import com.google.android.apps.mytracks.Constants;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.maps.mytracks.R;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.SharedPreferences;
import android.test.AndroidTestCase;
@@ -11,6 +12,7 @@ import android.test.suitebuilder.annotation.SmallTest;
public class SensorManagerFactoryTest extends AndroidTestCase {
@TargetApi(9)
@Override
protected void setUp() throws Exception {
super.setUp();