diff options
5 files changed, 10 insertions, 8 deletions
diff --git a/services/tests/PackageManagerServiceTests/server/Android.bp b/services/tests/PackageManagerServiceTests/server/Android.bp index f1edd96d1adc..6b1d63d59885 100644 --- a/services/tests/PackageManagerServiceTests/server/Android.bp +++ b/services/tests/PackageManagerServiceTests/server/Android.bp @@ -106,6 +106,10 @@ android_test { ":PackageParserTestApp5", ], resource_zips: [":PackageManagerServiceServerTests_apks_as_resources"], + + data: [ + ":StubTestApp", + ], } // Rules to copy all the test apks to the intermediate raw resource directory diff --git a/services/tests/PackageManagerServiceTests/server/AndroidTest.xml b/services/tests/PackageManagerServiceTests/server/AndroidTest.xml index 869d60ead3a1..8cd4c54b0014 100644 --- a/services/tests/PackageManagerServiceTests/server/AndroidTest.xml +++ b/services/tests/PackageManagerServiceTests/server/AndroidTest.xml @@ -23,6 +23,11 @@ <option name="test-file-name" value="PackageManagerServiceServerTests.apk" /> </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" /> diff --git a/services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageManagerServiceTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageManagerServiceTest.java index b82ffb4d0b39..435f0d7f5f15 100644 --- a/services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageManagerServiceTest.java +++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageManagerServiceTest.java @@ -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"; diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index 40d99487fd9c..132a1d0b86c2 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -102,7 +102,6 @@ android_test { data: [ ":JobTestApp", - ":StubTestApp", ":SimpleServiceTestApp1", ":SimpleServiceTestApp2", ":SimpleServiceTestApp3", diff --git a/services/tests/servicestests/AndroidTest.xml b/services/tests/servicestests/AndroidTest.xml index 7092092fef25..c3be94540e0e 100644 --- a/services/tests/servicestests/AndroidTest.xml +++ b/services/tests/servicestests/AndroidTest.xml @@ -40,11 +40,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" /> |