| Index: components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/urlconnection/MessageLoopTest.java
|
| diff --git a/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/urlconnection/MessageLoopTest.java b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/urlconnection/MessageLoopTest.java
|
| deleted file mode 100644
|
| index 3e8e57d6edf9301852dc0d538295f6125873b2f7..0000000000000000000000000000000000000000
|
| --- a/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/urlconnection/MessageLoopTest.java
|
| +++ /dev/null
|
| @@ -1,111 +0,0 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -package org.chromium.cronet_test_apk.urlconnection;
|
| -
|
| -import android.test.suitebuilder.annotation.SmallTest;
|
| -
|
| -import org.chromium.base.test.util.Feature;
|
| -import org.chromium.cronet_test_apk.CronetTestBase;
|
| -import org.chromium.net.urlconnection.MessageLoop;
|
| -
|
| -import java.io.IOException;
|
| -
|
| -/**
|
| - * Tests the MessageLoop implementation.
|
| - */
|
| -public class MessageLoopTest extends CronetTestBase {
|
| -
|
| - @SmallTest
|
| - @Feature({"Cronet"})
|
| - public void testInterrupt() throws Exception {
|
| - final MessageLoop loop = new MessageLoop();
|
| - assertFalse(loop.isRunning());
|
| - TestThread thread = new TestThread() {
|
| - @Override
|
| - public void run() {
|
| - try {
|
| - loop.loop();
|
| - mFailed = true;
|
| - } catch (IOException e) {
|
| - // Expected interrupt.
|
| - }
|
| - }
|
| - };
|
| - thread.start();
|
| - Thread.sleep(1000);
|
| - assertTrue(loop.isRunning());
|
| - assertFalse(loop.hasLoopFailed());
|
| - thread.interrupt();
|
| - Thread.sleep(1000);
|
| - assertFalse(loop.isRunning());
|
| - assertTrue(loop.hasLoopFailed());
|
| - assertFalse(thread.mFailed);
|
| - // Re-spinning the message loop is not allowed after interrupt.
|
| - try {
|
| - loop.loop();
|
| - fail();
|
| - } catch (IllegalStateException e) {
|
| - // Expected.
|
| - }
|
| - }
|
| -
|
| - @SmallTest
|
| - @Feature({"Cronet"})
|
| - public void testTaskFailed() throws Exception {
|
| - final MessageLoop loop = new MessageLoop();
|
| - assertFalse(loop.isRunning());
|
| - TestThread thread = new TestThread() {
|
| - @Override
|
| - public void run() {
|
| - try {
|
| - loop.loop();
|
| - mFailed = true;
|
| - } catch (Exception e) {
|
| - if (!(e instanceof NullPointerException)) {
|
| - mFailed = true;
|
| - }
|
| - }
|
| - }
|
| - };
|
| - Runnable failedTask = new Runnable() {
|
| - @Override
|
| - public void run() {
|
| - throw new NullPointerException();
|
| - }
|
| - };
|
| - thread.start();
|
| - Thread.sleep(1000);
|
| - assertTrue(loop.isRunning());
|
| - assertFalse(loop.hasLoopFailed());
|
| - loop.execute(failedTask);
|
| - Thread.sleep(1000);
|
| - assertFalse(loop.isRunning());
|
| - assertTrue(loop.hasLoopFailed());
|
| - assertFalse(thread.mFailed);
|
| - // Re-spinning the message loop is not allowed after exception.
|
| - try {
|
| - loop.loop();
|
| - fail();
|
| - } catch (IllegalStateException e) {
|
| - // Expected.
|
| - }
|
| - }
|
| -
|
| - /**
|
| - * A Thread class to move assertion to the main thread, so findbug
|
| - * won't complain.
|
| - */
|
| - private class TestThread extends Thread {
|
| - boolean mFailed = false;
|
| -
|
| - public TestThread() {
|
| - }
|
| -
|
| - @Override
|
| - public void run() {
|
| - throw new IllegalStateException();
|
| - }
|
| - }
|
| -}
|
|
|