content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java - Issue 2583933003: Replace deprecated Android java test annotations

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java

Issue 2583933003: Replace deprecated Android java test annotations (Closed)

Patch Set: Rebase again :( 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/shell/android/BUILD.gn ('k') | content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java

diff --git a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java

index b1e0e654766d23449dfea5f97fb905f0b1f9605e..21495fc1ddc195188d8bd31901da206b822a8a10 100644

--- a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java

+++ b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java

@@ -8,7 +8,7 @@ import android.annotation.TargetApi;

import android.content.Context;

import android.os.Build;

import android.os.PowerManager;

-import android.test.suitebuilder.annotation.Smoke;

+import android.support.test.filters.MediumTest;

import org.chromium.base.test.util.Feature;

@@ -18,7 +18,7 @@ import org.chromium.base.test.util.Feature;

public class ContentShellPreconditionsTest extends ContentShellTestBase {

@TargetApi(Build.VERSION_CODES.KITKAT_WATCH)

@SuppressWarnings("deprecation")

- @Smoke

+ @MediumTest

@Feature({"TestInfrastructure"})

public void testScreenIsOn() throws Exception {

PowerManager pm = (PowerManager) getInstrumentation().getContext().getSystemService(