Merge "Fix logic inversion bug from Android 1.0." into rvc-dev am: 4d2e516a6b am: 6e0fccb35f am: 3422c36422 am: 5f01fa4fbb

Change-Id: I86f7f82b24d578c7d8d7eee20862a99a65aa65d3
This commit is contained in:
Jeff Sharkey
2020-04-15 18:51:25 +00:00
committed by Automerger Merge Worker

View File

@@ -16,14 +16,15 @@
package android.net.cts; package android.net.cts;
import java.util.List;
import java.util.Set;
import android.net.UrlQuerySanitizer; import android.net.UrlQuerySanitizer;
import android.net.UrlQuerySanitizer.IllegalCharacterValueSanitizer; import android.net.UrlQuerySanitizer.IllegalCharacterValueSanitizer;
import android.net.UrlQuerySanitizer.ParameterValuePair; import android.net.UrlQuerySanitizer.ParameterValuePair;
import android.net.UrlQuerySanitizer.ValueSanitizer; import android.net.UrlQuerySanitizer.ValueSanitizer;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
import java.util.List;
import java.util.Set;
public class UrlQuerySanitizerTest extends AndroidTestCase { public class UrlQuerySanitizerTest extends AndroidTestCase {
private static final int ALL_OK = IllegalCharacterValueSanitizer.ALL_OK; private static final int ALL_OK = IllegalCharacterValueSanitizer.ALL_OK;
@@ -209,6 +210,17 @@ public class UrlQuerySanitizerTest extends AndroidTestCase {
} }
public void testScriptUrlOk_73822755() {
ValueSanitizer sanitizer = new UrlQuerySanitizer.IllegalCharacterValueSanitizer(
UrlQuerySanitizer.IllegalCharacterValueSanitizer.SCRIPT_URL_OK);
assertEquals("javascript:alert()", sanitizer.sanitize("javascript:alert()"));
}
public void testScriptUrlBlocked_73822755() {
ValueSanitizer sanitizer = UrlQuerySanitizer.getUrlAndSpaceLegal();
assertEquals("", sanitizer.sanitize("javascript:alert()"));
}
private static class MockValueSanitizer implements ValueSanitizer{ private static class MockValueSanitizer implements ValueSanitizer{
public String sanitize(String value) { public String sanitize(String value) {