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

Side by Side Diff: android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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.test.suitebuilder.annotation.MediumTest; 7 import android.support.test.filters.MediumTest;
8 8
9 import org.chromium.android_webview.AwContents; 9 import org.chromium.android_webview.AwContents;
10 import org.chromium.android_webview.test.util.CommonResources; 10 import org.chromium.android_webview.test.util.CommonResources;
11 import org.chromium.android_webview.test.util.JSUtils; 11 import org.chromium.android_webview.test.util.JSUtils;
12 import org.chromium.base.test.util.Feature; 12 import org.chromium.base.test.util.Feature;
13 import org.chromium.base.test.util.FlakyTest; 13 import org.chromium.base.test.util.FlakyTest;
14 import org.chromium.content.browser.test.util.TestCallbackHelperContainer; 14 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
15 import org.chromium.net.test.util.TestWebServer; 15 import org.chromium.net.test.util.TestWebServer;
16 16
17 import java.util.concurrent.CountDownLatch; 17 import java.util.concurrent.CountDownLatch;
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 mContentsClient.getOnPageFinishedHelper(); 417 mContentsClient.getOnPageFinishedHelper();
418 int currentCallCount = onPageFinishedHelper.getCallCount(); 418 int currentCallCount = onPageFinishedHelper.getCallCount();
419 loadUrlAsync(mAwContents, url); 419 loadUrlAsync(mAwContents, url);
420 onPageFinishedHelper.waitForCallback(currentCallCount); 420 onPageFinishedHelper.waitForCallback(currentCallCount);
421 assertEquals(url, onPageFinishedHelper.getUrl()); 421 assertEquals(url, onPageFinishedHelper.getUrl());
422 } finally { 422 } finally {
423 webServer.shutdown(); 423 webServer.shutdown();
424 } 424 }
425 } 425 }
426 } 426 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698