Commit 62214d92 authored by Becky Zhou's avatar Becky Zhou Committed by Commit Bot

[Feed] Add unit tests for StreamLifecycleManager

Bug: 851977
Change-Id: I99de0abe80ea536a23ecdca2401dd3fd6b816955
Reviewed-on: https://chromium-review.googlesource.com/1101699
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Reviewed-by: default avatarTheresa <twellington@chromium.org>
Reviewed-by: default avatarFilip Gorski <fgorski@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568481}
parent 645cc6a8
...@@ -11,6 +11,7 @@ import com.google.android.libraries.feed.api.stream.Stream; ...@@ -11,6 +11,7 @@ import com.google.android.libraries.feed.api.stream.Stream;
import org.chromium.base.ActivityState; import org.chromium.base.ActivityState;
import org.chromium.base.ApplicationStatus; import org.chromium.base.ApplicationStatus;
import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.browser.tab.EmptyTabObserver; import org.chromium.chrome.browser.tab.EmptyTabObserver;
import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tab.TabObserver; import org.chromium.chrome.browser.tab.TabObserver;
...@@ -160,7 +161,7 @@ class StreamLifecycleManager implements ApplicationStatus.ActivityStateListener ...@@ -160,7 +161,7 @@ class StreamLifecycleManager implements ApplicationStatus.ActivityStateListener
/** Calls {@link Stream#onHide()}. */ /** Calls {@link Stream#onHide()}. */
private void hide() { private void hide() {
if (mStreamState == HIDDEN || mStreamState == DESTROYED) return; if (mStreamState == HIDDEN || mStreamState == CREATED || mStreamState == DESTROYED) return;
deactivate(); deactivate();
mStreamState = HIDDEN; mStreamState = HIDDEN;
...@@ -180,4 +181,9 @@ class StreamLifecycleManager implements ApplicationStatus.ActivityStateListener ...@@ -180,4 +181,9 @@ class StreamLifecycleManager implements ApplicationStatus.ActivityStateListener
ApplicationStatus.unregisterActivityStateListener(this); ApplicationStatus.unregisterActivityStateListener(this);
mStream.onDestroy(); mStream.onDestroy();
} }
@VisibleForTesting
TabObserver getTabObserverForTesting() {
return mTabObserver;
}
} }
...@@ -2201,8 +2201,10 @@ if (enable_offline_pages_harness) { ...@@ -2201,8 +2201,10 @@ if (enable_offline_pages_harness) {
} }
if (enable_feed_in_chrome) { if (enable_feed_in_chrome) {
chrome_junit_test_java_sources += chrome_junit_test_java_sources += [
[ "junit/src/org/chromium/chrome/browser/feed/FeedImageLoaderTest.java" ] "junit/src/org/chromium/chrome/browser/feed/FeedImageLoaderTest.java",
"junit/src/org/chromium/chrome/browser/feed/StreamLifecycleManagerTest.java",
]
chrome_test_java_sources += feed_conformance_test_sources chrome_test_java_sources += feed_conformance_test_sources
} }
......
# For tests that apply to parts of feature implemented in components with a thin Java layer (e.g. host APIs).
file://components/feed/OWNERS file://components/feed/OWNERS
# For tests affecting Android specific parts (e.g. Stream).
file://chrome/android/feed/OWNERS
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment