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

Side by Side Diff: android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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.android_webview.test; 5 package org.chromium.android_webview.test;
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.test.suitebuilder.annotation.SmallTest; 9 import android.support.test.filters.SmallTest;
10 import android.view.View; 10 import android.view.View;
11 11
12 import org.chromium.android_webview.AwContents; 12 import org.chromium.android_webview.AwContents;
13 import org.chromium.android_webview.AwScrollOffsetManager; 13 import org.chromium.android_webview.AwScrollOffsetManager;
14 import org.chromium.android_webview.test.util.AwTestTouchUtils; 14 import org.chromium.android_webview.test.util.AwTestTouchUtils;
15 import org.chromium.android_webview.test.util.CommonResources; 15 import org.chromium.android_webview.test.util.CommonResources;
16 import org.chromium.android_webview.test.util.JavascriptEventObserver; 16 import org.chromium.android_webview.test.util.JavascriptEventObserver;
17 import org.chromium.base.ThreadUtils; 17 import org.chromium.base.ThreadUtils;
18 import org.chromium.base.annotations.SuppressFBWarnings; 18 import org.chromium.base.annotations.SuppressFBWarnings;
19 import org.chromium.base.test.util.CallbackHelper; 19 import org.chromium.base.test.util.CallbackHelper;
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 }); 874 });
875 875
876 getInstrumentation().runOnMainSync(new Runnable() { 876 getInstrumentation().runOnMainSync(new Runnable() {
877 @Override 877 @Override
878 public void run() { 878 public void run() {
879 assertEquals(testContainerView.getScrollY(), scrolledYPix); 879 assertEquals(testContainerView.getScrollY(), scrolledYPix);
880 } 880 }
881 }); 881 });
882 } 882 }
883 } 883 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698