commit 9b6e5dafcdf384b482c15e6ecc944091921d9328
author Luke Huang <huangluke@google.com> Mon May 27 11:19:15 2019 -0700
committer Luke Huang <huangluke@google.com> Tue May 28 03:24:14 2019 +0000
tree 5614d8f7187df670ced438c9b488563a0b849a36
parent ccb076662c7b594e9b1e0f351b403ca6a16f02dc

Remove broken test testRfc6724Sort

This test is conitnuely fail in cuttlefish.
Lack of ipv6 default route in cuttlefish caused the test failed.
The reason is that the result of rfc6724Sort depends on on the route in system.
It is not good to expect any route should exists, so remove it.

Bug: 133649648
Test: atest DnsUtilsTest

Merged-In: Idc6db433585de067e45088b43665c8e37b310397
(cherry picked from commit 91b35f88429d77ddce0e3f539690e6370b89915b)

Change-Id: Idb6f4c094d3466772e3bfc98a57505bf38f381ef

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