Merge pull request #13 from AlexsanderHamir/refactors

small improvements

Author: AlexsanderHamir

cli/api.go

@@ -38,16 +38,16 @@ func CreateRootCmd() *cobra.Command {
 		RunE:  runBenchmarks,
 	}
 
-	rootCmd.AddCommand(createManualCmd())
-	rootCmd.AddCommand(createRunCmd())
+	rootCmd.AddCommand(createProfManual())
+	rootCmd.AddCommand(createProfAuto())
 	rootCmd.AddCommand(createSetupCmd())
 	rootCmd.AddCommand(createTrackCmd())
 	rootCmd.AddCommand(createVersionCmd())
 
 	return rootCmd
 }
 
-func createManualCmd() *cobra.Command {
+func createProfManual() *cobra.Command {
 	manualCmd := &cobra.Command{
 		Use:     shared.MANUALCMD,
 		Short:   "Receives profile files and performs data collection and organization. (doesn't wrap go test)",
@@ -65,7 +65,7 @@ func createManualCmd() *cobra.Command {
 	return manualCmd
 }
 
-func createRunCmd() *cobra.Command {
+func createProfAuto() *cobra.Command {
 	benchFlag := "benchmarks"
 	profileFlag := "profiles"
 	tagFlag := "tag"

parser/api.go

@@ -149,12 +149,3 @@ func GetAllProfileLines(scanner *bufio.Scanner, lines *[]string) {
 		*lines = append(*lines, scanner.Text())
 	}
 }
-
-func removeHeader(scanner *bufio.Scanner) {
-	for scanner.Scan() {
-		line := scanner.Text()
-		if strings.Contains(line, header) {
-			break
-		}
-	}
-}

parser/helpers.go

@@ -1,6 +1,7 @@
 package parser
 
 import (
+	"bufio"
 	"fmt"
 	"regexp"
 	"strconv"
@@ -235,3 +236,12 @@ func createLineObjects(lines []string) ([]*LineObj, error) {
 
 	return lineObjs, nil
 }
+
+func removeHeader(scanner *bufio.Scanner) {
+	for scanner.Scan() {
+		line := scanner.Text()
+		if strings.Contains(line, header) {
+			break
+		}
+	}
+}

tests/helpers.go

@@ -24,15 +24,15 @@ var (
 type TestArgs struct {
 	specifiedFiles          map[fileFullName]*FieldsCheck
 	cfg                     config.Config
+	expectedNumberOfFiles   int
+	expectedErrorMessage    string
+	label                   string
+	cmd                     []string
+	expectedProfiles        []string
 	withConfig              bool
 	expectNonSpecifiedFiles bool
 	noConfigFile            bool
-	cmd                     []string
-	expectedErrorMessage    string
-	label                   string
-	expectedNumberOfFiles   int
 	withCleanUp             bool
-	expectedProfiles        []string
 	blockOutputCheck        bool
 	isEnvironmentSet        bool
 	checkSuccessMessage     bool