Rename TrackPoint's cycling cadence to cadence as it may contain running data.

Part of #970.

src/androidTest/java/de/dennisguse/opentracks/chart/ChartPointTest.java

@@ -78,7 +78,7 @@ public class ChartPointTest {
         // given
         TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint();
         trackPoint.setHeartRate_bpm(100f);
-        trackPoint.setCyclingCadence_rpm(101f);
+        trackPoint.setCadence_rpm(101f);
         trackPoint.setPower(102f);
 
         TrackStatistics statistics = new TrackStatistics();

src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java

@@ -120,7 +120,7 @@ public class TestDataUtil {
         trackPoint.setSpeed(Speed.of(5f + (i / 10f)));
 
         trackPoint.setHeartRate_bpm(100f + i);
-        trackPoint.setCyclingCadence_rpm(300f + i);
+        trackPoint.setCadence_rpm(300f + i);
         trackPoint.setPower(400f + i);
         trackPoint.setAltitudeGain(ALTITUDE_GAIN);
         trackPoint.setAltitudeLoss(ALTITUDE_LOSS);

src/androidTest/java/de/dennisguse/opentracks/content/data/TestSensorDataUtil.java

@@ -17,7 +17,7 @@ public class TestSensorDataUtil {
         tp.setLatitude(TestDataUtil.INITIAL_LATITUDE + (double) i / 10000.0);
         tp.setLongitude(TestDataUtil.INITIAL_LONGITUDE - (double) i / 10000.0);
         tp.setHeartRate_bpm(hr);
-        tp.setCyclingCadence_rpm(cadence);
+        tp.setCadence_rpm(cadence);
         tp.setPower(power);
         tp.setHorizontalAccuracy(Distance.of(1f));
         tp.setAltitude(1f);

src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java

@@ -835,7 +835,7 @@ public class CustomContentProviderUtilsTest {
 
         TrackPoint trackPoint = TestDataUtil.createTrackPoint(5);
         trackPoint.setHeartRate_bpm(1F);
-        trackPoint.setCyclingCadence_rpm(2F);
+        trackPoint.setCadence_rpm(2F);
         trackPoint.setPower(3F);
 
         // when
@@ -845,7 +845,7 @@ public class CustomContentProviderUtilsTest {
         List<TrackPoint> trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
         assertTrue(trackPoints.get(10).hasHeartRate());
         assertEquals(trackPoint.getHeartRate_bpm(), trackPoints.get(10).getHeartRate_bpm(), 0.01);
-        assertEquals(trackPoint.getCyclingCadence_rpm(), trackPoints.get(10).getCyclingCadence_rpm(), 0.01);
+        assertEquals(trackPoint.getCadence_rpm(), trackPoints.get(10).getCadence_rpm(), 0.01);
         assertEquals(trackPoint.getPower(), trackPoints.get(10).getPower(), 0.01);
     }
 
@@ -934,7 +934,7 @@ public class CustomContentProviderUtilsTest {
         TrackPoint trackPoint = TestDataUtil.createTrackPoint(1);
         trackPoint.setType(TrackPoint.Type.TRACKPOINT);
         trackPoint.setPower(null);
-        trackPoint.setCyclingCadence_rpm(null);
+        trackPoint.setCadence_rpm(null);
         trackPoint.setHeartRate_bpm(null);
         trackPointList.add(trackPoint);
         Track.Id trackId = new Track.Id(System.currentTimeMillis());

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/TrackPointAssert.java

@@ -73,9 +73,9 @@ public class TrackPointAssert {
             Assert.assertEquals(expected.getPower(), actual.getPower(), delta);
         }
 
-        Assert.assertEquals(expected.hasCyclingCadence(), actual.hasCyclingCadence());
-        if (expected.hasCyclingCadence()) {
-            Assert.assertEquals(expected.getCyclingCadence_rpm(), actual.getCyclingCadence_rpm(), delta);
+        Assert.assertEquals(expected.hasCadence(), actual.hasCadence());
+        if (expected.hasCadence()) {
+            Assert.assertEquals(expected.getCadence_rpm(), actual.getCadence_rpm(), delta);
         }
     }