Fixed unit tests

arduino · Jan 16, 2025 · 4de49d3 · 4de49d3
1 parent 133c821
commit 4de49d3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/commands/service_upload_test.go b/commands/service_upload_test.go
@@ -132,10 +132,12 @@ func TestDetermineBuildPathAndSketchName(t *testing.T) {
 }
 
 func TestUploadPropertiesComposition(t *testing.T) {
-	pmb := packagemanager.NewBuilder(nil, nil, nil, nil, nil, "test", downloader.GetDefaultConfig())
-	errs := pmb.LoadHardwareFromDirectory(paths.New("testdata", "upload", "hardware"))
+	userdir := paths.New("testdata", "upload")
+	hwdir := userdir.Join("hardware")
+	pmb := packagemanager.NewBuilder(nil, nil, hwdir, nil, nil, "test", downloader.GetDefaultConfig())
+	errs := pmb.LoadHardwareFromDirectory(hwdir)
 	require.Len(t, errs, 0)
-	buildPath1 := paths.New("testdata", "upload", "build_path_1")
+	buildPath1 := userdir.Join("build_path_1")
 	logrus.SetLevel(logrus.TraceLevel)
 	type test struct {
 		importDir       *paths.Path

diff --git a/internal/arduino/cores/packagemanager/package_manager_test.go b/internal/arduino/cores/packagemanager/package_manager_test.go
@@ -39,7 +39,7 @@ var dataDir1 = paths.New("testdata", "data_dir_1")
 var extraHardware = paths.New("testdata", "extra_hardware")
 
 func TestFindBoardWithFQBN(t *testing.T) {
-	pmb := NewBuilder(customHardware, customHardware, nil, customHardware, customHardware, "test", downloader.GetDefaultConfig())
+	pmb := NewBuilder(customHardware, customHardware, customHardware, customHardware, customHardware, "test", downloader.GetDefaultConfig())
 	pmb.LoadHardwareFromDirectory(customHardware)
 	pm := pmb.Build()
 	pme, release := pm.NewExplorer()
@@ -57,7 +57,7 @@ func TestFindBoardWithFQBN(t *testing.T) {
 
 func TestResolveFQBN(t *testing.T) {
 	// Pass nil, since these paths are only used for installing
-	pmb := NewBuilder(nil, nil, nil, nil, nil, "test", downloader.GetDefaultConfig())
+	pmb := NewBuilder(nil, nil, customHardware, nil, nil, "test", downloader.GetDefaultConfig())
 	// Hardware from main packages directory
 	pmb.LoadHardwareFromDirectory(dataDir1.Join("packages"))
 	// This contains the arduino:avr core