Merge branch 'master' of github.com:osmandapp/OsmAnd into fix_render_…

…test
osmandapp · May 14, 2024 · 4d5023c · 4d5023c
2 parents c5ff168 + c247f1f
commit 4d5023c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/OsmAnd/src/net/osmand/plus/plugins/externalsensors/devices/sensors/ble/BLERunningSensor.java b/OsmAnd/src/net/osmand/plus/plugins/externalsensors/devices/sensors/ble/BLERunningSensor.java
@@ -59,7 +59,7 @@ public int getCadence() {
 		@Override
 		public List<SensorDataField> getDataFields() {
 			return Collections.singletonList(
-					new SensorDataField(R.string.external_device_characteristic_cadence, R.string.revolutions_per_minute_unit, cadence));
+					new SensorDataField(R.string.external_device_characteristic_cadence, R.string.steps_per_minute_unit, cadence));
 		}
 
 		@NonNull

diff --git a/OsmAnd/test/java/net/osmand/test/activities/AnalysisUpdateCallsTest.java b/OsmAnd/test/java/net/osmand/test/activities/AnalysisUpdateCallsTest.java
@@ -6,7 +6,7 @@
 import android.os.Looper;
 
 import androidx.annotation.NonNull;
-import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.Lifecycle.State;
 import androidx.test.espresso.Espresso;
 import androidx.test.espresso.IdlingPolicies;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
@@ -87,7 +87,7 @@ public void test() throws Throwable {
 		gpxFile.path = testItem.getFile().getPath();
 		app.getSelectedGpxHelper().selectGpxFile(gpxFile, params);
 
-		mActivityScenarioRule.getScenario().moveToState(Lifecycle.State.RESUMED).onActivity(activity -> {
+		mActivityScenarioRule.getScenario().moveToState(State.RESUMED).onActivity(activity -> {
 			mapView = activity.getMapView();
 
 			MapRendererView rendererView = mapView.getMapRenderer();
@@ -132,7 +132,7 @@ public ObserveDistToFinishIdlingResource(@NonNull OsmandApplication app) {
 				if (rendererView != null) {
 					int renderedFrames = rendererView.getFrameId() - startFrameId;
 					LOG.debug("rendered " + renderedFrames + " frames");
-					if(renderedFrames < 50) {
+					if (renderedFrames < 25) {
 						throw new AssertionError("Map rendering to slow. rendered " + renderedFrames + " frames");
 					}
 				} else {