Merge changes from topic "n" into nougat-cts-dev

* changes:
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE Add EffectBundleTest
  DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
  DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
This commit is contained in:
Treehugger Robot
2018-01-10 18:59:52 +00:00
committed by Gerrit Code Review

View File

@@ -109,6 +109,11 @@ public class UriTest extends AndroidTestCase {
uri = Uri.parse("http://localhost");
assertEquals("localhost", uri.getHost());
assertEquals(-1, uri.getPort());
uri = Uri.parse("http://a:a@example.com:a@example2.com/path");
assertEquals("a:a@example.com:a@example2.com", uri.getAuthority());
assertEquals("example2.com", uri.getHost());
assertEquals(-1, uri.getPort());
}
public void testCompareTo() {