commit 3deb23fead536e1e4fa75b968acd425ad647bca1
author Adam Vartanian <flooey@google.com> Tue Feb 19 02:04:16 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 19 02:04:16 2019 -0800
tree 10358a6f6ec7e7e3c79809a4d93cf12a9935f8c5
parent 218c9e7d9b297cd68b449dc15f4f0e1dbdc94e72
parent 598b2497b363a8189c0c351c363b6feacf138ba0

Merge "Fix authority parsing test" am: 8ce3609e58 am: becdd58df5
am: 598b2497b3

Change-Id: Ic32fceebd7936b779efed954dcd0745b1207f7ff

core/tests/coretests/src/android/net/UriTest.java

diff --git a/core/tests/coretests/src/android/net/UriTest.java b/core/tests/coretests/src/android/net/UriTest.java
index a33de7b..a71000b 100644
--- a/core/tests/coretests/src/android/net/UriTest.java
+++ b/core/tests/coretests/src/android/net/UriTest.java
@@ -182,8 +182,7 @@
 
         uri = Uri.parse("http://bob%40lee%3ajr@local%68ost:4%32");
         assertEquals("bob@lee:jr", uri.getUserInfo());
-        assertEquals("localhost", uri.getHost());
-        assertEquals(42, uri.getPort());
+        assertEquals("localhost:42", uri.getHost());
 
         uri = Uri.parse("http://localhost");
         assertEquals("localhost", uri.getHost());