commit 46c238d8ed5bcbf6efad1c8a6c91640e75840ba6
author Chalard Jean <jchalard@google.com> Mon Apr 22 19:51:28 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 22 19:51:28 2019 -0700
tree 2e0199ceaadcfed943a47086e7fc541c07256ef2
parent dd6406d69d8ab3b966ca5ba78d806bc3438cb06b
parent 83e71f6401d4f0e2463d8d107aabc5c6507f547a

Merge "Add a test for a bugfix in UrlQuerySanitizer"
am: 7e14f42570

Change-Id: I7a72ee29f753ea8943ca4b6fc8c0c68775e09df1

tests/cts/net/src/android/net/cts/UrlQuerySanitizerTest.java

diff --git a/tests/cts/net/src/android/net/cts/UrlQuerySanitizerTest.java b/tests/cts/net/src/android/net/cts/UrlQuerySanitizerTest.java
index 7076ea2..2d615bb 100644
--- a/tests/cts/net/src/android/net/cts/UrlQuerySanitizerTest.java
+++ b/tests/cts/net/src/android/net/cts/UrlQuerySanitizerTest.java
@@ -170,6 +170,12 @@
         String initialPercentSign = "title=%B5";
         assertEquals(expectedPlus, uqs.unescape(initialPlus));
         assertEquals(expectedPercentSignHex, uqs.unescape(initialPercentSign));
+        String expectedPlusThenPercentSign = "Joe Random, User";
+        String plusThenPercentSign = "Joe+Random%2C%20User";
+        assertEquals(expectedPlusThenPercentSign, uqs.unescape(plusThenPercentSign));
+        String expectedPercentSignThenPlus = "Joe, Random User";
+        String percentSignThenPlus = "Joe%2C+Random+User";
+        assertEquals(expectedPercentSignThenPlus, uqs.unescape(percentSignThenPlus));
 
         assertTrue(uqs.decodeHexDigit('0') >= 0);
         assertTrue(uqs.decodeHexDigit('b') >= 0);