From dae228b492b5eb64c413291ba73f74192b37f92b Mon Sep 17 00:00:00 2001 From: Chandan Nath Date: Tue, 11 Dec 2018 18:55:44 +0000 Subject: [PATCH] [Roboelectric] Split Robolectric frameworks services targets 1. Move all backup tests from services/robotests/src to services/robotests/backup/src 2. Copied over services/robotests/backup/config/robolectric.properties 3. Copied and modified services/robotests/backup/Android.mk Bug: 120223382 Test: 1) atest RunFrameworksServicesRoboTests (backup + location). out: RunFrameworksServicesRoboTests: OK (615 tests) 2) atest RunBackupFrameworksServicesRoboTests (backup). out: RunBackupFrameworksServicesRoboTests: OK (582 tests) Change-Id: I2b0c95b22e90b01f715f772c60c2179b8c0eb29b --- services/robotests/Android.mk | 14 +++- services/robotests/backup/Android.mk | 84 +++++++++++++++++++ .../backup/config/robolectric.properties | 1 + .../android/app/backup/BackupUtilsTest.java | 0 .../app/backup/ForwardingBackupAgent.java | 0 .../com/android/commands/bmgr/BmgrTest.java | 0 .../android/commands/bu/AdbBackupTest.java | 0 .../BackupAgentTimeoutParametersTest.java | 0 .../backup/BackupManagerConstantsTest.java | 0 .../backup/BackupManagerServiceTest.java | 0 .../server/backup/KeyValueBackupJobTest.java | 0 .../server/backup/TransportManagerTest.java | 0 .../backup/UserBackupManagerServiceTest.java | 0 .../encryption/chunk/ChunkHashTest.java | 0 .../encryption/chunk/ChunkListingTest.java | 0 .../backup/encryption/chunk/ChunkTest.java | 0 .../chunk/EncryptedChunkOrderingTest.java | 0 .../chunking/ChunkEncryptorTest.java | 0 .../encryption/chunking/ChunkHasherTest.java | 0 .../chunking/EncryptedChunkTest.java | 0 ...nlineLengthsEncryptedChunkEncoderTest.java | 0 .../LengthlessEncryptedChunkEncoderTest.java | 0 .../chunking/RawBackupWriterTest.java | 0 .../cdc/ContentDefinedChunkerTest.java | 0 .../chunking/cdc/FingerprintMixerTest.java | 0 .../encryption/chunking/cdc/HkdfTest.java | 0 .../chunking/cdc/IsChunkBreakpointTest.java | 0 .../chunking/cdc/RabinFingerprint64Test.java | 0 ...erableKeyStoreSecondaryKeyManagerTest.java | 0 .../RecoverableKeyStoreSecondaryKeyTest.java | 0 .../keys/TertiaryKeyGeneratorTest.java | 0 .../keys/TertiaryKeyRotationTrackerTest.java | 0 .../storage/BackupEncryptionDbTest.java | 0 .../storage/TertiaryKeysTableTest.java | 0 .../AppMetadataBackupWriterTest.java | 0 .../internal/PerformInitializeTaskTest.java | 0 .../backup/keyvalue/AgentExceptionTest.java | 0 .../backup/keyvalue/BackupExceptionTest.java | 0 .../keyvalue/KeyValueBackupReporterTest.java | 0 .../keyvalue/KeyValueBackupTaskTest.java | 0 .../backup/keyvalue/TaskExceptionTest.java | 0 .../remote/FutureBackupCallbackTest.java | 0 .../server/backup/remote/RemoteCallTest.java | 0 .../backup/remote/RemoteResultTest.java | 0 .../remote/ServiceBackupCallbackTest.java | 0 .../restore/ActiveRestoreSessionTest.java | 0 .../BackupManagerServiceTestUtils.java | 0 .../backup/testing/CryptoTestUtils.java | 0 .../server/backup/testing/PackageData.java | 0 .../server/backup/testing/TestUtils.java | 0 .../server/backup/testing/TransportData.java | 0 .../backup/testing/TransportTestUtils.java | 0 .../android/server/backup/testing/Utils.java | 0 .../transport/TransportClientManagerTest.java | 0 .../backup/transport/TransportClientTest.java | 0 .../backup/transport/TransportStatsTest.java | 0 56 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 services/robotests/backup/Android.mk create mode 100644 services/robotests/backup/config/robolectric.properties rename services/robotests/{ => backup}/src/android/app/backup/BackupUtilsTest.java (100%) rename services/robotests/{ => backup}/src/android/app/backup/ForwardingBackupAgent.java (100%) rename services/robotests/{ => backup}/src/com/android/commands/bmgr/BmgrTest.java (100%) rename services/robotests/{ => backup}/src/com/android/commands/bu/AdbBackupTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/BackupAgentTimeoutParametersTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/BackupManagerConstantsTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/BackupManagerServiceTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/KeyValueBackupJobTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/TransportManagerTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/UserBackupManagerServiceTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunk/ChunkHashTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunk/ChunkListingTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunk/ChunkTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrderingTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunking/ChunkEncryptorTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunking/ChunkHasherTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunking/EncryptedChunkTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoderTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoderTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunking/RawBackupWriterTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunkerTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixerTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunking/cdc/HkdfTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpointTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64Test.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManagerTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/keys/TertiaryKeyGeneratorTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/keys/TertiaryKeyRotationTrackerTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/storage/BackupEncryptionDbTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/encryption/storage/TertiaryKeysTableTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/fullbackup/AppMetadataBackupWriterTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/internal/PerformInitializeTaskTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/keyvalue/AgentExceptionTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/keyvalue/BackupExceptionTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/keyvalue/KeyValueBackupReporterTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/keyvalue/TaskExceptionTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/remote/FutureBackupCallbackTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/remote/RemoteCallTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/remote/RemoteResultTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/remote/ServiceBackupCallbackTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/restore/ActiveRestoreSessionTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/testing/BackupManagerServiceTestUtils.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/testing/CryptoTestUtils.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/testing/PackageData.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/testing/TestUtils.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/testing/TransportData.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/testing/TransportTestUtils.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/testing/Utils.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/transport/TransportClientManagerTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/transport/TransportClientTest.java (100%) rename services/robotests/{ => backup}/src/com/android/server/backup/transport/TransportStatsTest.java (100%) diff --git a/services/robotests/Android.mk b/services/robotests/Android.mk index 0c9c85acf6e2d..9159f0d476212 100644 --- a/services/robotests/Android.mk +++ b/services/robotests/Android.mk @@ -41,7 +41,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := FrameworksServicesRoboTests -LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_SRC_FILES := $(call all-java-files-under, src) \ + $(call all-java-files-under, backup/src) LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res @@ -81,4 +82,13 @@ LOCAL_JAVA_LIBRARIES := \ LOCAL_TEST_PACKAGE := FrameworksServicesLib -include external/robolectric-shadows/run_robotests.mk \ No newline at end of file +LOCAL_ROBOTEST_FILES := $(call find-files-in-subdirs,$(LOCAL_PATH)/src,*Test.java,.) \ + $(call find-files-in-subdirs,$(LOCAL_PATH)/backup/src,*Test.java,.) + +include external/robolectric-shadows/run_robotests.mk + +################################################################### +# include subdir Android.mk files +################################################################### +include $(CLEAR_VARS) +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/services/robotests/backup/Android.mk b/services/robotests/backup/Android.mk new file mode 100644 index 0000000000000..cc59b0c9bb16f --- /dev/null +++ b/services/robotests/backup/Android.mk @@ -0,0 +1,84 @@ +# Copyright (C) 2018 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_PATH := $(call my-dir) + +################################################################### +# BackupFrameworksServicesLib app just for Robolectric test target # +################################################################### +include $(CLEAR_VARS) + +LOCAL_PACKAGE_NAME := BackupFrameworksServicesLib +LOCAL_PRIVATE_PLATFORM_APIS := true +LOCAL_MODULE_TAGS := optional + +LOCAL_PRIVILEGED_MODULE := true + +LOCAL_STATIC_JAVA_LIBRARIES := \ + bmgrlib \ + bu \ + services.backup \ + services.core \ + services.net + +include $(BUILD_PACKAGE) + +################################################################### +# BackupFrameworksServicesLib Robolectric test target. # +################################################################### +include $(CLEAR_VARS) + +LOCAL_MODULE := BackupFrameworksServicesRoboTests + +LOCAL_SRC_FILES := $(call all-java-files-under, src) \ + $(call all-java-files-under, ../src/com/android/server/testing/shadows) + +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +LOCAL_JAVA_RESOURCE_DIRS := config + +# Include the testing libraries +LOCAL_JAVA_LIBRARIES := \ + platform-test-annotations \ + robolectric_android-all-stub \ + Robolectric_all-target \ + mockito-robolectric-prebuilt \ + truth-prebuilt \ + testng + +LOCAL_INSTRUMENTATION_FOR := BackupFrameworksServicesLib + +LOCAL_MODULE_TAGS := optional + +include $(BUILD_STATIC_JAVA_LIBRARY) + +################################################################### +# BackupFrameworksServicesLib runner target to run the previous target. # +################################################################### +include $(CLEAR_VARS) + +LOCAL_MODULE := RunBackupFrameworksServicesRoboTests + +LOCAL_JAVA_LIBRARIES := \ + BackupFrameworksServicesRoboTests \ + platform-test-annotations \ + robolectric_android-all-stub \ + Robolectric_all-target \ + mockito-robolectric-prebuilt \ + truth-prebuilt \ + testng + +LOCAL_TEST_PACKAGE := BackupFrameworksServicesLib + +include external/robolectric-shadows/run_robotests.mk diff --git a/services/robotests/backup/config/robolectric.properties b/services/robotests/backup/config/robolectric.properties new file mode 100644 index 0000000000000..850557a9b6936 --- /dev/null +++ b/services/robotests/backup/config/robolectric.properties @@ -0,0 +1 @@ +sdk=NEWEST_SDK \ No newline at end of file diff --git a/services/robotests/src/android/app/backup/BackupUtilsTest.java b/services/robotests/backup/src/android/app/backup/BackupUtilsTest.java similarity index 100% rename from services/robotests/src/android/app/backup/BackupUtilsTest.java rename to services/robotests/backup/src/android/app/backup/BackupUtilsTest.java diff --git a/services/robotests/src/android/app/backup/ForwardingBackupAgent.java b/services/robotests/backup/src/android/app/backup/ForwardingBackupAgent.java similarity index 100% rename from services/robotests/src/android/app/backup/ForwardingBackupAgent.java rename to services/robotests/backup/src/android/app/backup/ForwardingBackupAgent.java diff --git a/services/robotests/src/com/android/commands/bmgr/BmgrTest.java b/services/robotests/backup/src/com/android/commands/bmgr/BmgrTest.java similarity index 100% rename from services/robotests/src/com/android/commands/bmgr/BmgrTest.java rename to services/robotests/backup/src/com/android/commands/bmgr/BmgrTest.java diff --git a/services/robotests/src/com/android/commands/bu/AdbBackupTest.java b/services/robotests/backup/src/com/android/commands/bu/AdbBackupTest.java similarity index 100% rename from services/robotests/src/com/android/commands/bu/AdbBackupTest.java rename to services/robotests/backup/src/com/android/commands/bu/AdbBackupTest.java diff --git a/services/robotests/src/com/android/server/backup/BackupAgentTimeoutParametersTest.java b/services/robotests/backup/src/com/android/server/backup/BackupAgentTimeoutParametersTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/BackupAgentTimeoutParametersTest.java rename to services/robotests/backup/src/com/android/server/backup/BackupAgentTimeoutParametersTest.java diff --git a/services/robotests/src/com/android/server/backup/BackupManagerConstantsTest.java b/services/robotests/backup/src/com/android/server/backup/BackupManagerConstantsTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/BackupManagerConstantsTest.java rename to services/robotests/backup/src/com/android/server/backup/BackupManagerConstantsTest.java diff --git a/services/robotests/src/com/android/server/backup/BackupManagerServiceTest.java b/services/robotests/backup/src/com/android/server/backup/BackupManagerServiceTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/BackupManagerServiceTest.java rename to services/robotests/backup/src/com/android/server/backup/BackupManagerServiceTest.java diff --git a/services/robotests/src/com/android/server/backup/KeyValueBackupJobTest.java b/services/robotests/backup/src/com/android/server/backup/KeyValueBackupJobTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/KeyValueBackupJobTest.java rename to services/robotests/backup/src/com/android/server/backup/KeyValueBackupJobTest.java diff --git a/services/robotests/src/com/android/server/backup/TransportManagerTest.java b/services/robotests/backup/src/com/android/server/backup/TransportManagerTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/TransportManagerTest.java rename to services/robotests/backup/src/com/android/server/backup/TransportManagerTest.java diff --git a/services/robotests/src/com/android/server/backup/UserBackupManagerServiceTest.java b/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/UserBackupManagerServiceTest.java rename to services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunk/ChunkHashTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkHashTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunk/ChunkHashTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkHashTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunk/ChunkListingTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkListingTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunk/ChunkListingTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkListingTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunk/ChunkTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunk/ChunkTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrderingTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrderingTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrderingTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrderingTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/ChunkEncryptorTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunking/ChunkEncryptorTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunking/ChunkEncryptorTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunking/ChunkEncryptorTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/ChunkHasherTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunking/ChunkHasherTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunking/ChunkHasherTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunking/ChunkHasherTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/EncryptedChunkTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunking/EncryptedChunkTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunking/EncryptedChunkTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunking/EncryptedChunkTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoderTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoderTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoderTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoderTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoderTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoderTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoderTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoderTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/RawBackupWriterTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunking/RawBackupWriterTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunking/RawBackupWriterTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunking/RawBackupWriterTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunkerTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunkerTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunkerTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunkerTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixerTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixerTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixerTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixerTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/HkdfTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/HkdfTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunking/cdc/HkdfTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/HkdfTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpointTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpointTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpointTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpointTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64Test.java b/services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64Test.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64Test.java rename to services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64Test.java diff --git a/services/robotests/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManagerTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManagerTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManagerTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManagerTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/keys/TertiaryKeyGeneratorTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/keys/TertiaryKeyGeneratorTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/keys/TertiaryKeyGeneratorTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/keys/TertiaryKeyGeneratorTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/keys/TertiaryKeyRotationTrackerTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/keys/TertiaryKeyRotationTrackerTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/keys/TertiaryKeyRotationTrackerTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/keys/TertiaryKeyRotationTrackerTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/storage/BackupEncryptionDbTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/storage/BackupEncryptionDbTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/storage/BackupEncryptionDbTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/storage/BackupEncryptionDbTest.java diff --git a/services/robotests/src/com/android/server/backup/encryption/storage/TertiaryKeysTableTest.java b/services/robotests/backup/src/com/android/server/backup/encryption/storage/TertiaryKeysTableTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/encryption/storage/TertiaryKeysTableTest.java rename to services/robotests/backup/src/com/android/server/backup/encryption/storage/TertiaryKeysTableTest.java diff --git a/services/robotests/src/com/android/server/backup/fullbackup/AppMetadataBackupWriterTest.java b/services/robotests/backup/src/com/android/server/backup/fullbackup/AppMetadataBackupWriterTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/fullbackup/AppMetadataBackupWriterTest.java rename to services/robotests/backup/src/com/android/server/backup/fullbackup/AppMetadataBackupWriterTest.java diff --git a/services/robotests/src/com/android/server/backup/internal/PerformInitializeTaskTest.java b/services/robotests/backup/src/com/android/server/backup/internal/PerformInitializeTaskTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/internal/PerformInitializeTaskTest.java rename to services/robotests/backup/src/com/android/server/backup/internal/PerformInitializeTaskTest.java diff --git a/services/robotests/src/com/android/server/backup/keyvalue/AgentExceptionTest.java b/services/robotests/backup/src/com/android/server/backup/keyvalue/AgentExceptionTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/keyvalue/AgentExceptionTest.java rename to services/robotests/backup/src/com/android/server/backup/keyvalue/AgentExceptionTest.java diff --git a/services/robotests/src/com/android/server/backup/keyvalue/BackupExceptionTest.java b/services/robotests/backup/src/com/android/server/backup/keyvalue/BackupExceptionTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/keyvalue/BackupExceptionTest.java rename to services/robotests/backup/src/com/android/server/backup/keyvalue/BackupExceptionTest.java diff --git a/services/robotests/src/com/android/server/backup/keyvalue/KeyValueBackupReporterTest.java b/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupReporterTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/keyvalue/KeyValueBackupReporterTest.java rename to services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupReporterTest.java diff --git a/services/robotests/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java b/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java rename to services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java diff --git a/services/robotests/src/com/android/server/backup/keyvalue/TaskExceptionTest.java b/services/robotests/backup/src/com/android/server/backup/keyvalue/TaskExceptionTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/keyvalue/TaskExceptionTest.java rename to services/robotests/backup/src/com/android/server/backup/keyvalue/TaskExceptionTest.java diff --git a/services/robotests/src/com/android/server/backup/remote/FutureBackupCallbackTest.java b/services/robotests/backup/src/com/android/server/backup/remote/FutureBackupCallbackTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/remote/FutureBackupCallbackTest.java rename to services/robotests/backup/src/com/android/server/backup/remote/FutureBackupCallbackTest.java diff --git a/services/robotests/src/com/android/server/backup/remote/RemoteCallTest.java b/services/robotests/backup/src/com/android/server/backup/remote/RemoteCallTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/remote/RemoteCallTest.java rename to services/robotests/backup/src/com/android/server/backup/remote/RemoteCallTest.java diff --git a/services/robotests/src/com/android/server/backup/remote/RemoteResultTest.java b/services/robotests/backup/src/com/android/server/backup/remote/RemoteResultTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/remote/RemoteResultTest.java rename to services/robotests/backup/src/com/android/server/backup/remote/RemoteResultTest.java diff --git a/services/robotests/src/com/android/server/backup/remote/ServiceBackupCallbackTest.java b/services/robotests/backup/src/com/android/server/backup/remote/ServiceBackupCallbackTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/remote/ServiceBackupCallbackTest.java rename to services/robotests/backup/src/com/android/server/backup/remote/ServiceBackupCallbackTest.java diff --git a/services/robotests/src/com/android/server/backup/restore/ActiveRestoreSessionTest.java b/services/robotests/backup/src/com/android/server/backup/restore/ActiveRestoreSessionTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/restore/ActiveRestoreSessionTest.java rename to services/robotests/backup/src/com/android/server/backup/restore/ActiveRestoreSessionTest.java diff --git a/services/robotests/src/com/android/server/backup/testing/BackupManagerServiceTestUtils.java b/services/robotests/backup/src/com/android/server/backup/testing/BackupManagerServiceTestUtils.java similarity index 100% rename from services/robotests/src/com/android/server/backup/testing/BackupManagerServiceTestUtils.java rename to services/robotests/backup/src/com/android/server/backup/testing/BackupManagerServiceTestUtils.java diff --git a/services/robotests/src/com/android/server/backup/testing/CryptoTestUtils.java b/services/robotests/backup/src/com/android/server/backup/testing/CryptoTestUtils.java similarity index 100% rename from services/robotests/src/com/android/server/backup/testing/CryptoTestUtils.java rename to services/robotests/backup/src/com/android/server/backup/testing/CryptoTestUtils.java diff --git a/services/robotests/src/com/android/server/backup/testing/PackageData.java b/services/robotests/backup/src/com/android/server/backup/testing/PackageData.java similarity index 100% rename from services/robotests/src/com/android/server/backup/testing/PackageData.java rename to services/robotests/backup/src/com/android/server/backup/testing/PackageData.java diff --git a/services/robotests/src/com/android/server/backup/testing/TestUtils.java b/services/robotests/backup/src/com/android/server/backup/testing/TestUtils.java similarity index 100% rename from services/robotests/src/com/android/server/backup/testing/TestUtils.java rename to services/robotests/backup/src/com/android/server/backup/testing/TestUtils.java diff --git a/services/robotests/src/com/android/server/backup/testing/TransportData.java b/services/robotests/backup/src/com/android/server/backup/testing/TransportData.java similarity index 100% rename from services/robotests/src/com/android/server/backup/testing/TransportData.java rename to services/robotests/backup/src/com/android/server/backup/testing/TransportData.java diff --git a/services/robotests/src/com/android/server/backup/testing/TransportTestUtils.java b/services/robotests/backup/src/com/android/server/backup/testing/TransportTestUtils.java similarity index 100% rename from services/robotests/src/com/android/server/backup/testing/TransportTestUtils.java rename to services/robotests/backup/src/com/android/server/backup/testing/TransportTestUtils.java diff --git a/services/robotests/src/com/android/server/backup/testing/Utils.java b/services/robotests/backup/src/com/android/server/backup/testing/Utils.java similarity index 100% rename from services/robotests/src/com/android/server/backup/testing/Utils.java rename to services/robotests/backup/src/com/android/server/backup/testing/Utils.java diff --git a/services/robotests/src/com/android/server/backup/transport/TransportClientManagerTest.java b/services/robotests/backup/src/com/android/server/backup/transport/TransportClientManagerTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/transport/TransportClientManagerTest.java rename to services/robotests/backup/src/com/android/server/backup/transport/TransportClientManagerTest.java diff --git a/services/robotests/src/com/android/server/backup/transport/TransportClientTest.java b/services/robotests/backup/src/com/android/server/backup/transport/TransportClientTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/transport/TransportClientTest.java rename to services/robotests/backup/src/com/android/server/backup/transport/TransportClientTest.java diff --git a/services/robotests/src/com/android/server/backup/transport/TransportStatsTest.java b/services/robotests/backup/src/com/android/server/backup/transport/TransportStatsTest.java similarity index 100% rename from services/robotests/src/com/android/server/backup/transport/TransportStatsTest.java rename to services/robotests/backup/src/com/android/server/backup/transport/TransportStatsTest.java