refactor: remove duplication

Author: lszucs

testaddon.go

@@ -6,27 +6,8 @@ import (
 	"unicode"
 )
 
-// getModule returns the name of the module a given test result artifact was produced by
-// based of the artifacts path.
-// path example: <PATH_TO_YOUR_PROJECT>/<MODULE_NAME>/build/test-results/testDemoDebugUnitTest/TEST-example.com.helloworld.ExampleUnitTest.xml
-func getModule(path string) (string, error) {
-	parts := strings.Split(path, "/")
-	i := len(parts) - 1
-	for i > 0 && parts[i] != "test-results" {
-		i--
-	}
-
-	if i == 0 {
-		return "", fmt.Errorf("path (%s) does not contain 'test-results' folder", path)
-	}
-
-	return parts[i-2], nil
-}
-
-// getVariant returns the name of the build variant a given test result artifact was produced by
-// based of the artifacts path.
-// path example: <PATH_TO_YOUR_PROJECT>/<MODULE_NAME>/build/test-results/testDemoDebugUnitTest/TEST-example.com.helloworld.ExampleUnitTest.xml
-func getVariant(path string) (string, error) {
+// getUniqueDir returns the unique subdirectory inside the test addon export diroctory for a given artifact.
+func getUniqueDir(path string) (string, error) {
 	parts := strings.Split(path, "/")
 	i := len(parts) - 1
 	for i > 0 && parts[i] != "test-results" {
@@ -43,20 +24,9 @@ func getVariant(path string) (string, error) {
 
 	runes := []rune(variant)
 	runes[0] = unicode.ToLower(runes[0])
-	return string(runes), nil
-}
+	variant = string(runes)
 
-// getUniqueDir returns the unique subdirectory inside the test addon export diroctory for a given artifact.
-func getUniqueDir(path string) (string, error) {
-	module, err := getModule(path)
-	if err != nil {
-		return "", fmt.Errorf("get module from path (%s): %s", path, err)
-	}
-
-	variant, err := getVariant(path)
-	if err != nil {
-		return "", fmt.Errorf("get variant from path (%s): %s", path, err)
-	}
+	module := parts[i-2]
 
 	return module + "-" + variant, nil
 }