commit e0874054acea0e164c4464d3bb82302df50e8e5c
author Yi Kong <yikong@google.com> Tue Feb 14 06:17:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 14 06:17:04 2017 +0000
tree d1890bb30f8b2cc4dfa0fd0f3f7697924407d117
parent 51fb3c64416f90b77671935fdb058d99fc3ed3f1
parent aba0708c7d7ad195f9b2cf4b9199904560488e1f

Fix URLTest#testAtSignInUserInfo failure am: 7e6977749c am: 47ee0f9e11 am: d24900bf47
am: aba0708c7d

Change-Id: Ibd29c496b3b1faadf53ad8349f59b22b08c105c6

luni/src/test/java/libcore/java/net/URLTest.java

diff --git a/luni/src/test/java/libcore/java/net/URLTest.java b/luni/src/test/java/libcore/java/net/URLTest.java
index 7a323af..0eee1f8 100644
--- a/luni/src/test/java/libcore/java/net/URLTest.java
+++ b/luni/src/test/java/libcore/java/net/URLTest.java
@@ -194,12 +194,12 @@
         assertEquals(null, url.getRef());
     }
 
+    // This behavior of URLs with invalid user info changed due to bug http://b/33351987 after
+    // Android security level 1 April 2017.
     public void testAtSignInUserInfo() throws Exception {
-        try {
-            new URL("http://user@userhost.com:password@host");
-            fail();
-        } catch (MalformedURLException expected) {
-        }
+        URL url = new URL("http://user@userhost.com:password@host");
+        assertNull(url.getUserInfo());
+        assertTrue(url.getHost().isEmpty());
     }
 
     public void testUserNoPassword() throws Exception {
@@ -785,5 +785,6 @@
         final String host = "http://multiple@users@url.com";
         URL url = new URL(host);
         assertNull(url.getUserInfo());
+        assertTrue(url.getHost().isEmpty());
     }
 }