Merged remote changes

MyTracksTest/default.properties

@@ -10,4 +10,4 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:9

MyTracksTest/src/com/google/android/apps/mytracks/io/backup/PreferenceBackupHelperTest.java

@@ -38,7 +38,7 @@ public class PreferenceBackupHelperTest extends TestCase {
    */
   private class MockPreferenceEditor implements SharedPreferences.Editor {
     private Map<String, Object> newPreferences = new HashMap<String, Object>(preferenceValues);
-    
+
     @Override
     public Editor clear() {
       newPreferences.clear();
@@ -51,6 +51,11 @@ public class PreferenceBackupHelperTest extends TestCase {
       return true;
     }
 
+    @Override
+    public void apply() {
+      commit();
+    }
+
     @Override
     public Editor putBoolean(String key, boolean value) {
       return put(key, value);

MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java

@@ -502,7 +502,7 @@ public class TrackRecordingServiceTest
   public void testDeleteAllTracks_trackInProgress() throws Exception {
     createDummyTrack(123, -1, true);
     assertEquals(1, providerUtils.getAllTracks().size());
-    
+
     ITrackRecordingService service = bindAndGetService(createStartIntent());
     assertTrue(service.isRecording());
 

MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/AntDirectSensorManagerTest.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2009 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
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.android.apps.mytracks.services.sensors;
+
+import com.dsi.ant.AntMesg;
+import com.google.android.apps.mytracks.MyTracksSettings;
+import com.google.android.apps.mytracks.content.Sensor;
+import com.google.android.maps.mytracks.R;
+
+import android.content.SharedPreferences;
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+
+public class AntDirectSensorManagerTest extends AndroidTestCase {
+
+  private SharedPreferences sharedPreferences;
+  private AntDirectSensorManager manager;
+  
+  public void setUp() {
+    sharedPreferences = getContext().getSharedPreferences(
+        MyTracksSettings.SETTINGS_NAME, 0);
+    // Let's use default values.
+    sharedPreferences.edit().clear().commit();
+    manager = new AntDirectSensorManager(getContext());
+  }
+  
+  @SmallTest
+  public void testBroadcastData() {
+    manager.setDeviceNumberHRM((short) 42);
+    byte[] buff = new byte[11];
+    buff[1] = AntMesg.MESG_BROADCAST_DATA_ID;
+    buff[2] = 0;  // HRM CHANNEL
+    buff[10] = (byte) 220; 
+    manager.handleMessage(buff);
+
+    Sensor.SensorDataSet sds = manager.getSensorDataSet();
+    assertNotNull(sds);
+    assertTrue(sds.hasHeartRate());
+    assertEquals(Sensor.SensorState.SENDING,
+        sds.getHeartRate().getState());
+    assertEquals(220, sds.getHeartRate().getValue());
+    
+    assertFalse(sds.hasCadence());
+    assertFalse(sds.hasPower());
+  }
+
+  @SmallTest
+  public void testHandleChannelId() {
+    assertEquals(0, manager.getDeviceNumberHRM());
+    short id = 42;
+    byte[] buff = new byte[5];
+    buff[3] = 42;
+    manager.handleChannelId(buff);
+    assertEquals(id, manager.getDeviceNumberHRM());
+  }
+
+  @SmallTest
+  public void testChannelId() {
+    byte[] buff = new byte[11];
+    buff[1] = AntMesg.MESG_CHANNEL_ID_ID;
+    buff[3] = 42;
+    manager.handleMessage(buff);
+
+    assertEquals(42, manager.getDeviceNumberHRM());
+    assertEquals(42,
+        sharedPreferences.getInt(
+            getContext().getString(R.string.ant_heart_rate_sensor_id_key), -1));
+    assertNull(manager.getSensorDataSet());
+  }
+
+  @SmallTest
+  public void testResponseEvent() {
+    assertEquals(Sensor.SensorState.NONE, manager.getSensorState());
+    byte[] buff = new byte[11];
+    buff[1] = AntMesg.MESG_RESPONSE_EVENT_ID;
+    buff[3] = AntMesg.MESG_UNASSIGN_CHANNEL_ID;
+    manager.handleMessage(buff);
+
+    assertEquals(Sensor.SensorState.DISCONNECTED, manager.getSensorState());
+    assertNull(manager.getSensorDataSet());
+  }
+  
+  // TODO: Test timeout too.
+}

MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java

@@ -28,12 +28,26 @@ public class SensorManagerFactoryTest extends AndroidTestCase {
   
   @SmallTest
   public void testCreateZephyr() throws Exception {
+    assertClassForName(ZephyrSensorManager.class, R.string.zephyr_sensor_type);
+  }
+  
+  @SmallTest
+  public void testCreateAnt() throws Exception {
+    assertClassForName(AntDirectSensorManager.class, R.string.ant_sensor_type);
+  }
+
+  @SmallTest
+  public void testCreateAntSRM() throws Exception {
+    assertClassForName(AntSRMSensorManager.class, R.string.srm_ant_bridge_sensor_type);
+  }
+
+  private void assertClassForName(Class<?> c, int i) {
     sharedPreferences.edit()
-      .putString(getContext().getString(R.string.sensor_type_key),
-          getContext().getString(R.string.zephyr_sensor_type))
-      .commit();
+        .putString(getContext().getString(R.string.sensor_type_key),
+            getContext().getString(i))
+        .commit();
     SensorManager sm = SensorManagerFactory.getSensorManager(getContext());
     assertNotNull(sm);
-    assertTrue(sm instanceof ZephyrSensorManager);
+    assertTrue(c.isInstance(sm));
   }
 }