merge heads

2012-01-28 16:13:12 -08:00
parent 22e9687aff
commit 6bb87e1db9
38 changed files with 444 additions and 783 deletions
@@ -0,0 +1,64 @@
+// Copyright 2012 Google Inc. All Rights Reserved.
+
+package com.google.android.apps.mytracks.services;
+
+import android.app.Notification;
+import android.app.Service;
+import android.test.ServiceTestCase;
+import android.util.Log;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * A {@link TrackRecordingService} that can be used with {@link ServiceTestCase}. 
+ * {@link ServiceTestCase} throws a null pointer exception when the service
+ * calls {@link Service#startForeground(int, android.app.Notification)} and
+ * {@link Service#stopForeground(boolean)}.
+ * <p>
+ * See http://code.google.com/p/android/issues/detail?id=12122
+ * <p>
+ * Wrap these two methods in wrappers and override them.
+ *
+ * @author Jimmy Shih
+ */
+public class TestRecordingService extends TrackRecordingService {
+
+  private static final String TAG = TestRecordingService.class.getSimpleName();
+
+  @Override
+  protected void startForegroundService(Notification notification) {
+    try {
+      Method setForegroundMethod = Service.class.getMethod("setForeground", boolean.class);
+      setForegroundMethod.invoke(this, true);
+    } catch (SecurityException e) {
+      Log.e(TAG, "Unable to start a service in foreground", e);
+    } catch (NoSuchMethodException e) {
+      Log.e(TAG, "Unable to start a service in foreground", e);
+    } catch (IllegalArgumentException e) {
+      Log.e(TAG, "Unable to start a service in foreground", e);
+    } catch (IllegalAccessException e) {
+      Log.e(TAG, "Unable to start a service in foreground", e);
+    } catch (InvocationTargetException e) {
+      Log.e(TAG, "Unable to start a service in foreground", e);
+    }
+  }
+
+  @Override
+  protected void stopForegroundService() {
+    try {
+      Method setForegroundMethod = Service.class.getMethod("setForeground", boolean.class);
+      setForegroundMethod.invoke(this, false);
+    } catch (SecurityException e) {
+      Log.e(TAG, "Unable to start a service in foreground", e);
+    } catch (NoSuchMethodException e) {
+      Log.e(TAG, "Unable to start a service in foreground", e);
+    } catch (IllegalArgumentException e) {
+      Log.e(TAG, "Unable to start a service in foreground", e);
+    } catch (IllegalAccessException e) {
+      Log.e(TAG, "Unable to start a service in foreground", e);
+    } catch (InvocationTargetException e) {
+      Log.e(TAG, "Unable to start a service in foreground", e);
+    }
+  }
+}
@@ -24,7 +24,6 @@ import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.content.WaypointCreationRequest;
 import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.ApiFeatures;
 import com.google.android.maps.mytracks.R;

 import android.content.BroadcastReceiver;
@@ -57,8 +56,7 @@ import java.util.List;
 * is called, which prevents from testing multiple scenarios in a single
 * test (see runFunctionTest for more details).
 */
-public class TrackRecordingServiceTest
-    extends ServiceTestCase<TrackRecordingService> {
+public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingService> {

  private Context context;
  private MyTracksProviderUtils providerUtils;
@@ -74,7 +72,7 @@ public class TrackRecordingServiceTest
  private Intent serviceIntent;

  public TrackRecordingServiceTest() {
-    super(TrackRecordingService.class);
+    super(TestRecordingService.class);
  }

  /**
@@ -96,19 +94,6 @@ public class TrackRecordingServiceTest
    }
  }

-  /**
-   * A mock class that forces API level < 5 to make sure we can workaround a bug
-   * in ServiceTestCase (throwing a NPE).
-   * See http://code.google.com/p/android/issues/detail?id=12122 for more
-   * details.
-   */
-  private static class MockApiFeatures extends ApiFeatures {
-    @Override
-    protected int getApiLevel() {
-      return 4;
-    }
-  }
-
  @Override
  protected IBinder bindService(Intent intent) {
    if (getService() != null) {
@@ -138,8 +123,6 @@ public class TrackRecordingServiceTest
  protected void setUp() throws Exception {
    super.setUp();

-    ApiFeatures.injectInstance(new MockApiFeatures());
-
    MockContentResolver mockContentResolver = new MockContentResolver();
    RenamingDelegatingContext targetContext = new RenamingDelegatingContext(
        getContext(), getContext(), "test.");
@@ -15,13 +15,6 @@
 */
 package com.google.android.apps.mytracks.services.tasks;

-import com.google.android.apps.mytracks.services.tasks.PeriodicTask;
-import com.google.android.apps.mytracks.services.tasks.StatusAnnouncerFactory;
-import com.google.android.apps.mytracks.services.tasks.StatusAnnouncerTask;
-import com.google.android.apps.mytracks.util.ApiFeatures;
-
-import android.media.AudioManager;
-import android.speech.tts.TextToSpeech;
 import android.test.AndroidTestCase;

 /**
@@ -31,62 +24,9 @@ import android.test.AndroidTestCase;
 * @author Rodrigo Damazio
 */
 public class StatusAnnouncerFactoryTest extends AndroidTestCase {
-  /**
-   * Mock version of the {@link ApiFeatures} class.
-   */
-  private class MockApiFeatures extends ApiFeatures {
-    private boolean hasTts;
-
-    public void setHasTextToSpeech(boolean hasTts) {
-      this.hasTts = hasTts;
-    }
-
-    @Override
-    public boolean hasTextToSpeech() {
-      return hasTts;
-    }
-  }
-
-  private MockApiFeatures apiFeatures;
-
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-
-    apiFeatures = new MockApiFeatures();
-  }
-
  public void testCreate() {
-    apiFeatures.setHasTextToSpeech(true);
-    PeriodicTaskFactory factory =
-        new StatusAnnouncerFactory(apiFeatures);
+    PeriodicTaskFactory factory = new StatusAnnouncerFactory();
    PeriodicTask task = factory.create(getContext());
    assertTrue(task instanceof StatusAnnouncerTask);
  }
-
-  public void testCreate_notAvailable() {
-    apiFeatures.setHasTextToSpeech(false);
-    PeriodicTaskFactory factory =
-        new StatusAnnouncerFactory(apiFeatures);
-    PeriodicTask task = factory.create(getContext());
-    assertNull(task);
-  }
-
-  public void testGetVolumeStream() {
-    apiFeatures.setHasTextToSpeech(true);
-    StatusAnnouncerFactory factory =
-        new StatusAnnouncerFactory(apiFeatures);
-    assertEquals(
-        TextToSpeech.Engine.DEFAULT_STREAM,
-        factory.getVolumeStream());
-  }
-
-  public void testGetVolumeStream_notAvailable() {
-    apiFeatures.setHasTextToSpeech(false);
-    StatusAnnouncerFactory factory =
-        new StatusAnnouncerFactory(apiFeatures);
-    assertEquals(
-        AudioManager.USE_DEFAULT_STREAM_TYPE,
-        factory.getVolumeStream());
-  }
 }
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2010 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.util;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests {@link ApiAdapterFactory}.
+ *
+ * @author Rodrigo Damazio
+ */
+public class ApiAdapterFactoryTest extends TestCase {
+  public void testGetApiLevelAdapter() {
+    assertNotNull(ApiAdapterFactory.getApiAdapter());
+  }
+}
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010 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.util;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the API feature detection code in {@link ApiFeatures}.
- * This test requires Froyo+ to run.
- *
- * @author Rodrigo Damazio
- */
-public class ApiFeaturesTest extends TestCase {
-
-  private TestableApiFeatures features;
-
-  private class TestableApiFeatures extends ApiFeatures {
-    private int apiLevel;
-
-    public void setApiLevel(int apiLevel) {
-      this.apiLevel = apiLevel;
-    }
-
-    @Override
-    protected int getApiLevel() {
-      return apiLevel;
-    }
-  }
-  
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-
-    features = new TestableApiFeatures();
-  }
-
-  public void testHasTextToSpeech() {
-    features.setApiLevel(3);
-    assertFalse(features.hasTextToSpeech());
-    for (int i = 4; i <= 8; i++) {
-      features.setApiLevel(i);
-      assertTrue(features.hasTextToSpeech());
-    }
-  }
-
-  public void testGetApiAdapter() {
-    assertNotNull(features.getApiAdapter());
-  }
-}