Removed legacy HardwareLoader

Author: cmaglie

legacy/builder/container_setup.go

@@ -30,7 +30,6 @@ func (s *ContainerSetupHardwareToolsLibsSketchAndProps) Run(ctx *types.Context)
 	commands := []types.Command{
 		&AddAdditionalEntriesToContext{},
 		&FailIfBuildPathEqualsSketchPath{},
-		&HardwareLoader{},
 		&LibrariesLoader{},
 	}
 

legacy/builder/hardware_loader.go

@@ -36,15 +36,7 @@ func TestLoadHardware(t *testing.T) {
 	}
 	ctx = prepareBuilderTestContext(t, ctx, nil, "")
 
-	commands := []types.Command{
-		&builder.HardwareLoader{},
-	}
-	for _, command := range commands {
-		err := command.Run(ctx)
-		NoError(t, err)
-	}
-
-	packages := ctx.Hardware
+	packages := ctx.PackageManager.GetPackages()
 	require.Equal(t, 1, len(packages))
 	require.NotNil(t, packages["arduino"])
 	require.Equal(t, 2, len(packages["arduino"].Platforms))
@@ -77,14 +69,13 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) {
 
 	commands := []types.Command{
 		&builder.AddAdditionalEntriesToContext{},
-		&builder.HardwareLoader{},
 	}
 	for _, command := range commands {
 		err := command.Run(ctx)
 		NoError(t, err)
 	}
 
-	packages := ctx.Hardware
+	packages := ctx.PackageManager.GetPackages()
 
 	if runtime.GOOS == "windows" {
 		//a package is a symlink, and windows does not support them
@@ -143,15 +134,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
 	}
 	ctx = prepareBuilderTestContext(t, ctx, nil, "")
 
-	commands := []types.Command{
-		&builder.HardwareLoader{},
-	}
-	for _, command := range commands {
-		err := command.Run(ctx)
-		NoError(t, err)
-	}
-
-	packages := ctx.Hardware
+	packages := ctx.PackageManager.GetPackages()
 	require.Equal(t, 3, len(packages))
 	require.NotNil(t, packages["arduino"])
 	require.Equal(t, 1, len(packages["arduino"].Platforms))
@@ -191,15 +174,7 @@ func TestLoadLotsOfHardware(t *testing.T) {
 	}
 	ctx = prepareBuilderTestContext(t, ctx, nil, "")
 
-	commands := []types.Command{
-		&builder.HardwareLoader{},
-	}
-	for _, command := range commands {
-		err := command.Run(ctx)
-		NoError(t, err)
-	}
-
-	packages := ctx.Hardware
+	packages := ctx.PackageManager.GetPackages()
 
 	if runtime.GOOS == "windows" {
 		//a package is a symlink, and windows does not support them

legacy/builder/test/hardware_loader_test.go

@@ -48,7 +48,6 @@ func TestLoadLibrariesAVR(t *testing.T) {
 
 	commands := []types.Command{
 		&builder.AddAdditionalEntriesToContext{},
-		&builder.HardwareLoader{},
 		&builder.LibrariesLoader{},
 	}
 	for _, command := range commands {
@@ -154,7 +153,6 @@ func TestLoadLibrariesSAM(t *testing.T) {
 
 	commands := []types.Command{
 		&builder.AddAdditionalEntriesToContext{},
-		&builder.HardwareLoader{},
 		&builder.LibrariesLoader{},
 	}
 	for _, command := range commands {
@@ -257,7 +255,6 @@ func TestLoadLibrariesMyAVRPlatform(t *testing.T) {
 
 	commands := []types.Command{
 		&builder.AddAdditionalEntriesToContext{},
-		&builder.HardwareLoader{},
 		&builder.LibrariesLoader{},
 	}
 	for _, command := range commands {

legacy/builder/test/libraries_loader_test.go

@@ -36,7 +36,6 @@ func TestSetupBuildProperties(t *testing.T) {
 
 	commands := []types.Command{
 		&builder.AddAdditionalEntriesToContext{},
-		&builder.HardwareLoader{},
 		&builder.SetupBuildProperties{},
 	}
 	for _, command := range commands {
@@ -95,7 +94,6 @@ func TestSetupBuildPropertiesWithSomeCustomOverrides(t *testing.T) {
 
 	commands := []types.Command{
 		&builder.AddAdditionalEntriesToContext{},
-		&builder.HardwareLoader{},
 		&builder.SetupBuildProperties{},
 		&builder.SetCustomBuildProperties{},
 	}
@@ -126,7 +124,6 @@ func TestSetupBuildPropertiesUserHardware(t *testing.T) {
 
 	commands := []types.Command{
 		&builder.AddAdditionalEntriesToContext{},
-		&builder.HardwareLoader{},
 		&builder.SetupBuildProperties{},
 	}
 	for _, command := range commands {

legacy/builder/test/setup_build_properties_test.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
-	"github.com/arduino/arduino-cli/legacy/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	paths "github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/require"
@@ -67,9 +66,7 @@ func TestLoadTools(t *testing.T) {
 	}
 	ctx = prepareBuilderTestContext(t, ctx, nil, "")
 
-	NoError(t, (&builder.HardwareLoader{}).Run(ctx))
-
-	tools := ctx.AllTools
+	tools := ctx.PackageManager.GetAllInstalledToolsReleases()
 	require.Equal(t, 9, len(tools))
 
 	sort.Sort(ByToolIDAndVersion(tools))
@@ -109,9 +106,7 @@ func TestLoadToolsWithBoardManagerFolderStructure(t *testing.T) {
 	}
 	ctx = prepareBuilderTestContext(t, ctx, nil, "")
 
-	NoError(t, (&builder.HardwareLoader{}).Run(ctx))
-
-	tools := ctx.AllTools
+	tools := ctx.PackageManager.GetAllInstalledToolsReleases()
 	require.Equal(t, 3, len(tools))
 
 	sort.Sort(ByToolIDAndVersion(tools))
@@ -134,9 +129,7 @@ func TestLoadLotsOfTools(t *testing.T) {
 	}
 	ctx = prepareBuilderTestContext(t, ctx, nil, "")
 
-	NoError(t, (&builder.HardwareLoader{}).Run(ctx))
-
-	tools := ctx.AllTools
+	tools := ctx.PackageManager.GetAllInstalledToolsReleases()
 	require.Equal(t, 12, len(tools))
 
 	sort.Sort(ByToolIDAndVersion(tools))
@@ -191,7 +184,5 @@ func TestAllToolsContextIsPopulated(t *testing.T) {
 		PackageManager: pme,
 	}
 
-	hl := &builder.HardwareLoader{}
-	require.NoError(t, hl.Run(ctx))
-	require.NotEmpty(t, ctx.AllTools)
+	require.NotEmpty(t, ctx.PackageManager.GetAllInstalledToolsReleases())
 }

legacy/builder/test/tools_loader_test.go

@@ -79,8 +79,6 @@ type Context struct {
 	BuildOptionsJsonPrevious string
 
 	PackageManager             *packagemanager.Explorer
-	Hardware                   cores.Packages
-	AllTools                   []*cores.ToolRelease
 	RequiredTools              []*cores.ToolRelease
 	TargetBoard                *cores.Board
 	TargetBoardBuildProperties *properties.Map