diff options
| author | 2019-05-27 14:12:05 +0000 | |
|---|---|---|
| committer | 2019-05-27 14:12:05 +0000 | |
| commit | e682b1526a60403e424bd421374e0c4e815f385e (patch) | |
| tree | 8fae6945eab3a9a3bf36a7bab06208f2b48bd0da | |
| parent | ab6ab9e4d41bb92ae52f5e649b9d34c80e6802c3 (diff) | |
| parent | c04fd72fffcec90550b55fe28da6cc235b245892 (diff) | |
Merge "Remove broken test testRfc6724Sort"
| -rw-r--r-- | tests/net/java/android/net/util/DnsUtilsTest.java | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/tests/net/java/android/net/util/DnsUtilsTest.java b/tests/net/java/android/net/util/DnsUtilsTest.java index e5cb09f237be..42e340bbcba9 100644 --- a/tests/net/java/android/net/util/DnsUtilsTest.java +++ b/tests/net/java/android/net/util/DnsUtilsTest.java @@ -19,7 +19,6 @@ package android.net.util; import static android.net.util.DnsUtils.IPV6_ADDR_SCOPE_GLOBAL; import static android.net.util.DnsUtils.IPV6_ADDR_SCOPE_LINKLOCAL; import static android.net.util.DnsUtils.IPV6_ADDR_SCOPE_SITELOCAL; -import static android.net.util.DnsUtils.rfc6724Sort; import static org.junit.Assert.assertEquals; @@ -56,24 +55,6 @@ public class DnsUtilsTest { } @Test - public void testRfc6724Sort() { - final List<InetAddress> testAddresses = Arrays.asList( - stringToAddress("172.217.24.14"), - stringToAddress("216.58.200.46"), - stringToAddress("2404:6800:4008:802::200e")); - - final List<InetAddress> expected = Arrays.asList( - stringToAddress("2404:6800:4008:802::200e"), - stringToAddress("172.217.24.14"), - stringToAddress("216.58.200.46")); - - final List<InetAddress> result = rfc6724Sort(null, testAddresses); - - assertEquals(result.size(), testAddresses.size()); - assertEquals(result, expected); - } - - @Test public void testRfc6724Comparator() { final List<DnsUtils.SortableAddress> test = Arrays.asList( makeSortableAddress("216.58.200.36"), // Ipv4 |