Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Fix robotests for AOSP"

Browse Source
This commit is contained in:
Treehugger Robot
2019-06-28 13:00:07 +00:00
committed by Gerrit Code Review
parent 19cb14b3be b6608344d5
commit 51b6c76660
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/robotests/Android.mk
View File

@@ -64,12 +64,14 @@ LOCAL_SRC_FILES := \
$(call all-Iaidl-files-under, ../../core/java/android/app/backup) \
../../core/java/android/content/pm/PackageInfo.java \
../../core/java/android/app/IBackupAgent.aidl \
../../core/java/android/util/KeyValueSettingObserver.java
../../core/java/android/util/KeyValueSettingObserver.java \
../../../../system/apex/apexd/aidl/android/apex/ApexInfo.aidl
LOCAL_AIDL_INCLUDES := \
$(call all-Iaidl-files-under, $(INTERNAL_BACKUP)) \
$(call all-Iaidl-files-under, ../../core/java/android/app/backup) \
../../core/java/android/app/IBackupAgent.aidl
../../core/java/android/app/IBackupAgent.aidl \
../../../../system/apex/apexd/aidl/android/apex/ApexInfo.aidl
LOCAL_STATIC_JAVA_LIBRARIES := \
platform-robolectric-android-all-stubs \

4
services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java
View File

@@ -19,7 +19,6 @@ package com.android.server.backup;
import static com.android.server.backup.testing.BackupManagerServiceTestUtils.createBackupWakeLock;
import static com.android.server.backup.testing.BackupManagerServiceTestUtils.setUpBackupManagerServiceBasics;
import static com.android.server.backup.testing.BackupManagerServiceTestUtils.startBackupThreadAndGetLooper;
import static com.android.server.backup.testing.TransportData.backupTransport;
import static com.google.common.truth.Truth.assertThat;
@@ -80,7 +79,6 @@ import com.android.server.testing.shadows.ShadowBackupDataInput;
import com.android.server.testing.shadows.ShadowBackupDataOutput;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatcher;
@@ -106,7 +104,7 @@ import java.util.stream.Stream;
sdk = 26,
shadows = {ShadowBackupDataInput.class, ShadowBackupDataOutput.class, ShadowQueuedWork.class}
)
@SystemLoaderPackages({"com.android.server.backup", "android.app.backup"})
@SystemLoaderPackages({"com.android.server.backup", "android.app.backup", "android.apex"})
@SystemLoaderClasses({IBackupTransport.class, IBackupAgent.class, PackageInfo.class})
@Presubmit
public class PerformBackupTaskTest {