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

Side by Side Diff: content/public/android/javatests/src/org/chromium/content/browser/MediaResourceGetterTest.java

Issue 561743003: Remove static PACKAGE_NAME variable and refactor getRawAcceptableDirectories method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing test case failure for MediaResourceGetterTest class Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.content.browser; 5 package org.chromium.content.browser;
6 6
7 import android.annotation.SuppressLint; 7 import android.annotation.SuppressLint;
8 import android.content.Context; 8 import android.content.Context;
9 import android.content.pm.PackageManager; 9 import android.content.pm.PackageManager;
10 import android.media.MediaMetadataRetriever; 10 import android.media.MediaMetadataRetriever;
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 */ 196 */
197 private static class InternalMockContext extends MockContext { 197 private static class InternalMockContext extends MockContext {
198 boolean mAllowPermission = false; 198 boolean mAllowPermission = false;
199 @Override 199 @Override
200 public int checkCallingOrSelfPermission(String permission) { 200 public int checkCallingOrSelfPermission(String permission) {
201 assertEquals(android.Manifest.permission.ACCESS_NETWORK_STATE, 201 assertEquals(android.Manifest.permission.ACCESS_NETWORK_STATE,
202 permission); 202 permission);
203 return mAllowPermission ? PackageManager.PERMISSION_GRANTED : 203 return mAllowPermission ? PackageManager.PERMISSION_GRANTED :
204 PackageManager.PERMISSION_DENIED; 204 PackageManager.PERMISSION_DENIED;
205 } 205 }
206
207 @Override
208 public String getPackageName() {
209 return "org.some.app.package";
210 }
206 } 211 }
207 212
208 // Our test objects. 213 // Our test objects.
209 private FakeMediaResourceGetter mFakeMRG; 214 private FakeMediaResourceGetter mFakeMRG;
210 private InternalMockContext mMockContext; 215 private InternalMockContext mMockContext;
211 216
212 @Override 217 @Override
213 protected void setUp() throws Exception { 218 protected void setUp() throws Exception {
214 super.setUp(); 219 super.setUp();
215 mFakeMRG = new FakeMediaResourceGetter(); 220 mFakeMRG = new FakeMediaResourceGetter();
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 assertTrue(MediaResourceGetter.androidDeviceOk( 590 assertTrue(MediaResourceGetter.androidDeviceOk(
586 "GT-I9100", android.os.Build.VERSION_CODES.JELLY_BEAN)); 591 "GT-I9100", android.os.Build.VERSION_CODES.JELLY_BEAN));
587 } 592 }
588 593
589 @SmallTest 594 @SmallTest
590 public void testAndroidDeviceOk_GoodModel_AnyVersion() { 595 public void testAndroidDeviceOk_GoodModel_AnyVersion() {
591 assertTrue(MediaResourceGetter.androidDeviceOk( 596 assertTrue(MediaResourceGetter.androidDeviceOk(
592 "Happy Device", android.os.Build.VERSION_CODES.ICE_CREAM_SANDWIC H)); 597 "Happy Device", android.os.Build.VERSION_CODES.ICE_CREAM_SANDWIC H));
593 } 598 }
594 } 599 }
OLDNEW
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698