diff options
| author | Brian Orr <brianorr@google.com> | 2021-08-11 19:11:45 +0000 |
|---|---|---|
| committer | Brian Orr <brianorr@google.com> | 2021-08-11 23:59:25 +0000 |
| commit | ab1e0271287465c071b9b6ba89e6845fd7161063 (patch) | |
| tree | 642e46e0ca778bf77b958c4973aaa8f6e030740e /core/tests | |
| parent | b6bd2054b05bb47779c041675f34828517288d73 (diff) | |
| parent | 1cb4fdb115b920ff5df88c33047243bef48224a6 (diff) | |
Merge SP1A.210811.001
Change-Id: I5aa7cf27a3a3cc16830c9947a826e30a0da481c4
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/coretests/src/android/app/backup/FullBackupTest.java | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/core/tests/coretests/src/android/app/backup/FullBackupTest.java b/core/tests/coretests/src/android/app/backup/FullBackupTest.java index 08edb4e9be97..bc92da928d1e 100644 --- a/core/tests/coretests/src/android/app/backup/FullBackupTest.java +++ b/core/tests/coretests/src/android/app/backup/FullBackupTest.java @@ -16,6 +16,8 @@ package android.app.backup; +import static android.app.backup.FullBackup.ConfigSection.CLOUD_BACKUP; + import android.app.backup.FullBackup.BackupScheme.PathWithRequiredFlags; import android.content.Context; import android.test.AndroidTestCase; @@ -414,6 +416,37 @@ public class FullBackupTest extends AndroidTestCase { assertNull("Didn't throw away invalid \"..\" path.", fileDomainIncludes); } + public void testParseNewBackupSchemeFromXml_emptyCloudSectionIsRespected() throws Exception { + mXpp.setInput(new StringReader( + "<data-extraction-rules>" + + "<cloud-backup>" + + "</cloud-backup>" + + "</data-extraction-rules>")); + + FullBackup.BackupScheme backupScheme = FullBackup.getBackupSchemeForTest(mContext); + boolean result = backupScheme.parseNewBackupSchemeFromXmlLocked(mXpp, CLOUD_BACKUP, + excludesSet, includeMap); + + assertTrue(result); + } + + public void testParseNewBackupSchemeFromXml_emptyCloudSectionWithEncryptionFlagIsRespected() + throws Exception { + mXpp.setInput(new StringReader( + "<data-extraction-rules>" + + "<cloud-backup disableIfNoEncryptionCapabilities=\"true\">" + + "</cloud-backup>" + + "</data-extraction-rules>")); + + FullBackup.BackupScheme backupScheme = FullBackup.getBackupSchemeForTest(mContext); + boolean result = backupScheme.parseNewBackupSchemeFromXmlLocked(mXpp, CLOUD_BACKUP, + excludesSet, includeMap); + + assertTrue(result); + assertEquals(backupScheme.getRequiredTransportFlags(), + BackupAgent.FLAG_CLIENT_SIDE_ENCRYPTION_ENABLED); + } + public void testDoubleDotInPath_isIgnored() throws Exception { mXpp.setInput(new StringReader( "<full-backup-content>" + |