commit ac6c768bd66064fdc22bd2149195a5d9ad4f5bdb
author Luke Huang <huangluke@google.com> Mon May 27 14:12:05 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 27 14:12:05 2019 +0000
tree 97dfc50c0a5d3eb2e265a3e305b8daff9a85d7b5
parent c73af87b45d221046131f805cc47262a57102b43
parent 179c33f322ab267363f10f10b1f89a815bef32ee

Merge "Remove broken test testRfc6724Sort"

tests/net/java/android/net/util/DnsUtilsTest.java

diff --git a/tests/net/java/android/net/util/DnsUtilsTest.java b/tests/net/java/android/net/util/DnsUtilsTest.java
index e5cb09f..42e340b 100644
--- a/tests/net/java/android/net/util/DnsUtilsTest.java
+++ b/tests/net/java/android/net/util/DnsUtilsTest.java
@@ -19,7 +19,6 @@
 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 @@
     }
 
     @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