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

fix comments for 201f8f6de473

Browse Source
This commit is contained in:
ml1050
2012-01-30 13:41:54 +01:00
parent 859248acde
commit 256a6c6ee7
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/SensorEventCounter.java
+4 -1
View File
@@ -81,7 +81,10 @@ public class SensorEventCounter {
* @return the calculated value * @return the calculated value
*/ */
public int getEventsPerMinute(int newCounter, int sensorTime) { public int getEventsPerMinute(int newCounter, int sensorTime) {
long now = System.currentTimeMillis(); return getEventsPerMinute(newCounter, sensorTime, System.currentTimeMillis());
}
protected int getEventsPerMinute(int newCounter, int sensorTime, long now) {
int counterChange = (newCounter - counter) & 0xFFFF; int counterChange = (newCounter - counter) & 0xFFFF;
Log.d(TAG, "now=" + now + " counter=" + newCounter + " sensortime=" + sensorTime); Log.d(TAG, "now=" + now + " counter=" + newCounter + " sensortime=" + sensorTime);
MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManagerTest.java
+7 -7
View File
@@ -31,8 +31,8 @@ public class AntDirectSensorManagerTest extends AndroidTestCase {
private AntSensorBase heartRateSensor; private AntSensorBase heartRateSensor;
private static final byte HEART_RATE_CHANNEL = 0; private static final byte HEART_RATE_CHANNEL = 0;
private class Manager extends AntDirectSensorManager { private class MockAntDirectSensorManager extends AntDirectSensorManager {
public Manager(Context context) { public MockAntDirectSensorManager(Context context) {
super(context); super(context);
} }
@Override @Override
@@ -44,14 +44,14 @@ public class AntDirectSensorManagerTest extends AndroidTestCase {
return false; return false;
} }
} }
private Manager manager; private AntDirectSensorManager manager;
public void setUp() { public void setUp() {
sharedPreferences = getContext().getSharedPreferences( sharedPreferences = getContext().getSharedPreferences(
Constants.SETTINGS_NAME, Context.MODE_PRIVATE); Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
// Let's use default values. // Let's use default values.
sharedPreferences.edit().clear().apply(); sharedPreferences.edit().clear().apply();
manager = new Manager(getContext()); manager = new MockAntDirectSensorManager(getContext());
} }
@SmallTest @SmallTest
@@ -59,7 +59,7 @@ public class AntDirectSensorManagerTest extends AndroidTestCase {
manager.setupAntSensorChannels(); manager.setupAntSensorChannels();
assertNotNull(heartRateSensor); assertNotNull(heartRateSensor);
heartRateSensor.setDeviceNumber((short)42); heartRateSensor.setDeviceNumber((short) 42);
byte[] buff = new byte[9]; byte[] buff = new byte[9];
buff[0] = HEART_RATE_CHANNEL; buff[0] = HEART_RATE_CHANNEL;
buff[8] = (byte) 220; buff[8] = (byte) 220;
@@ -98,7 +98,7 @@ public class AntDirectSensorManagerTest extends AndroidTestCase {
manager.setupAntSensorChannels(); manager.setupAntSensorChannels();
assertNotNull(heartRateSensor); assertNotNull(heartRateSensor);
manager.setHeartRate(210); manager.setHeartRate(210);
heartRateSensor.setDeviceNumber((short)42); heartRateSensor.setDeviceNumber((short) 42);
assertEquals(Sensor.SensorState.CONNECTED, manager.getSensorState()); assertEquals(Sensor.SensorState.CONNECTED, manager.getSensorState());
byte[] buff = new byte[3]; byte[] buff = new byte[3];
@@ -108,7 +108,7 @@ public class AntDirectSensorManagerTest extends AndroidTestCase {
manager.handleMessage(AntMesg.MESG_RESPONSE_EVENT_ID, buff); manager.handleMessage(AntMesg.MESG_RESPONSE_EVENT_ID, buff);
assertEquals(Sensor.SensorState.CONNECTED, manager.getSensorState()); assertEquals(Sensor.SensorState.CONNECTED, manager.getSensorState());
heartRateSensor.setDeviceNumber((short)0); heartRateSensor.setDeviceNumber((short) 0);
manager.handleMessage(AntMesg.MESG_RESPONSE_EVENT_ID, buff); manager.handleMessage(AntMesg.MESG_RESPONSE_EVENT_ID, buff);
assertEquals(Sensor.SensorState.DISCONNECTED, manager.getSensorState()); assertEquals(Sensor.SensorState.DISCONNECTED, manager.getSensorState());
} }
MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/SensorEventCounterTest.java
+8 -7
View File
@@ -18,17 +18,18 @@ package com.google.android.apps.mytracks.services.sensors.ant;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;
/**
* @author Laszlo Molnar
*/
public class SensorEventCounterTest extends AndroidTestCase { public class SensorEventCounterTest extends AndroidTestCase {
@SmallTest @SmallTest
public void testGetEventsPerMinute() throws InterruptedException { public void testGetEventsPerMinute() throws InterruptedException {
SensorEventCounter sec = new SensorEventCounter(); SensorEventCounter sec = new SensorEventCounter();
assertEquals(0, sec.getEventsPerMinute(0, 0)); assertEquals(0, sec.getEventsPerMinute(0, 0, 0));
assertEquals(0, sec.getEventsPerMinute(1, 1024)); assertEquals(0, sec.getEventsPerMinute(1, 1024, 1000));
assertEquals(60, sec.getEventsPerMinute(2, 1024 * 2)); assertEquals(60, sec.getEventsPerMinute(2, 1024 * 2, 2000));
assertEquals(60, sec.getEventsPerMinute(2, 1024 * 2)); assertEquals(60, sec.getEventsPerMinute(2, 1024 * 2, 2500));
assertTrue(60 > sec.getEventsPerMinute(2, 1024 * 2, 4000));
Thread.sleep(2000);
assertTrue(60 > sec.getEventsPerMinute(2, 1024 * 2));
} }
} }