Review comments for revision fd70af575b77 addressed.

This commit is contained in:
Dominik R?ttsches
2011-08-26 18:03:57 +03:00
parent acf5c0931f
commit ace10fc511
3 changed files with 32 additions and 50 deletions
@@ -1,5 +1,5 @@
/*
* Copyright 2010 Google Inc.
* Copyright 2011 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
@@ -15,41 +15,13 @@
*/
package com.google.android.apps.mytracks.services.sensors;
import java.lang.reflect.Field;
import junit.framework.Assert;
import junit.framework.TestCase;
/**
* @author Dominik Ršttsches
*/
public class StrideReadingsTest extends TestCase {
/**
* Provides access to private members in classes.
* from http://onjava.com/pub/a/onjava/2003/11/12/reflection.html
*/
private Object getPrivateField (Object o, String fieldName) {
/* Check we have valid arguments */
Assert.assertNotNull(o);
Assert.assertNotNull(fieldName);
/* Go and find the private field... */
final Field fields[] = o.getClass().getDeclaredFields();
for (int i = 0; i < fields.length; ++i) {
if (fieldName.equals(fields[i].getName())) {
try {
fields[i].setAccessible(true);
return fields[i].get(o);
} catch (IllegalAccessException ex) {
Assert.fail ("IllegalAccessException accessing " + fieldName);
}
}
}
Assert.fail ("Field '" + fieldName + "' not found");
return null;
}
public void testNoReadingOnStartup() {
StrideReadings strideReadings = new StrideReadings();
assertEquals(StrideReadings.CADENCE_NOT_AVAILABLE, strideReadings.getCadence());
@@ -58,28 +30,33 @@ public class StrideReadingsTest extends TestCase {
public void testAverageCadenceAvailable() {
StrideReadings strideReadings = new StrideReadings();
// 2 steps / second => Cadence is 120 / minute
for(int i=1;i<=30;i++) {
for (int i=1;i<=30;i++) {
strideReadings.updateStrideReading(i*2);
if(i > (Integer)getPrivateField(strideReadings, "NUM_READINGS_FOR_AVERAGE")) {
if (i >= StrideReadings.MIN_READINGS_FOR_AVERAGE) {
assertEquals(120, strideReadings.getCadence());
} else {
assertEquals(StrideReadings.CADENCE_NOT_AVAILABLE, strideReadings.getCadence());
}
}
}
/** Tests for correct calculation after rolling over at 128 strides,
* just like the HxM seems to do it. */
/**
* Tests for correct calculation after rolling over at 128 strides,
* just like the HxM seems to do it.
*/
public void testRollover() {
StrideReadings strideReadings = new StrideReadings();
// 1 step per second => Cadence is 60 / minute
// Updating readings counting upwards from initialStrides -
// initialStrides set to a value below 128 to ensure rollover.
int numReadingsRequired = (Integer)getPrivateField(strideReadings, "NUM_READINGS_FOR_AVERAGE");
int initialStrides = 128 - numReadingsRequired - 5;
int initialStrides = 128 - StrideReadings.NUM_READINGS_FOR_AVERAGE - 5;
for(int i=1;i<=numReadingsRequired+10;i++) {
for (int i=1;i<=StrideReadings.NUM_READINGS_FOR_AVERAGE+10;i++) {
strideReadings.updateStrideReading((initialStrides + i) % 128);
if(i > numReadingsRequired) {
if (i >= StrideReadings.MIN_READINGS_FOR_AVERAGE) {
assertEquals(60, strideReadings.getCadence());
} else {
assertEquals(StrideReadings.CADENCE_NOT_AVAILABLE, strideReadings.getCadence());
}
}
}