net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java - Issue 11628008: Provide NetworkChangeNotifierAndroid with the actual initial connection type.

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: net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java

Issue 11628008: Provide NetworkChangeNotifierAndroid with the actual initial connection type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address Ryan's comments + fix Java comment Created 7 years, 12 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 | « net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java ('k') | net/android/network_change_notifier_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java

diff --git a/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java b/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java

index 9bc633243b130ea74a82d59b8883fe43b81fee9d..0bea726d192dc1d6add6d32d6572457d3898de5c 100644

--- a/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java

+++ b/net/android/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java

@@ -40,15 +40,16 @@ public class NetworkChangeNotifierTest extends InstrumentationTestCase {

private int mNetworkType;

private int mNetworkSubtype;

- MockConnectivityManagerDelegate() {

- super(null);

- }

@Override

boolean activeNetworkExists() {

return mActiveNetworkExists;

}

+ @Override

+ boolean isConnected() {

+ return getNetworkType() != NetworkChangeNotifier.CONNECTION_NONE;

+ }

void setActiveNetworkExists(boolean networkExists) {

mActiveNetworkExists = networkExists;

}

@@ -82,7 +83,7 @@ public class NetworkChangeNotifierTest extends InstrumentationTestCase {

public void testNetworkChangeNotifierJavaObservers() throws InterruptedException {

// Create a new notifier that doesn't have a native-side counterpart.

Context context = getInstrumentation().getTargetContext();

- NetworkChangeNotifier.createInstance(context, 0);

+ NetworkChangeNotifier.resetInstanceForTests(context);

NetworkChangeNotifier.setAutoDetectConnectivityState(true);

NetworkChangeNotifierAutoDetect receiver = NetworkChangeNotifier.getAutoDetectorForTest();

@@ -109,7 +110,6 @@ public class NetworkChangeNotifierTest extends InstrumentationTestCase {

connectivityDelegate.setActiveNetworkExists(false);

connectivityDelegate.setNetworkType(NetworkChangeNotifier.CONNECTION_NONE);

Intent noConnectivityIntent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION);

- noConnectivityIntent.putExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, true);

receiver.onReceive(getInstrumentation().getTargetContext(), noConnectivityIntent);

assertTrue(observer.hasReceivedNotification());

}