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

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/banners/AppBannerManagerTest.java

Issue 2583933003: Replace deprecated Android java test annotations (Closed)
Patch Set: Created 4 years 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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.chrome.browser.banners; 5 package org.chromium.chrome.browser.banners;
6 6
7 import android.app.Activity; 7 import android.app.Activity;
8 import android.app.Instrumentation.ActivityMonitor; 8 import android.app.Instrumentation.ActivityMonitor;
9 import android.app.Instrumentation.ActivityResult; 9 import android.app.Instrumentation.ActivityResult;
10 import android.content.Context; 10 import android.content.Context;
11 import android.content.Intent; 11 import android.content.Intent;
12 import android.content.IntentFilter; 12 import android.content.IntentFilter;
13 import android.content.pm.PackageInfo; 13 import android.content.pm.PackageInfo;
14 import android.graphics.Bitmap; 14 import android.graphics.Bitmap;
15 import android.support.test.filters.MediumTest;
16 import android.support.test.filters.SmallTest;
15 import android.test.mock.MockPackageManager; 17 import android.test.mock.MockPackageManager;
16 import android.test.suitebuilder.annotation.MediumTest;
17 import android.test.suitebuilder.annotation.SmallTest;
18 import android.text.TextUtils; 18 import android.text.TextUtils;
19 import android.view.View; 19 import android.view.View;
20 import android.widget.Button; 20 import android.widget.Button;
21 import android.widget.TextView; 21 import android.widget.TextView;
22 22
23 import org.chromium.base.ThreadUtils; 23 import org.chromium.base.ThreadUtils;
24 import org.chromium.base.test.util.Feature; 24 import org.chromium.base.test.util.Feature;
25 import org.chromium.chrome.R; 25 import org.chromium.chrome.R;
26 import org.chromium.chrome.browser.ShortcutHelper; 26 import org.chromium.chrome.browser.ShortcutHelper;
27 import org.chromium.chrome.browser.engagement.SiteEngagementService; 27 import org.chromium.chrome.browser.engagement.SiteEngagementService;
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 }); 583 });
584 584
585 // Test that bitmap sizes match expectations. 585 // Test that bitmap sizes match expectations.
586 int idealSize = getActivity().getResources().getDimensionPixelSize( 586 int idealSize = getActivity().getResources().getDimensionPixelSize(
587 R.dimen.webapp_splash_image_size_ideal); 587 R.dimen.webapp_splash_image_size_ideal);
588 Bitmap splashImage = ShortcutHelper.decodeBitmapFromString(dataStorageFa ctory.mSplashImage); 588 Bitmap splashImage = ShortcutHelper.decodeBitmapFromString(dataStorageFa ctory.mSplashImage);
589 assertEquals(idealSize, splashImage.getWidth()); 589 assertEquals(idealSize, splashImage.getWidth());
590 assertEquals(idealSize, splashImage.getHeight()); 590 assertEquals(idealSize, splashImage.getHeight());
591 } 591 }
592 } 592 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698