diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-02-11 16:19:39 -0800 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2013-02-12 20:24:16 -0800 |
commit | 925976230936a5177365dc24b50da8607a9af8d4 (patch) | |
tree | 0266d0edd90fbdb967f5450dfba5677da6fa2a9a /tests/src | |
parent | 1ad10ce731d1b54692d7d5ee32601e965f503fa4 (diff) | |
download | android_packages_providers_DownloadProvider-925976230936a5177365dc24b50da8607a9af8d4.tar.gz android_packages_providers_DownloadProvider-925976230936a5177365dc24b50da8607a9af8d4.tar.bz2 android_packages_providers_DownloadProvider-925976230936a5177365dc24b50da8607a9af8d4.zip |
Redesign of DownloadManager update loop.
Previously, the service lifecycle was managed through a large for()
loop which was extremely tricky to reason about. This resulted in
several race conditions that could leave the service running
indefinitely, or terminate it early before tasks had finished.
This change redesigns the update loop to be event driven based on
database updates, and to collapse mutiple pending update passes. It
is much easier to reason about service termination conditions, and
it correctly uses startId to handle races during command delivery.
Also moves scanner into isolated class, and switches to using public
API instead of binding to private interface.
Bug: 7638470, 7455406, 7162341
Change-Id: I380e77f5432223b2acb4e819e37f29f98ee4782b
Diffstat (limited to 'tests/src')
-rw-r--r-- | tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java | 4 | ||||
-rw-r--r-- | tests/src/com/android/providers/downloads/MockitoHelper.java | 53 |
2 files changed, 57 insertions, 0 deletions
diff --git a/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java b/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java index 0074a270..3b937389 100644 --- a/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java @@ -56,6 +56,8 @@ public abstract class AbstractDownloadProviderFunctionalTest extends protected static final String FILE_CONTENT = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; + private final MockitoHelper mMockitoHelper = new MockitoHelper(); + protected MockWebServer mServer; protected MockContentResolverWithNotify mResolver; protected TestContext mTestContext; @@ -147,6 +149,7 @@ public abstract class AbstractDownloadProviderFunctionalTest extends @Override protected void setUp() throws Exception { super.setUp(); + mMockitoHelper.setUp(getClass()); // Since we're testing a system app, AppDataDirGuesser doesn't find our // cache dir, so set it explicitly. @@ -169,6 +172,7 @@ public abstract class AbstractDownloadProviderFunctionalTest extends protected void tearDown() throws Exception { cleanUpDownloads(); mServer.shutdown(); + mMockitoHelper.tearDown(); super.tearDown(); } diff --git a/tests/src/com/android/providers/downloads/MockitoHelper.java b/tests/src/com/android/providers/downloads/MockitoHelper.java new file mode 100644 index 00000000..485128d8 --- /dev/null +++ b/tests/src/com/android/providers/downloads/MockitoHelper.java @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * 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.android.providers.downloads; + +import android.util.Log; + +/** + * Helper for Mockito-based test cases. + */ +public final class MockitoHelper { + private static final String TAG = "MockitoHelper"; + + private ClassLoader mOriginalClassLoader; + private Thread mContextThread; + + /** + * Creates a new helper, which in turn will set the context classloader so + * it can load Mockito resources. + * + * @param packageClass test case class + */ + public void setUp(Class<?> packageClass) throws Exception { + // makes a copy of the context classloader + mContextThread = Thread.currentThread(); + mOriginalClassLoader = mContextThread.getContextClassLoader(); + ClassLoader newClassLoader = packageClass.getClassLoader(); + Log.v(TAG, "Changing context classloader from " + mOriginalClassLoader + + " to " + newClassLoader); + mContextThread.setContextClassLoader(newClassLoader); + } + + /** + * Restores the context classloader to the previous value. + */ + public void tearDown() throws Exception { + Log.v(TAG, "Restoring context classloader to " + mOriginalClassLoader); + mContextThread.setContextClassLoader(mOriginalClassLoader); + } +} |