Merge "Simplify the module names for TfSuiteRunner" into oc-dev am: cc6cf5bedf

am: c9e9f11610

Change-Id: Ifeb9c22bfba3986267632b174180f64ef811c64f

2 files changed, 25 insertions, 5 deletions

diff --git a/src/com/android/tradefed/testtype/suite/TfSuiteRunner.java b/src/com/android/tradefed/testtype/suite/TfSuiteRunner.java
index 5664e1cfd..219591266 100644
--- a/src/com/android/tradefed/testtype/suite/TfSuiteRunner.java
+++ b/src/com/android/tradefed/testtype/suite/TfSuiteRunner.java
@@ -43,6 +43,8 @@ import java.util.List;
  */
 public class TfSuiteRunner extends ITestSuite {
 
+    private static final String CONFIG_EXT = ".config";
+
     @Option(name = "run-suite-tag", description = "The tag that must be run.",
             mandatory = true)
     private String mSuiteTag = null;
@@ -177,7 +179,7 @@ public class TfSuiteRunner extends ITestSuite {
         }
         // If we have any IRemoteTests remaining in the base configuration, it will run.
         if (!config.getTests().isEmpty()) {
-            configMap.put(configName, config);
+            configMap.put(sanitizeModuleName(configName), config);
         }
 
         return configMap;
@@ -186,4 +188,24 @@ public class TfSuiteRunner extends ITestSuite {
     private String getSuiteTag() {
         return mSuiteTag;
     }
+
+    /**
+     * Some module names are currently the absolute path name of some config files. We want to
+     * sanitize that look more like a short included config name.
+     */
+    private String sanitizeModuleName(String originalName) {
+        if (originalName.endsWith(CONFIG_EXT)) {
+            originalName = originalName.substring(0, originalName.length() - CONFIG_EXT.length());
+        }
+        if (!originalName.startsWith("/")) {
+            return originalName;
+        }
+        // if it's an absolute path
+        String[] segments = originalName.split("/");
+        if (segments.length < 3) {
+            return originalName;
+        }
+        // return last two segments only
+        return String.join("/", segments[segments.length - 2], segments[segments.length - 1]);
+    }
 }
diff --git a/tests/src/com/android/tradefed/testtype/suite/TfSuiteRunnerTest.java b/tests/src/com/android/tradefed/testtype/suite/TfSuiteRunnerTest.java
index 245b916d6..3f25572f2 100644
--- a/tests/src/com/android/tradefed/testtype/suite/TfSuiteRunnerTest.java
+++ b/tests/src/com/android/tradefed/testtype/suite/TfSuiteRunnerTest.java
@@ -224,10 +224,8 @@ public class TfSuiteRunnerTest {
             assertEquals(3, configMap.size());
             assertTrue(configMap.containsKey("suite/stub1"));
             assertTrue(configMap.containsKey("suite/stub2"));
-            assertTrue(
-                    configMap.containsKey(
-                            FileUtil.getFileForPath(deviceTestDir, "suite/test1.config")
-                                    .getAbsolutePath()));
+            // test1 name was sanitized to look like the included configs.
+            assertTrue(configMap.containsKey("suite/test1"));
             EasyMock.verify(deviceBuildInfo);
         } finally {
             FileUtil.recursiveDelete(deviceTestDir);