From 2bc9c349db402768c05190189987620361d2f06f Mon Sep 17 00:00:00 2001 From: Aaron Holden Date: Tue, 22 Nov 2016 18:44:36 -0800 Subject: [PATCH] Nuke CTS Migration Library, extend CompatibilityBuildHelper bug: 21762834 Test: cts-tradefed run cts -m CtsAppSecurityHostTestCases Change-Id: I72296ca84c76e4af2de0249e4cdb57fed3065e07 --- tests/cts/hostside/Android.mk | 2 -- .../src/com/android/cts/net/HostsideNetworkTestCase.java | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/cts/hostside/Android.mk b/tests/cts/hostside/Android.mk index 96d735fdca..1c3f0536c4 100644 --- a/tests/cts/hostside/Android.mk +++ b/tests/cts/hostside/Android.mk @@ -23,8 +23,6 @@ LOCAL_MODULE := CtsHostsideNetworkTests LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed -LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib - LOCAL_CTS_TEST_PACKAGE := android.net.hostsidenetwork # Tag this module as a cts test artifact diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java index 6642512758..f3d7dbd4ff 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java @@ -16,7 +16,7 @@ package com.android.cts.net; -import com.android.cts.migration.MigrationHelper; +import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper; import com.android.ddmlib.Log; import com.android.ddmlib.testrunner.RemoteAndroidTestRunner; import com.android.ddmlib.testrunner.TestIdentifier; @@ -80,7 +80,8 @@ abstract class HostsideNetworkTestCase extends DeviceTestCase implements IAbiRec protected void installPackage(String apk) throws FileNotFoundException, DeviceNotAvailableException { - assertNull(getDevice().installPackage(MigrationHelper.getTestFile(mCtsBuild, apk), false)); + CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild); + assertNull(getDevice().installPackage(buildHelper.getTestFile(apk), false)); } protected void uninstallPackage(String packageName, boolean shouldSucceed)