Snap for 4963492 from fd4c5acca23b44811bab8628473cb58526753da0 to pi-qpr1-release
Change-Id: Ieec12ee80de154fb6f0c6217f50444088f54e052
diff --git a/src/com/android/tradefed/testtype/InstrumentationFileTest.java b/src/com/android/tradefed/testtype/InstrumentationFileTest.java
index 07296d6..3416e22 100644
--- a/src/com/android/tradefed/testtype/InstrumentationFileTest.java
+++ b/src/com/android/tradefed/testtype/InstrumentationFileTest.java
@@ -154,6 +154,8 @@
// push test file to the device and run
mFilePathOnDevice = ON_DEVICE_TEST_DIR_LOCATION + testFile.getName();
if (pushFileToTestDevice(testFile, mFilePathOnDevice)) {
+ // Unset package name if any just in case to avoid conflict with classname.
+ mInstrumentationTest.setTestPackageName(null);
mInstrumentationTest.setTestFilePathOnDevice(mFilePathOnDevice);
CLog.d("Test file %s was successfully pushed to %s on device",
testFile.getAbsolutePath(), mFilePathOnDevice);
diff --git a/src/com/android/tradefed/testtype/InstrumentationTest.java b/src/com/android/tradefed/testtype/InstrumentationTest.java
index ae2b8c7..d3f3102 100644
--- a/src/com/android/tradefed/testtype/InstrumentationTest.java
+++ b/src/com/android/tradefed/testtype/InstrumentationTest.java
@@ -375,14 +375,14 @@
/**
* Get the class name to run.
*/
- String getClassName() {
+ protected String getClassName() {
return mTestClassName;
}
/**
* Get the test method to run.
*/
- String getMethodName() {
+ protected String getMethodName() {
return mTestMethodName;
}
@@ -393,10 +393,8 @@
return mTestFilePathOnDevice;
}
- /**
- * Get the test java package to run.
- */
- String getTestPackageName() {
+ /** Get the test java package to run. */
+ protected String getTestPackageName() {
return mTestPackageName;
}