summaryrefslogtreecommitdiffstats
path: root/harmony-tests
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2014-06-09 15:28:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-09 15:28:28 +0000
commite43a1534a04d2a3e7d2e4e7161b06f59b38fd64f (patch)
tree6f9ad2dddb66ed0a3aa03b99541f0a556fd5bb3b /harmony-tests
parent356b0ffeeda7801af6d26b15aba28717e0ee78c0 (diff)
parent35f521cdcd0b877b3a3c4a7df631529a31cee45b (diff)
downloadlibcore-e43a1534a04d2a3e7d2e4e7161b06f59b38fd64f.zip
libcore-e43a1534a04d2a3e7d2e4e7161b06f59b38fd64f.tar.gz
libcore-e43a1534a04d2a3e7d2e4e7161b06f59b38fd64f.tar.bz2
am 35f521cd: Merge "DO NOT MERGE : Fix for InetAddressTest#test_isReachableLjava_net_NetworkInterfaceII" into klp-modular-dev
* commit '35f521cdcd0b877b3a3c4a7df631529a31cee45b': DO NOT MERGE : Fix for InetAddressTest#test_isReachableLjava_net_NetworkInterfaceII
Diffstat (limited to 'harmony-tests')
-rw-r--r--harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressTest.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressTest.java
index 959f83c..a029a51 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressTest.java
@@ -349,8 +349,9 @@ public class InetAddressTest extends junit.framework.TestCase {
} catch (IllegalArgumentException e) {
// correct
}
- // tests nowhere
- ia = Inet4Address.getByName("1.1.1.1");
+ // tests unreachable address. 192.0.2.1 is reserved by RFC 5737
+ // and should not be used outside of example code / docs.
+ ia = Inet4Address.getByName("192.0.2.1");
assertFalse(ia.isReachable(1000));
assertFalse(ia.isReachable(null, 0, 1000));