fixing tests: fixes arduino#58 definitely and adds tests

Author: saniales

cmd/arduino.go

@@ -102,9 +102,27 @@ func init() {
 
 // InitFlags reinitialize flags (useful for testing too)
 func InitFlags() {
+	GlobalFlags = globalFlags{}
+	rootCmdFlags = rootFlags{}
+	arduinoLibFlags = libFlags{}
+	arduinoCoreFlags = coreFlags{}
+
 	ArduinoCmd.ResetFlags()
-	arduinoCoreCmd.ResetFlags()
+	arduinoVersionCmd.ResetFlags()
+
 	arduinoLibCmd.ResetFlags()
+	arduinoLibInstallCmd.ResetFlags()
+	arduinoLibDownloadCmd.ResetFlags()
+	arduinoLibListCmd.ResetFlags()
+	arduinoLibSearchCmd.ResetFlags()
+	arduinoLibUninstallCmd.ResetFlags()
+	arduinoLibVersionCmd.ResetFlags()
+
+	arduinoCoreCmd.ResetFlags()
+	arduinoCoreDownloadCmd.ResetFlags()
+	arduinoCoreInstallCmd.ResetFlags()
+	arduinoCoreListCmd.ResetFlags()
+	arduinoCoreVersionCmd.ResetFlags()
 
 	ArduinoCmd.PersistentFlags().CountVarP(&GlobalFlags.Verbose, "verbose", "v", "enables verbose output (use more times for a higher level)")
 	ArduinoCmd.PersistentFlags().StringVar(&GlobalFlags.Format, "format", "invalid", "the output format, can be [text|json]")
@@ -123,21 +141,13 @@ func InitCommands() {
 	arduinoLibCmd.ResetCommands()
 	arduinoCoreCmd.ResetCommands()
 
-	ArduinoCmd.AddCommand(arduinoVersionCmd)
-	ArduinoCmd.AddCommand(arduinoLibCmd)
-	ArduinoCmd.AddCommand(arduinoCoreCmd)
-
-	arduinoLibCmd.AddCommand(arduinoLibInstallCmd)
-	arduinoLibCmd.AddCommand(arduinoLibUninstallCmd)
-	arduinoLibCmd.AddCommand(arduinoLibSearchCmd)
-	arduinoLibCmd.AddCommand(arduinoLibDownloadCmd)
-	arduinoLibCmd.AddCommand(arduinoLibVersionCmd)
-	arduinoLibCmd.AddCommand(arduinoLibListCmd)
-
-	arduinoCoreCmd.AddCommand(arduinoCoreListCmd)
-	arduinoCoreCmd.AddCommand(arduinoCoreDownloadCmd)
-	arduinoCoreCmd.AddCommand(arduinoCoreVersionCmd)
-	arduinoCoreCmd.AddCommand(arduinoCoreInstallCmd)
+	ArduinoCmd.AddCommand(arduinoVersionCmd, arduinoLibCmd, arduinoCoreCmd)
+
+	arduinoLibCmd.AddCommand(arduinoLibInstallCmd, arduinoLibUninstallCmd, arduinoLibSearchCmd,
+		arduinoLibVersionCmd, arduinoLibListCmd, arduinoLibDownloadCmd)
+
+	arduinoCoreCmd.AddCommand(arduinoCoreListCmd, arduinoCoreDownloadCmd, arduinoCoreVersionCmd,
+		arduinoCoreInstallCmd)
 }
 
 func arduinoPreRun(cmd *cobra.Command, args []string) {

cmd/arduino_core.go

@@ -167,17 +167,18 @@ func executeCoreDownloadCommand(cmd *cobra.Command, args []string) error {
 	}
 
 	IDTuples := cores.ParseArgs(args)
+
 	coresToDownload, toolsToDownload, failOutputs := status.Process(IDTuples)
 	outputResults := output.CoreProcessResults{
 		Cores: failOutputs,
+		Tools: make([]output.ProcessResult, 0, 10),
 	}
-
 	downloads := make([]releases.DownloadItem, len(toolsToDownload))
 	for i := range toolsToDownload {
 		downloads[i] = toolsToDownload[i].DownloadItem
 	}
-	releases.ParallelDownload(downloads, true, "Downloaded", GlobalFlags.Verbose, &outputResults.Tools, "tool")
 
+	releases.ParallelDownload(downloads, true, "Downloaded", GlobalFlags.Verbose, &outputResults.Tools, "tool")
 	downloads = make([]releases.DownloadItem, len(coresToDownload))
 	for i := range coresToDownload {
 		downloads[i] = coresToDownload[i].DownloadItem

cmd/cmd_test.go

@@ -59,16 +59,17 @@ func createTempRedirect(t *testing.T) *os.File {
 	return tempFile
 }
 
-func cleanTempRedirect(tempFile *os.File) {
+func cleanTempRedirect(t *testing.T, tempFile *os.File) {
 	tempFile.Close()
-	os.Remove(tempFile.Name())
+	err := os.Remove(tempFile.Name())
+	assert.NoError(t, err, "Removing temp file")
 	os.Stdout = stdOut
 }
 
 func executeWithArgs(t *testing.T, args ...string) {
+	cmd.InitFlags()
+	cmd.InitCommands()
 	if args != nil {
-		cmd.InitFlags()
-		cmd.InitCommands()
 		cmd.ArduinoCmd.SetArgs(args)
 	}
 	err := cmd.ArduinoCmd.Execute()
@@ -77,7 +78,7 @@ func executeWithArgs(t *testing.T, args ...string) {
 
 func TestArduinoCmd(t *testing.T) {
 	tempFile := createTempRedirect(t)
-	defer cleanTempRedirect(tempFile)
+	defer cleanTempRedirect(t, tempFile)
 	want := []string{
 		`{"error":"Invalid Call : should show Help, but it is available only in TEXT mode"}`,
 	}
@@ -91,7 +92,7 @@ func TestArduinoCmd(t *testing.T) {
 
 func TestLibSearch(t *testing.T) {
 	tempFile := createTempRedirect(t)
-	defer cleanTempRedirect(tempFile)
+	defer cleanTempRedirect(t, tempFile)
 	want := []string{
 		`"YouMadeIt"`,
 		`"YoutubeApi"`,
@@ -109,7 +110,7 @@ func TestLibSearch(t *testing.T) {
 
 func TestLibDownload(t *testing.T) {
 	tempFile := createTempRedirect(t)
-	defer cleanTempRedirect(tempFile)
+	defer cleanTempRedirect(t, tempFile)
 
 	// getting the paths to create the want path of the want object.
 	stagingFolder, err := common.GetDownloadCacheFolder("libraries")
@@ -163,7 +164,7 @@ func TestLibDownload(t *testing.T) {
 
 func TestCoreDownload(t *testing.T) {
 	tempFile := createTempRedirect(t)
-	defer cleanTempRedirect(tempFile)
+	defer cleanTempRedirect(t, tempFile)
 
 	// getting the paths to create the want path of the want object.
 	stagingFolder, err := common.GetDownloadCacheFolder("packages")
@@ -199,6 +200,9 @@ func TestCoreDownload(t *testing.T) {
 	var have output.CoreProcessResults
 	err = json.Unmarshal(d, &have)
 	require.NoError(t, err, "Unmarshaling json output")
+	t.Log("HAVE: \n", have)
+	t.Log("D:\n", string(d))
+	t.Log("WANT: \n", want)
 
 	// checking output
 

cmd/flags.go

@@ -30,23 +30,32 @@
 package cmd
 
 // GlobalFlags represents flags available in all the program.
-var GlobalFlags struct {
+type globalFlags struct {
 	Verbose int    // More time verbose flag is written, the more the Verbose count increases. Represents verbosity level.
 	Format  string // The Output format (e.g. text, json).
 	Home    string // The Custom Home directory.
 }
 
-// rootCmdFlags represent flags available to the root command.
-var rootCmdFlags struct {
+// GlobalFlags represents flags available in all the program.
+var GlobalFlags globalFlags
+
+type rootFlags struct {
 	GenerateDocs bool // if true, generates manpages and bash autocompletion.
 }
 
-// arduinoLibFlags represents `arduino lib` flags.
-var arduinoLibFlags struct {
+// rootCmdFlags represent flags available to the root command.
+var rootCmdFlags rootFlags
+
+type libFlags struct {
 	updateIndex bool
 }
 
-// arduinoCoreFlags represents `arduino core` flags.
-var arduinoCoreFlags struct {
+// arduinoLibFlags represents `arduino lib` flags.
+var arduinoLibFlags libFlags
+
+type coreFlags struct {
 	updateIndex bool
 }
+
+// arduinoCoreFlags represents `arduino core` flags.
+var arduinoCoreFlags coreFlags

task/concurrency.go

@@ -31,6 +31,7 @@ package task
 
 import (
 	"fmt"
+	"sync"
 
 	"github.com/bcmi-labs/arduino-cli/cmd/formatter"
 )
@@ -80,20 +81,22 @@ func ExecuteSequence(taskWrappers []Wrapper, ignoreOnFailure []bool, verbosity i
 // ExecuteParallelFromMap executes a set of taskwrappers in parallel, taking input from a map[string]Wrapper.
 func ExecuteParallelFromMap(taskMap map[string]Wrapper, verbosity int) map[string]Result {
 	results := make(chan resultWithKey, len(taskMap))
-	turn := make(chan bool)
+
+	var wg sync.WaitGroup
+	wg.Add(len(taskMap))
 
 	for key, task := range taskMap {
 		go func(key string, task Wrapper) {
-			turn <- true
+			defer wg.Done()
 			results <- resultWithKey{
 				Key: key,
 				Result: func() Result {
 					return task.Execute(verbosity)
 				}(),
 			}
-			<-turn
 		}(key, task)
 	}
+	wg.Wait()
 	close(results)
 	mapResult := make(map[string]Result, len(results))
 	for result := range results {
@@ -106,16 +109,19 @@ func ExecuteParallelFromMap(taskMap map[string]Wrapper, verbosity int) map[strin
 // ExecuteParallel executes a set of Wrappers in parallel, handling concurrency for results.
 func ExecuteParallel(taskWrappers []Wrapper, verbosity int) []Result {
 	results := make(chan Result, len(taskWrappers))
-	turn := make(chan bool)
+
+	var wg sync.WaitGroup
+	wg.Add(len(taskWrappers))
+
 	for _, task := range taskWrappers {
 		go func(task Wrapper) {
-			turn <- true
+			defer wg.Done()
 			results <- func() Result {
 				return task.Execute(verbosity)
 			}()
-			<-turn
 		}(task)
 	}
+	wg.Wait()
 	close(results)
 	array := make([]Result, len(results))
 	for i := range array {