From 00864a9c8c628578770a20b591b48518c4b5167d Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Wed, 11 May 2022 04:54:19 +0000 Subject: [PATCH] Update UriTest for changes to toSafeString Bug: 190199986 Test: atest CtsNetTestCases:UriTest Ignore-AOSP-First: security fix Change-Id: I8d2b9b787e3a2224f96a476eee759bc50dd881c7 --- .../cts/net/src/android/net/cts/UriTest.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/UriTest.java b/tests/cts/net/src/android/net/cts/UriTest.java index 40b8fb7259..741947bcc1 100644 --- a/tests/cts/net/src/android/net/cts/UriTest.java +++ b/tests/cts/net/src/android/net/cts/UriTest.java @@ -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) {