Merge "Fix coding style of VtsMultiDeviceTest and VtsMultiDeviceTestResultParser" into pie-vts-dev
am: 562ce068ee
Change-Id: I0789c8318ae8f90a5bb1e1d8ac4e516e8309cb91
diff --git a/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTest.java b/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTest.java
index 1d964cc..47c08cf 100644
--- a/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTest.java
+++ b/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTest.java
@@ -743,7 +743,7 @@
* @return the derived mRunName.
* @throws RuntimeException if mTestModuleName, mTestConfigPath, and mTestCasePath are null.
*/
- private String deriveRunName() {
+ private String deriveRunName() throws RuntimeException {
if (mRunName != null) {
return mRunName;
}
@@ -753,7 +753,8 @@
} else {
CLog.w("--test-module-name not set (not recommended); deriving automatically");
if (mTestConfigPath != null) {
- mRunName = new File(mTestConfigPath).getName().replace(CONFIG_FILE_EXTENSION, "");
+ mRunName = new File(mTestConfigPath).getName();
+ mRunName = mRunName.replace(CONFIG_FILE_EXTENSION, "");
} else if (mTestCasePath != null) {
mRunName = new File(mTestCasePath).getName();
} else {
diff --git a/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTestResultParser.java b/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTestResultParser.java
index e0b77c7..77422f1 100644
--- a/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTestResultParser.java
+++ b/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTestResultParser.java
@@ -380,7 +380,7 @@
* @param object
* @throws RuntimeException
*/
- public void processJsonFile(JSONObject object) throws RuntimeException{
+ public void processJsonFile(JSONObject object) throws RuntimeException {
try {
JSONArray results = object.getJSONArray(RESULTS);
if (results == null) {
