diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2013-12-02 20:53:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-02 20:53:06 +0000 |
| commit | 317d15c15531b353aa3e8cb1a3ba03d98b71efb6 (patch) | |
| tree | 11a8c9fa17556233b9ee165dd37ff627e6999e6a /services/tests | |
| parent | d786a1900e94c4f0c919b50b44667cea32fd2939 (diff) | |
| parent | 4806fdfbd0fecf91584396fc0f620c97a05ab837 (diff) | |
| download | frameworks_base-317d15c15531b353aa3e8cb1a3ba03d98b71efb6.zip frameworks_base-317d15c15531b353aa3e8cb1a3ba03d98b71efb6.tar.gz frameworks_base-317d15c15531b353aa3e8cb1a3ba03d98b71efb6.tar.bz2 | |
am 4806fdfb: am f226bc60: Merge "Use LinkAddress in address notifications."
* commit '4806fdfbd0fecf91584396fc0f620c97a05ab837':
Use LinkAddress in address notifications.
Diffstat (limited to 'services/tests')
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java index 4385dcd..a78e7b6 100644 --- a/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java @@ -17,6 +17,7 @@ package com.android.server; import android.content.Context; +import android.net.LinkAddress; import android.net.LocalSocket; import android.net.LocalServerSocket; import android.os.Binder; @@ -157,19 +158,22 @@ public class NetworkManagementServiceTest extends AndroidTestCase { * IP address changes. */ sendMessage("614 Address updated fe80::1/64 wlan0 128 253"); - expectSoon(observer).addressUpdated("fe80::1/64", "wlan0", 128, 253); + expectSoon(observer).addressUpdated( + new LinkAddress("fe80::1/64"), "wlan0", 128, 253); - // There is no "added". + // There is no "added", so we take this as "removed". sendMessage("614 Address added fe80::1/64 wlan0 128 253"); - expectSoon(observer).addressRemoved("fe80::1/64", "wlan0", 128, 253); + expectSoon(observer).addressRemoved( + new LinkAddress("fe80::1/64"), "wlan0", 128, 253); sendMessage("614 Address removed 2001:db8::1/64 wlan0 1 0"); - expectSoon(observer).addressRemoved("2001:db8::1/64", "wlan0", 1, 0); + expectSoon(observer).addressRemoved( + new LinkAddress("2001:db8::1/64"), "wlan0", 1, 0); sendMessage("614 Address removed 2001:db8::1/64 wlan0 1"); // Not enough arguments. - sendMessage("666 Address added 2001:db8::1/64 wlan0 1 0"); + sendMessage("666 Address removed 2001:db8::1/64 wlan0 1 0"); // Invalid code. |