From 256a6c6ee7de9e30b926e51bd365fe9bb9045dab Mon Sep 17 00:00:00 2001 From: ml1050 Date: Mon, 30 Jan 2012 13:41:54 +0100 Subject: [PATCH] fix comments for 201f8f6de473 --- .../services/sensors/ant/SensorEventCounter.java | 5 ++++- .../sensors/ant/AntDirectSensorManagerTest.java | 14 +++++++------- .../sensors/ant/SensorEventCounterTest.java | 15 ++++++++------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/SensorEventCounter.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/SensorEventCounter.java index 1308b8fab..3bf5e634e 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/SensorEventCounter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/SensorEventCounter.java @@ -81,7 +81,10 @@ public class SensorEventCounter { * @return the calculated value */ 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; Log.d(TAG, "now=" + now + " counter=" + newCounter + " sensortime=" + sensorTime); diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManagerTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManagerTest.java index 1d5309b1a..ed5e2c83e 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManagerTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/AntDirectSensorManagerTest.java @@ -31,8 +31,8 @@ public class AntDirectSensorManagerTest extends AndroidTestCase { private AntSensorBase heartRateSensor; private static final byte HEART_RATE_CHANNEL = 0; - private class Manager extends AntDirectSensorManager { - public Manager(Context context) { + private class MockAntDirectSensorManager extends AntDirectSensorManager { + public MockAntDirectSensorManager(Context context) { super(context); } @Override @@ -44,14 +44,14 @@ public class AntDirectSensorManagerTest extends AndroidTestCase { return false; } } - private Manager manager; + private AntDirectSensorManager manager; public void setUp() { sharedPreferences = getContext().getSharedPreferences( Constants.SETTINGS_NAME, Context.MODE_PRIVATE); // Let's use default values. sharedPreferences.edit().clear().apply(); - manager = new Manager(getContext()); + manager = new MockAntDirectSensorManager(getContext()); } @SmallTest @@ -59,7 +59,7 @@ public class AntDirectSensorManagerTest extends AndroidTestCase { manager.setupAntSensorChannels(); assertNotNull(heartRateSensor); - heartRateSensor.setDeviceNumber((short)42); + heartRateSensor.setDeviceNumber((short) 42); byte[] buff = new byte[9]; buff[0] = HEART_RATE_CHANNEL; buff[8] = (byte) 220; @@ -98,7 +98,7 @@ public class AntDirectSensorManagerTest extends AndroidTestCase { manager.setupAntSensorChannels(); assertNotNull(heartRateSensor); manager.setHeartRate(210); - heartRateSensor.setDeviceNumber((short)42); + heartRateSensor.setDeviceNumber((short) 42); assertEquals(Sensor.SensorState.CONNECTED, manager.getSensorState()); byte[] buff = new byte[3]; @@ -108,7 +108,7 @@ public class AntDirectSensorManagerTest extends AndroidTestCase { manager.handleMessage(AntMesg.MESG_RESPONSE_EVENT_ID, buff); assertEquals(Sensor.SensorState.CONNECTED, manager.getSensorState()); - heartRateSensor.setDeviceNumber((short)0); + heartRateSensor.setDeviceNumber((short) 0); manager.handleMessage(AntMesg.MESG_RESPONSE_EVENT_ID, buff); assertEquals(Sensor.SensorState.DISCONNECTED, manager.getSensorState()); } diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/SensorEventCounterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/SensorEventCounterTest.java index fa0c63ed2..2585602be 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/SensorEventCounterTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/ant/SensorEventCounterTest.java @@ -18,17 +18,18 @@ package com.google.android.apps.mytracks.services.sensors.ant; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; +/** + * @author Laszlo Molnar + */ public class SensorEventCounterTest extends AndroidTestCase { @SmallTest public void testGetEventsPerMinute() throws InterruptedException { SensorEventCounter sec = new SensorEventCounter(); - assertEquals(0, sec.getEventsPerMinute(0, 0)); - assertEquals(0, sec.getEventsPerMinute(1, 1024)); - assertEquals(60, sec.getEventsPerMinute(2, 1024 * 2)); - assertEquals(60, sec.getEventsPerMinute(2, 1024 * 2)); - - Thread.sleep(2000); - assertTrue(60 > sec.getEventsPerMinute(2, 1024 * 2)); + assertEquals(0, sec.getEventsPerMinute(0, 0, 0)); + assertEquals(0, sec.getEventsPerMinute(1, 1024, 1000)); + assertEquals(60, sec.getEventsPerMinute(2, 1024 * 2, 2000)); + assertEquals(60, sec.getEventsPerMinute(2, 1024 * 2, 2500)); + assertTrue(60 > sec.getEventsPerMinute(2, 1024 * 2, 4000)); } }