joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Update UriTest for changes to toSafeString" into tm-dev

Browse source
This commit is contained in:
Amith Yamasani 2022-05-19 16:53:29 +00:00 • committed by Android (Google) Code Review
commit d2db378c63
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tests/cts/net/src/android/net/cts/UriTest.java
View file

@ -20,6 +20,9 @@ import android.content.ContentUris;
import android.net.Uri;
import android.os.Parcel;
import android.test.AndroidTestCase;
import com.android.modules.utils.build.SdkLevel;
import java.io.File;
import java.util.Arrays;
import java.util.ArrayList;
@ -577,11 +580,21 @@ public class UriTest extends AndroidTestCase {
"rtsp://username:password@rtsp.android.com:2121/");
}
public void testToSafeString_notSupport() {
checkToSafeString("unsupported://ajkakjah/askdha/secret?secret",
"unsupported://ajkakjah/askdha/secret?secret");
checkToSafeString("unsupported:ajkakjah/askdha/secret?secret",
"unsupported:ajkakjah/askdha/secret?secret");
public void testToSafeString_customUri() {
if (SdkLevel.isAtLeastT()) {
checkToSafeString("other://ajkakjah/...",
"other://ajkakjah/askdha/secret?secret");
checkToSafeString("unsupported:", "unsupported:foo//bar");
checkToSafeString("other://host:80/...", "other://user@host:80/secret/path/");
checkToSafeString("content://contacts/...",
"content://contacts/secret/path/name@foo.com");
checkToSafeString("file:///...", "file:///path/to/secret.doc");
} else {
checkToSafeString("unsupported://ajkakjah/askdha/secret?secret",
"unsupported://ajkakjah/askdha/secret?secret");
checkToSafeString("unsupported:ajkakjah/askdha/secret?secret",
"unsupported:ajkakjah/askdha/secret?secret");
}
}
private void checkToSafeString(String expectedSafeString, String original) {