LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Skip new UrlQuerySanitizer tests on Q" into rvc-dev am: f9a56e671b

Browse Source 
Change-Id: I8c80a456633c456a827f3a710cba4f23b8421a1f
This commit is contained in:
Remi NGUYEN VAN
2020-04-21 10:56:54 +00:00
committed by Automerger Merge Worker
parent 3f82dcaf63 958e8d1ceb
commit c96495c3b7
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/cts/net/src/android/net/cts/UrlQuerySanitizerTest.java
View File

@@ -16,16 +16,38 @@
package android.net.cts; package android.net.cts;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
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.os.Build;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest;
import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
public class UrlQuerySanitizerTest extends AndroidTestCase { @SmallTest
@RunWith(AndroidJUnit4.class)
public class UrlQuerySanitizerTest {
@Rule
public final DevSdkIgnoreRule mIgnoreRule = new DevSdkIgnoreRule();
private static final int ALL_OK = IllegalCharacterValueSanitizer.ALL_OK; private static final int ALL_OK = IllegalCharacterValueSanitizer.ALL_OK;
// URL for test. // URL for test.
@@ -42,6 +64,7 @@ public class UrlQuerySanitizerTest extends AndroidTestCase {
private static final String AGE = "age"; private static final String AGE = "age";
private static final String HEIGHT = "height"; private static final String HEIGHT = "height";
@Test
public void testUrlQuerySanitizer() { public void testUrlQuerySanitizer() {
MockUrlQuerySanitizer uqs = new MockUrlQuerySanitizer(); MockUrlQuerySanitizer uqs = new MockUrlQuerySanitizer();
assertFalse(uqs.getAllowUnregisteredParamaters()); assertFalse(uqs.getAllowUnregisteredParamaters());
@@ -210,12 +233,14 @@ public class UrlQuerySanitizerTest extends AndroidTestCase {
} }
@Test @IgnoreUpTo(Build.VERSION_CODES.Q) // Only fixed in R
public void testScriptUrlOk_73822755() { public void testScriptUrlOk_73822755() {
ValueSanitizer sanitizer = new UrlQuerySanitizer.IllegalCharacterValueSanitizer( ValueSanitizer sanitizer = new UrlQuerySanitizer.IllegalCharacterValueSanitizer(
UrlQuerySanitizer.IllegalCharacterValueSanitizer.SCRIPT_URL_OK); UrlQuerySanitizer.IllegalCharacterValueSanitizer.SCRIPT_URL_OK);
assertEquals("javascript:alert()", sanitizer.sanitize("javascript:alert()")); assertEquals("javascript:alert()", sanitizer.sanitize("javascript:alert()"));
} }
@Test @IgnoreUpTo(Build.VERSION_CODES.Q) // Only fixed in R
public void testScriptUrlBlocked_73822755() { public void testScriptUrlBlocked_73822755() {
ValueSanitizer sanitizer = UrlQuerySanitizer.getUrlAndSpaceLegal(); ValueSanitizer sanitizer = UrlQuerySanitizer.getUrlAndSpaceLegal();
assertEquals("", sanitizer.sanitize("javascript:alert()")); assertEquals("", sanitizer.sanitize("javascript:alert()"));