content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.java - Issue 130503003: Revert "Add support for closing Android Shell instances from Java."

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/ContentShellShellManagementTest.java

Issue 130503003: Revert "Add support for closing Android Shell instances from Java." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/shell/android/java/src/org/chromium/content_shell/ShellManager.java ('k') | content/shell/android/shell_manager.h » ('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/ContentShellShellManagementTest.java

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

deleted file mode 100644

index f3a3c36ec2e5e592a61d3259da4b43fc4054d03f..0000000000000000000000000000000000000000

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

+++ /dev/null

@@ -1,47 +0,0 @@

-// Use of this source code is governed by a BSD-style license that can be

-// found in the LICENSE file.

-package org.chromium.content_shell_apk;

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

-import org.chromium.base.ThreadUtils;

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

-import org.chromium.base.test.util.UrlUtils;

-import org.chromium.content_shell.Shell;

-/**

- * Test suite to verify the behavior of the shell management logic.

- */

-public class ContentShellShellManagementTest extends ContentShellTestBase {

- private static final String TEST_PAGE_1 = UrlUtils.encodeHtmlDataUri(

- "<html><body style='background: red;'></body></html>");

- private static final String TEST_PAGE_2 = UrlUtils.encodeHtmlDataUri(

- "<html><body style='background: green;'></body></html>");

- @SmallTest

- @Feature({"Main"})

- public void testMultipleShellsLaunched() throws InterruptedException {

- final ContentShellActivity activity = launchContentShellWithUrl(TEST_PAGE_1);

- assertEquals(TEST_PAGE_1, activity.getActiveShell().getContentView().getUrl());

- Shell previousActiveShell = activity.getActiveShell();

- assertFalse(previousActiveShell.isDestroyed());

- ThreadUtils.runOnUiThreadBlocking(new Runnable() {

- @Override

- public void run() {

- activity.getShellManager().launchShell(TEST_PAGE_2);

- }

- });

- waitForActiveShellToBeDoneLoading();

- assertEquals(TEST_PAGE_2, activity.getActiveShell().getContentView().getUrl());

- assertNotSame(previousActiveShell, activity.getActiveShell());

- assertTrue(previousActiveShell.isDestroyed());

- assertFalse(previousActiveShell.getContentView().isAlive());

- }