Skip to content

Commit

Permalink
Support retain mock accuracy in GeoPolyActivity
Browse files Browse the repository at this point in the history
  • Loading branch information
seadowg committed Oct 15, 2021
1 parent 6c3bf0b commit eea0b73
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
3 changes: 2 additions & 1 deletion geo/src/main/java/org/odk/collect/geo/GeoPolyActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,8 @@ private List<MapPoint> parsePoints(String coords) {
public void startInput() {
inputActive = true;
if (recordingEnabled && recordingAutomatic) {
locationTracker.start();
boolean retainMockAccuracy = getIntent().getBooleanExtra(Constants.EXTRA_RETAIN_MOCK_ACCURACY, false);
locationTracker.start(retainMockAccuracy);

recordPoint(map.getGpsLocation());
schedulerHandler = scheduler.scheduleAtFixedRate(() -> runOnUiThread(() -> {
Expand Down
20 changes: 20 additions & 0 deletions geo/src/test/java/org/odk/collect/geo/GeoPolyActivityTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.mockito.Mockito.verify;
import static java.util.Collections.emptyList;

import android.content.Intent;
import android.os.Bundle;
import android.view.View;

Expand Down Expand Up @@ -104,6 +105,25 @@ public void recordButton_should_beVisibleForManualMode() {
}));
}

@Test
public void startingInput_usingAutomaticMode_usesRetainMockAccuracyToStartLocationTracker() {
Intent intent = new Intent(ApplicationProvider.getApplicationContext(), GeoPolyActivity.class);

intent.putExtra(Constants.EXTRA_RETAIN_MOCK_ACCURACY, true);
ActivityScenario.<GeoPolyActivity>launch(intent).onActivity(activity -> {
activity.updateRecordingMode(R.id.automatic_mode);
activity.startInput();
verify(locationTracker).start(true);
});

intent.putExtra(Constants.EXTRA_RETAIN_MOCK_ACCURACY, false);
ActivityScenario.<GeoPolyActivity>launch(intent).onActivity(activity -> {
activity.updateRecordingMode(R.id.automatic_mode);
activity.startInput();
verify(locationTracker).start(true);
});
}

private static class FakeMapFragment implements MapFragment {

private PointListener pointListener;
Expand Down

0 comments on commit eea0b73

Please sign in to comment.