Delete RefAppTest
This test wasn't doing much besides scrolling in a ListView.
It required special building rules to build it.
Change-Id: Id2905f6d09a2dd1a949629ded68a0706c7bc8e14
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
index 4067e0a..db95aba 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageDef.java
@@ -52,9 +52,6 @@
private String mTestType = null;
private String mJarPath = null;
private boolean mIsSignatureTest = false;
- private boolean mIsReferenceAppTest = false;
- private String mPackageToTest = null;
- private String mApkToTestName = null;
private String mTestPackageName = null;
private String mDigest = null;
@@ -140,26 +137,10 @@
return mIsSignatureTest;
}
- void setIsReferenceApp(boolean isReferenceApp) {
- mIsReferenceAppTest = isReferenceApp;
- }
-
- boolean isReferenceApp() {
- return mIsReferenceAppTest;
- }
-
- void setPackageToTest(String packageName) {
- mPackageToTest = packageName;
- }
-
void setTestPackageName(String testPackageName) {
mTestPackageName = testPackageName;
}
- void setApkToTest(String apkName) {
- mApkToTestName = apkName;
- }
-
void setTargetBinaryName(String targetBinaryName) {
mTargetBinaryName = targetBinaryName;
}
@@ -245,11 +226,6 @@
instrTest.addInstallApk(String.format("%s.apk", mName), mAppNameSpace);
mDigest = generateDigest(testCaseDir, String.format("%s.apk", mName));
return instrTest;
- } else if (mIsReferenceAppTest) {
- // a reference app test is just a InstrumentationTest with one extra apk to install
- InstrumentationApkTest instrTest = new InstrumentationApkTest();
- instrTest.addInstallApk(String.format("%s.apk", mApkToTestName), mPackageToTest);
- return setInstrumentationTest(instrTest, testCaseDir);
} else {
CLog.d("Creating instrumentation test for %s", mName);
InstrumentationApkTest instrTest = new InstrumentationApkTest();
@@ -261,8 +237,6 @@
* Populates given {@link InstrumentationApkTest} with data from the package xml.
*
* @param testCaseDir
- * @param className
- * @param methodName
* @param instrTest
* @return the populated {@link InstrumentationTest} or <code>null</code>
*/
@@ -314,9 +288,9 @@
}
/**
- * Add a {@link TestDef} to the list of tests in this package.
+ * Add a {@link TestIdentifier} to the list of tests in this package.
*
- * @param testdef
+ * @param testDef
*/
void addTest(TestIdentifier testDef) {
mTests.add(testDef);
@@ -357,7 +331,8 @@
MessageDigest md = MessageDigest.getInstance(algorithm);
d = new DigestInputStream(fileStream, md);
byte[] buffer = new byte[8196];
- while (d.read(buffer) != -1);
+ while (d.read(buffer) != -1) {
+ }
return toHexString(md.digest());
} catch (NoSuchAlgorithmException e) {
return algorithm + " not found";