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

Make the weight dialog always display after enable calorie display. Change code style.

Browse Source
This commit is contained in:
youtaol
2013-08-27 17:06:28 +08:00
parent 57ca65e3b6
commit 10a3e18e7a
6 changed files with 44 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest/src/com/google/android/apps/mytracks/util/CalorieUtilsTest.java
+3 -3
View File
@@ -46,7 +46,7 @@ public class CalorieUtilsTest extends TestCase {
public void testGetCalories_foot() {
double actual = CalorieUtils.getCalories(start, stop, grade, weight,
CalorieUtils.ActivityType.FOOT);
double expected = CalorieUtils.calculateExpenditureFoot(start, stop, grade, weight);
double expected = CalorieUtils.calculateCaloriesFoot(start, stop, grade, weight);
assertEquals(expected, actual);
}
@@ -58,7 +58,7 @@ public class CalorieUtilsTest extends TestCase {
double expectGrade = 0;
double actual = CalorieUtils.getCalories(start, stop, actualGrade, weight,
CalorieUtils.ActivityType.FOOT);
double expected = CalorieUtils.calculateExpenditureFoot(start, stop, expectGrade, weight);
double expected = CalorieUtils.calculateCaloriesFoot(start, stop, expectGrade, weight);
assertEquals(expected, actual);
}
@@ -68,7 +68,7 @@ public class CalorieUtilsTest extends TestCase {
public void testGetCalories_cycling() {
double actual = CalorieUtils.getCalories(start, stop, grade, weight,
CalorieUtils.ActivityType.CYCLING);
double expected = CalorieUtils.calculateExpenditureCycling(start, stop, grade, weight);
double expected = CalorieUtils.calculateCaloriesCycling(start, stop, grade, weight);
assertEquals(expected, actual);
}