resolve merge conflicts of 1381b1d9a77260d78a3a67359e16c06ee388d37b to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I5afdfc8e1e523768db9065dd3571cb31bc1dfac5
Change-Id: I5c5b85f516dba0d403eeee06055953931d2198aa
diff --git a/tests/cts/net/src/android/net/cts/UriTest.java b/tests/cts/net/src/android/net/cts/UriTest.java
index 05e826a..5c54cda 100644
--- a/tests/cts/net/src/android/net/cts/UriTest.java
+++ b/tests/cts/net/src/android/net/cts/UriTest.java
@@ -114,6 +114,12 @@
assertEquals("a:a@example.com:a@example2.com", uri.getAuthority());
assertEquals("example2.com", uri.getHost());
assertEquals(-1, uri.getPort());
+ assertEquals("/path", uri.getPath());
+
+ uri = Uri.parse("http://a.foo.com\\.example.com/path");
+ assertEquals("a.foo.com", uri.getHost());
+ assertEquals(-1, uri.getPort());
+ assertEquals("\\.example.com/path", uri.getPath());
}
public void testCompareTo() {