diff options
Diffstat (limited to 'services/robotests')
8 files changed, 52 insertions, 4 deletions
diff --git a/services/robotests/Android.bp b/services/robotests/Android.bp index 52eae21f9e66..a70802ad3337 100644 --- a/services/robotests/Android.bp +++ b/services/robotests/Android.bp @@ -57,9 +57,13 @@ android_robolectric_test { ], static_libs: [ "androidx.test.ext.truth", + "Settings-robo-testutils", + "SettingsLib-robo-testutils", ], instrumentation_for: "FrameworksServicesLib", + + upstream: true, } filegroup { diff --git a/services/robotests/backup/Android.bp b/services/robotests/backup/Android.bp index 8b9efb312efe..569786b1e26f 100644 --- a/services/robotests/backup/Android.bp +++ b/services/robotests/backup/Android.bp @@ -57,6 +57,8 @@ android_robolectric_test { // Include the testing libraries libs: [ "mockito-robolectric-prebuilt", + "Settings-robo-testutils", + "SettingsLib-robo-testutils", "platform-test-annotations", "testng", "truth", @@ -64,4 +66,6 @@ android_robolectric_test { instrumentation_for: "BackupFrameworksServicesLib", + upstream: true, + } diff --git a/services/robotests/backup/config/robolectric.properties b/services/robotests/backup/config/robolectric.properties index 850557a9b693..1ebf6d423fe2 100644 --- a/services/robotests/backup/config/robolectric.properties +++ b/services/robotests/backup/config/robolectric.properties @@ -1 +1,3 @@ -sdk=NEWEST_SDK
\ No newline at end of file +sdk=NEWEST_SDK +looperMode=LEGACY +shadows=com.android.server.testing.shadows.FrameworkShadowLooper diff --git a/services/robotests/backup/src/com/android/server/backup/fullbackup/AppMetadataBackupWriterTest.java b/services/robotests/backup/src/com/android/server/backup/fullbackup/AppMetadataBackupWriterTest.java index ee5a534fe005..6839a06a0d9a 100644 --- a/services/robotests/backup/src/com/android/server/backup/fullbackup/AppMetadataBackupWriterTest.java +++ b/services/robotests/backup/src/com/android/server/backup/fullbackup/AppMetadataBackupWriterTest.java @@ -57,6 +57,7 @@ import java.nio.file.attribute.FileTime; ShadowBackupDataOutput.class, ShadowEnvironment.class, ShadowFullBackup.class, + ShadowSigningInfo.class, }) public class AppMetadataBackupWriterTest { private static final String TEST_PACKAGE = "com.test.package"; diff --git a/services/robotests/backup/src/com/android/server/backup/fullbackup/ShadowSigningInfo.java b/services/robotests/backup/src/com/android/server/backup/fullbackup/ShadowSigningInfo.java new file mode 100644 index 000000000000..53d807c2d3c9 --- /dev/null +++ b/services/robotests/backup/src/com/android/server/backup/fullbackup/ShadowSigningInfo.java @@ -0,0 +1,27 @@ +/* + * 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. + */ + +package com.android.server.backup.fullbackup; + +import static android.os.Build.VERSION_CODES.P; + +import android.content.pm.SigningInfo; + +import org.robolectric.annotation.Implements; + +@Implements(value = SigningInfo.class, minSdk = P) +public class ShadowSigningInfo { +} diff --git a/services/robotests/src/com/android/server/location/gnss/NtpNetworkTimeHelperTest.java b/services/robotests/src/com/android/server/location/gnss/NtpNetworkTimeHelperTest.java index 4949091646dd..009276359209 100644 --- a/services/robotests/src/com/android/server/location/gnss/NtpNetworkTimeHelperTest.java +++ b/services/robotests/src/com/android/server/location/gnss/NtpNetworkTimeHelperTest.java @@ -35,6 +35,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.LooperMode; import org.robolectric.shadows.ShadowLooper; import java.util.concurrent.CountDownLatch; @@ -45,6 +46,7 @@ import java.util.concurrent.TimeUnit; */ @RunWith(RobolectricTestRunner.class) @Presubmit +@LooperMode(LooperMode.Mode.LEGACY) public class NtpNetworkTimeHelperTest { private static final long MOCK_NTP_TIME = 1519930775453L; diff --git a/services/robotests/src/com/android/server/testing/shadows/FrameworkShadowLooper.java b/services/robotests/src/com/android/server/testing/shadows/FrameworkShadowLooper.java index 16d16cda42ed..3681bd4c6588 100644 --- a/services/robotests/src/com/android/server/testing/shadows/FrameworkShadowLooper.java +++ b/services/robotests/src/com/android/server/testing/shadows/FrameworkShadowLooper.java @@ -21,12 +21,15 @@ import android.os.Looper; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.RealObject; +import org.robolectric.shadows.LooperShadowPicker; +import org.robolectric.shadows.ShadowLegacyLooper; import org.robolectric.shadows.ShadowLooper; +import org.robolectric.shadows.ShadowPausedLooper; import java.util.Optional; -@Implements(value = Looper.class) -public class FrameworkShadowLooper extends ShadowLooper { +@Implements(value = Looper.class, shadowPicker = FrameworkShadowLooper.Picker.class) +public class FrameworkShadowLooper extends ShadowLegacyLooper { @RealObject private Looper mLooper; private Optional<Boolean> mIsCurrentThread = Optional.empty(); @@ -45,4 +48,10 @@ public class FrameworkShadowLooper extends ShadowLooper { } return Thread.currentThread() == mLooper.getThread(); } + + public static class Picker extends LooperShadowPicker<ShadowLooper> { + public Picker() { + super(FrameworkShadowLooper.class, ShadowPausedLooper.class); + } + } } diff --git a/services/robotests/src/com/android/server/testing/shadows/ShadowApplicationPackageManager.java b/services/robotests/src/com/android/server/testing/shadows/ShadowApplicationPackageManager.java index 4a9948668bc4..1da67597643f 100644 --- a/services/robotests/src/com/android/server/testing/shadows/ShadowApplicationPackageManager.java +++ b/services/robotests/src/com/android/server/testing/shadows/ShadowApplicationPackageManager.java @@ -95,7 +95,6 @@ public class ShadowApplicationPackageManager sPackageAppEnabledStates.put(packageName, Integer.valueOf(newState)); // flags unused here. } - @Override protected PackageInfo getPackageInfoAsUser(String packageName, int flags, int userId) throws NameNotFoundException { if (!sPackageInfos.containsKey(packageName)) { |