Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3467)

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderTestBase.java

Issue 2876273004: Convert Provider tests to JUnit4 (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderTestBase.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderTestBase.java
deleted file mode 100644
index 99484f3b82b73f4cea05d53c0c32fae30de8e570..0000000000000000000000000000000000000000
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderTestBase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.provider;
-
-import android.content.ContentProvider;
-import android.content.ContentResolver;
-import android.content.pm.ProviderInfo;
-import android.test.IsolatedContext;
-import android.test.mock.MockContentResolver;
-
-import org.chromium.base.ThreadUtils;
-import org.chromium.chrome.browser.ChromeActivity;
-import org.chromium.chrome.test.ChromeActivityTestCaseBase;
-
-/**
- * Base class for Chrome's ContentProvider tests.
- * Sets up a local ChromeBrowserProvider associated to a mock resolver in an isolated context.
- */
-public class ProviderTestBase extends ChromeActivityTestCaseBase<ChromeActivity> {
-
- private IsolatedContext mContext;
-
- public ProviderTestBase() {
- super(ChromeActivity.class);
- }
-
- @Override
- public void startMainActivity() throws InterruptedException {
- startMainActivityOnBlankPage();
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- final ChromeActivity activity = getActivity();
- assertNotNull(activity);
-
- final ContentProvider provider = new ChromeBrowserProvider();
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- ProviderInfo providerInfo = new ProviderInfo();
- providerInfo.authority = ChromeBrowserProvider.getApiAuthority(activity);
- provider.attachInfo(activity, providerInfo);
- }
- });
-
- MockContentResolver resolver = new MockContentResolver();
- resolver.addProvider(ChromeBrowserProvider.getApiAuthority(activity), provider);
-
- mContext = new IsolatedContext(resolver, activity);
- assertTrue(getContentResolver() instanceof MockContentResolver);
- }
-
- protected ContentResolver getContentResolver() {
- return mContext.getContentResolver();
- }
-}

Powered by Google App Engine
This is Rietveld 408576698