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

Merge "[pm] fix PackageManagerServiceTest" into udc-dev

Browse Source
This commit is contained in:
Song Chun Fan
2023-06-01 20:21:54 +00:00
committed by Android (Google) Code Review
parent 55c12ea588 a425dda7df
commit 7b288aa8d4
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/tests/PackageManagerServiceTests/server/Android.bp
View File

@@ -106,6 +106,10 @@ android_test {
":PackageParserTestApp6",
],
resource_zips: [":PackageManagerServiceServerTests_apks_as_resources"],
data: [
":StubTestApp",
],
}
// Rules to copy all the test apks to the intermediate raw resource directory

5
services/tests/PackageManagerServiceTests/server/AndroidTest.xml
View File

@@ -27,6 +27,11 @@
<option name="run-command" value="settings put global verifier_engprod 1" />
</target_preparer>
<!-- Load additional APKs onto device -->
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="push" value="StubTestApp.apk->/data/local/tmp/servicestests/StubTestApp.apk"/>
</target_preparer>
<option name="test-tag" value="PackageManagerServiceServerTests" />
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="com.android.server.pm.test.service.server" />

3
services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageManagerServiceTest.java
View File

@@ -32,7 +32,6 @@ import android.app.AppGlobals;
import android.content.IIntentReceiver;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.content.pm.PackageManagerInternal;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
@@ -70,7 +69,7 @@ import java.util.regex.Pattern;
@RunWith(AndroidJUnit4.class)
public class PackageManagerServiceTest {
private static final String PACKAGE_NAME = "com.android.frameworks.servicestests";
private static final String PACKAGE_NAME = "com.android.server.pm.test.service.server";
private static final String TEST_DATA_PATH = "/data/local/tmp/servicestests/";
private static final String TEST_APP_APK = "StubTestApp.apk";

1
services/tests/servicestests/Android.bp
View File

@@ -114,7 +114,6 @@ android_test {
":SimpleServiceTestApp1",
":SimpleServiceTestApp2",
":SimpleServiceTestApp3",
":StubTestApp",
":SuspendTestApp",
":MediaButtonReceiverHolderTestHelperApp",
"data/broken_shortcut.xml",

5
services/tests/servicestests/AndroidTest.xml
View File

@@ -44,11 +44,6 @@
<option name="teardown-command" value="rm -rf /data/local/tmp/servicestests"/>
</target_preparer>
<!-- Load additional APKs onto device -->
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="push" value="StubTestApp.apk->/data/local/tmp/servicestests/StubTestApp.apk"/>
</target_preparer>
<option name="test-tag" value="FrameworksServicesTests" />
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="com.android.frameworks.servicestests" />