From 71be4b5ed994030171fb3bd3f08fbc8c43c47567 Mon Sep 17 00:00:00 2001
From: Evan Millar <emillar@google.com>
Date: Tue, 1 Jun 2010 13:55:50 -0700
Subject: [PATCH] Bring ServiceTestCase in line with current Service APIs and
 remove unnecessary asserts.

-Updated onStart() call to onStartCommand()
-Removed asserts that disallowed starting an already bound service and vice versa, since
 that is a valid Service usage pattern.

Change-Id: I79804aef5319a590c74fca54fc990954f7c3fdaa
---
 test-runner/src/android/test/ServiceTestCase.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/test-runner/src/android/test/ServiceTestCase.java b/test-runner/src/android/test/ServiceTestCase.java
index fcb9d55e8360f..d9262f6349066 100644
--- a/test-runner/src/android/test/ServiceTestCase.java
+++ b/test-runner/src/android/test/ServiceTestCase.java
@@ -147,9 +147,6 @@ public abstract class ServiceTestCase<T extends Service> extends AndroidTestCase
      * @param intent The Intent as if supplied to {@link android.content.Context#startService}.
      */
     protected void startService(Intent intent) {
-        assertFalse(mServiceStarted);
-        assertFalse(mServiceBound);
-        
         if (!mServiceAttached) {
             setupService();
         }
@@ -159,7 +156,7 @@ public abstract class ServiceTestCase<T extends Service> extends AndroidTestCase
             mService.onCreate();
             mServiceCreated = true;
         }
-        mService.onStart(intent, mServiceId);
+        mService.onStartCommand(intent, 0, mServiceId);
         
         mServiceStarted = true;
     }
@@ -183,9 +180,6 @@ public abstract class ServiceTestCase<T extends Service> extends AndroidTestCase
      * @return Return an IBinder for making further calls into the Service.
      */
     protected IBinder bindService(Intent intent) {
-        assertFalse(mServiceStarted);
-        assertFalse(mServiceBound);
-        
         if (!mServiceAttached) {
             setupService();
         }