content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java - Issue 11419287: android: Improve ActivityStatus and add ChromiumActivity.

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java

Issue 11419287: android: Improve ActivityStatus and add ChromiumActivity. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: fix "if" indentations Created 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/LocationProvider.java ('k') | content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java b/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java

index 0fa6c060e58aa722a2ed5638984fff9c9aa2a7bf..5dde1f2fda5acea0b520f6a8ed5a215dba40d1f1 100644

--- a/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java

+++ b/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java

@@ -60,9 +60,9 @@ public class LocationProviderTest extends InstrumentationTestCase {

public void testStartPauseResumeStop() throws Exception {

mLocationProvider.start(false);

assertTrue("Should be running", mLocationProvider.isRunning());

- ActivityStatus.getInstance().onPause();

+ ActivityStatus.onStateChange(null, ActivityStatus.PAUSED);

assertFalse("Should have paused", mLocationProvider.isRunning());

- ActivityStatus.getInstance().onResume();

+ ActivityStatus.onStateChange(null, ActivityStatus.RESUMED);

assertTrue("Should have resumed", mLocationProvider.isRunning());

mLocationProvider.stop();

assertFalse("Should have stopped", mLocationProvider.isRunning());

@@ -76,10 +76,10 @@ public class LocationProviderTest extends InstrumentationTestCase {

@UiThreadTest

@Feature({"Location"})

public void testPauseStartResumeStop() throws Exception {

- ActivityStatus.getInstance().onPause();

+ ActivityStatus.onStateChange(null, ActivityStatus.PAUSED);

mLocationProvider.start(false);

assertFalse("Should not be running", mLocationProvider.isRunning());

- ActivityStatus.getInstance().onResume();

+ ActivityStatus.onStateChange(null, ActivityStatus.RESUMED);

assertTrue("Should have resumed", mLocationProvider.isRunning());

mLocationProvider.stop();

assertFalse("Should have stopped", mLocationProvider.isRunning());

@@ -94,11 +94,11 @@ public class LocationProviderTest extends InstrumentationTestCase {

public void testStartPauseUpgradeResumeStop() throws Exception {

mLocationProvider.start(false);

assertTrue("Should be running", mLocationProvider.isRunning());

- ActivityStatus.getInstance().onPause();

+ ActivityStatus.onStateChange(null, ActivityStatus.PAUSED);

assertFalse("Should have paused", mLocationProvider.isRunning());

mLocationProvider.start(true);

assertFalse("Should be paused", mLocationProvider.isRunning());

- ActivityStatus.getInstance().onResume();

+ ActivityStatus.onStateChange(null, ActivityStatus.RESUMED);

assertTrue("Should have resumed", mLocationProvider.isRunning());

mLocationProvider.stop();

assertFalse("Should have stopped", mLocationProvider.isRunning());