Get common root of classes that are in multiple file paths.

Author: sarahchen6

.circleci/collect_results.sh

@@ -19,24 +19,35 @@ if [[ ${#TEST_RESULT_DIRS[@]} -eq 0 ]]; then
   exit 0
 fi
 
-echo "Saving test results:"
-while IFS= read -r -d '' RESULT_XML_FILE
-do
-  echo -n "- $RESULT_XML_FILE"
-  # Get source file for testcases
+function get_source_file () {
   FILE_PATH="${RESULT_XML_FILE%%"/build"*}"
   FILE_PATH="${FILE_PATH/#"$WORKSPACE_DIR"\//}/src"
   if ! [[ $RESULT_XML_FILE == *"#"* ]]; then
     CLASS="${RESULT_XML_FILE%.xml}"
     CLASS="${CLASS##*"TEST-"}"
     CLASS="${CLASS##*"."}"
-    CLASS_PATH=$(grep -rl "class $CLASS" "$FILE_PATH" | tail -n 1)
-    FILE_PATH="$CLASS_PATH"
+    COMMON_ROOT=$(grep -rl "class $CLASS" "$FILE_PATH" | head -n 1)
+    while IFS= read -r LINE; do
+      while [[ $LINE != "$COMMON_ROOT"* ]]; do
+        COMMON_ROOT=$(dirname "$COMMON_ROOT")
+        if [[ "$COMMON_ROOT" == "$COMMON_ROOT/.." ]]; then
+          break
+        fi
+      done
+    done < <(grep -rl "class $CLASS" "$FILE_PATH")
+    FILE_PATH="$COMMON_ROOT"
   fi
+}
+
+echo "Saving test results:"
+while IFS= read -r -d '' RESULT_XML_FILE
+do
+  echo -n "- $RESULT_XML_FILE"
   AGGREGATED_FILE_NAME=$(echo "$RESULT_XML_FILE" | rev | cut -d "/" -f 1,2,5 | rev | tr "/" "_")
   echo -n " as $AGGREGATED_FILE_NAME"
   cp "$RESULT_XML_FILE" "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"
   # Insert file attribute to testcase XML nodes
+  get_source_file
   sed -i "/<testcase/ s|\(time=\"[^\"]*\"\)|\1 file=\"$FILE_PATH\"|g" "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"
   # Replace Java Object hashCode by marker in testcase XML nodes to get stable test names
   sed -i '/<testcase/ s/@[0-9a-f]\{5,\}/@HASHCODE/g' "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"