LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nuke CTS Migration Library, extend CompatibilityBuildHelper

Browse Source 
bug: 21762834
Test: cts-tradefed run cts -m CtsAppSecurityHostTestCases
Change-Id: I72296ca84c76e4af2de0249e4cdb57fed3065e07
This commit is contained in:
Aaron Holden
2016-11-22 18:44:36 -08:00
parent f705bf695e
commit 2bc9c349db
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cts/hostside/Android.mk
View File

@@ -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

5
tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java
View File

@@ -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)