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

Side by Side Diff: content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java

Issue 12088031: Revert 179189 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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.content_shell; 5 package org.chromium.content_shell;
6 6
7 import android.test.suitebuilder.annotation.SmallTest; 7 import android.test.suitebuilder.annotation.SmallTest;
8 8
9 import org.chromium.base.test.util.Feature; 9 import org.chromium.base.test.util.Feature;
10 import org.chromium.content_shell_apk.ContentShellActivity;
11 10
12 /** 11 /**
13 * Example test that just starts the content shell. 12 * Example test that just starts the content shell.
14 */ 13 */
15 public class ContentShellUrlTest extends ContentShellTestBase { 14 public class ContentShellUrlTest extends ContentShellTestBase {
16 // URL used for base tests. 15 // URL used for base tests.
17 private static final String URL = "data:text"; 16 private static final String URL = "data:text";
18 17
19 @SmallTest 18 @SmallTest
20 @Feature({"Main"}) 19 @Feature({"Main"})
21 public void testBaseStartup() throws Exception { 20 public void testBaseStartup() throws Exception {
22 ContentShellActivity activity = launchContentShellWithUrl(URL); 21 ContentShellActivity activity = launchContentShellWithUrl(URL);
23 22
24 // Make sure the activity was created as expected. 23 // Make sure the activity was created as expected.
25 assertNotNull(activity); 24 assertNotNull(activity);
26 25
27 // Make sure that the URL is set as expected. 26 // Make sure that the URL is set as expected.
28 assertEquals(URL, activity.getActiveShell().getContentView().getUrl()); 27 assertEquals(URL, activity.getActiveShell().getContentView().getUrl());
29 } 28 }
30 } 29 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698