Added more tests for upload

Author: cmaglie

commands/upload/testdata/hardware/alice/avr/boards.txt

@@ -0,0 +1,13 @@
+board1.name=board1
+board1.conf.board=conf-board1
+board1.upload.tool=one
+board1.upload.protocol=protocol
+board1.upload.speed=speed
+
+board1.bootloader.tool=one
+board1.bootloader.low_fuses=0xFF
+board1.bootloader.high_fuses=0xDE
+board1.bootloader.extended_fuses=0xFD
+board1.bootloader.unlock_bits=0x3F
+board1.bootloader.lock_bits=0x0F
+board1.bootloader.file=optiboot/optiboot_atmega328.hex

commands/upload/testdata/hardware/alice/avr/platform.txt

@@ -0,0 +1,21 @@
+name=Upload Test Platform (Alice)
+version=1.0.0
+
+# Upload test 1
+tools.one.cmd.path=echo
+tools.one.conf.general=conf-general
+
+tools.one.upload.conf=conf-upload
+tools.one.upload.params.verbose=verbose
+tools.one.upload.params.quiet=quiet
+tools.one.upload.params.verify=verify
+tools.one.upload.params.noverify=noverify
+tools.one.upload.pattern={cmd.path} {conf.board} {conf.general} {upload.conf} {upload.verbose} {upload.verify} {upload.protocol} "{serial.port}" -b{upload.speed} "{build.path}/{build.project_name}.hex"
+
+# Upload test 2
+tools.one-noport.cmd.path=echo
+tools.one-noport.upload.params.verbose=verbose
+tools.one-noport.upload.params.quiet=quiet
+tools.one-noport.upload.verify=verify
+tools.one-noport.upload.params.noverify=noverify
+tools.one-noport.upload.pattern={cmd.path} {conf.general} {conf.upload} {upload.verbose} {upload.verify} {build.mcu} {upload.protocol} "{serial.port}" -b{upload.speed} "{build.path}/{build.project_name}.hex"

commands/upload/upload_test.go

@@ -16,10 +16,13 @@
 package upload
 
 import (
+	"bytes"
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/arduino/arduino-cli/arduino/cores"
+	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/arduino/sketches"
 	paths "github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/require"
@@ -119,3 +122,74 @@ func TestDetermineBuildPathAndSketchName(t *testing.T) {
 		})
 	}
 }
+
+func TestUploadPropertiesComposition(t *testing.T) {
+	pm := packagemanager.NewPackageManager(nil, nil, nil, nil)
+	err := pm.LoadHardwareFromDirectory(paths.New("testdata", "hardware"))
+	require.NoError(t, err)
+	buildPath1 := paths.New("testdata", "build_path_1")
+
+	type test struct {
+		importDir      *paths.Path
+		fqbn           string
+		port           string
+		programmer     string
+		burnBootloader bool
+		expected       string
+	}
+
+	tests := []test{
+		// classic upload, requires port
+		{buildPath1, "alice:avr:board1", "port", "", false, "conf-board1 conf-general conf-upload $$VERBOSE-VERIFY$$ protocol port -bspeed testdata/build_path_1/sketch.ino.hex"},
+	}
+	for i, test := range tests {
+		t.Run(fmt.Sprintf("SubTest%02d", i), func(t *testing.T) {
+			outStream := &bytes.Buffer{}
+			errStream := &bytes.Buffer{}
+			err := runProgramAction(
+				pm,
+				nil,                     // sketch
+				"",                      // importFile
+				test.importDir.String(), // importDir
+				test.fqbn,               // FQBN
+				test.port,               // port
+				test.programmer,         // programmer
+				false,                   // verbose
+				false,                   // verify
+				test.burnBootloader,     // burnBootloader
+				outStream,
+				errStream,
+			)
+			require.NoError(t, err)
+			out := strings.TrimSpace(outStream.String())
+			require.Equal(t, strings.ReplaceAll(test.expected, "$$VERBOSE-VERIFY$$", "quiet noverify"), out)
+		})
+		t.Run(fmt.Sprintf("SubTest%02d-WithVerifyAndVerbose", i), func(t *testing.T) {
+			outStream := &bytes.Buffer{}
+			errStream := &bytes.Buffer{}
+			err := runProgramAction(
+				pm,
+				nil,                     // sketch
+				"",                      // importFile
+				test.importDir.String(), // importDir
+				test.fqbn,               // FQBN
+				test.port,               // port
+				test.programmer,         // programmer
+				true,                    // verbose
+				true,                    // verify
+				test.burnBootloader,     // burnBootloader
+				outStream,
+				errStream,
+			)
+			require.NoError(t, err)
+			out := strings.Split(outStream.String(), "\n")
+			// With verbose enabled, the upload will output 3 lines:
+			// - the command line that the cli is going to run
+			// - the output of the command
+			// - an empty line
+			// we are interested in the second line
+			require.Len(t, out, 3)
+			require.Equal(t, strings.ReplaceAll(test.expected, "$$VERBOSE-VERIFY$$", "verbose verify"), out[1])
+		})
+	}
+}