use detector FindIncludes in tests

Author: alessio-perugini

legacy/builder/builder.go

@@ -223,7 +223,7 @@ func RunPreprocess(ctx *types.Context) error {
 
 func findIncludes(ctx *types.Context) types.BareCommand {
 	return types.BareCommand(func(ctx *types.Context) error {
-		ctx.SketchLibrariesDetector.FindIncludes(
+		return ctx.SketchLibrariesDetector.FindIncludes(
 			ctx.BuildPath,
 			ctx.BuildProperties.GetPath("build.core.path"),
 			ctx.BuildProperties.GetPath("build.variant.path"),
@@ -233,6 +233,5 @@ func findIncludes(ctx *types.Context) types.BareCommand {
 			ctx.BuildProperties,
 			ctx.TargetPlatform.Platform.Architecture,
 		)
-		return nil
 	})
 }

legacy/builder/test/builder_test.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	bldr "github.com/arduino/arduino-cli/arduino/builder"
+	"github.com/arduino/arduino-cli/arduino/builder/detector"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/arduino/sketch"
 	"github.com/arduino/arduino-cli/legacy/builder"
@@ -125,14 +126,14 @@ func prepareBuilderTestContext(t *testing.T, ctx *types.Context, sketchPath *pat
 	}
 
 	if !stepToSkip[skipLibraries] {
-		lm, libsResolver, _, err := bldr.LibrariesLoader(
+		lm, libsResolver, _, err := detector.LibrariesLoader(
 			false, nil,
 			ctx.BuiltInLibrariesDirs, ctx.LibraryDirs, ctx.OtherLibrariesDirs,
 			ctx.ActualPlatform, ctx.TargetPlatform,
 		)
 		NoError(t, err)
 
-		ctx.SketchLibrariesDetector = bldr.NewSketchLibrariesDetector(
+		ctx.SketchLibrariesDetector = detector.NewSketchLibrariesDetector(
 			lm, libsResolver,
 			ctx.Verbose,
 			false,

legacy/builder/test/builder_utils_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/arduino/arduino-cli/legacy/builder/builder_utils"
+	"github.com/arduino/arduino-cli/arduino/builder/utils"
 	paths "github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/require"
 )
@@ -42,7 +42,7 @@ func TestObjFileIsUpToDateObjMissing(t *testing.T) {
 	sourceFile := tempFile(t, "source")
 	defer sourceFile.RemoveAll()
 
-	upToDate, err := builder_utils.ObjFileIsUpToDate(sourceFile, nil, nil)
+	upToDate, err := utils.ObjFileIsUpToDate(sourceFile, nil, nil)
 	NoError(t, err)
 	require.False(t, upToDate)
 }
@@ -54,7 +54,7 @@ func TestObjFileIsUpToDateDepMissing(t *testing.T) {
 	objFile := tempFile(t, "obj")
 	defer objFile.RemoveAll()
 
-	upToDate, err := builder_utils.ObjFileIsUpToDate(sourceFile, objFile, nil)
+	upToDate, err := utils.ObjFileIsUpToDate(sourceFile, objFile, nil)
 	NoError(t, err)
 	require.False(t, upToDate)
 }
@@ -70,7 +70,7 @@ func TestObjFileIsUpToDateObjOlder(t *testing.T) {
 	sourceFile := tempFile(t, "source")
 	defer sourceFile.RemoveAll()
 
-	upToDate, err := builder_utils.ObjFileIsUpToDate(sourceFile, objFile, depFile)
+	upToDate, err := utils.ObjFileIsUpToDate(sourceFile, objFile, depFile)
 	NoError(t, err)
 	require.False(t, upToDate)
 }
@@ -86,7 +86,7 @@ func TestObjFileIsUpToDateObjNewer(t *testing.T) {
 	depFile := tempFile(t, "dep")
 	defer depFile.RemoveAll()
 
-	upToDate, err := builder_utils.ObjFileIsUpToDate(sourceFile, objFile, depFile)
+	upToDate, err := utils.ObjFileIsUpToDate(sourceFile, objFile, depFile)
 	NoError(t, err)
 	require.True(t, upToDate)
 }
@@ -110,7 +110,7 @@ func TestObjFileIsUpToDateDepIsNewer(t *testing.T) {
 	data := objFile.String() + ": \\\n\t" + sourceFile.String() + " \\\n\t" + headerFile.String()
 	depFile.WriteFile([]byte(data))
 
-	upToDate, err := builder_utils.ObjFileIsUpToDate(sourceFile, objFile, depFile)
+	upToDate, err := utils.ObjFileIsUpToDate(sourceFile, objFile, depFile)
 	NoError(t, err)
 	require.False(t, upToDate)
 }
@@ -132,7 +132,7 @@ func TestObjFileIsUpToDateDepIsOlder(t *testing.T) {
 	res := objFile.String() + ": \\\n\t" + sourceFile.String() + " \\\n\t" + headerFile.String()
 	depFile.WriteFile([]byte(res))
 
-	upToDate, err := builder_utils.ObjFileIsUpToDate(sourceFile, objFile, depFile)
+	upToDate, err := utils.ObjFileIsUpToDate(sourceFile, objFile, depFile)
 	NoError(t, err)
 	require.True(t, upToDate)
 }
@@ -156,7 +156,7 @@ func TestObjFileIsUpToDateDepIsWrong(t *testing.T) {
 	res := sourceFile.String() + ": \\\n\t" + sourceFile.String() + " \\\n\t" + headerFile.String()
 	depFile.WriteFile([]byte(res))
 
-	upToDate, err := builder_utils.ObjFileIsUpToDate(sourceFile, objFile, depFile)
+	upToDate, err := utils.ObjFileIsUpToDate(sourceFile, objFile, depFile)
 	NoError(t, err)
 	require.False(t, upToDate)
 }

legacy/builder/test/includes_finder_with_regexp_test.go

@@ -18,7 +18,7 @@ package test
 import (
 	"testing"
 
-	"github.com/arduino/arduino-cli/legacy/builder"
+	"github.com/arduino/arduino-cli/arduino/builder/detector"
 	"github.com/stretchr/testify/require"
 )
 
@@ -27,13 +27,13 @@ func TestIncludesFinderWithRegExp(t *testing.T) {
 		"#include <SPI.h>\n" +
 		"^\n" +
 		"compilation terminated."
-	include := builder.IncludesFinderWithRegExp(output)
+	include := detector.IncludesFinderWithRegExp(output)
 
 	require.Equal(t, "SPI.h", include)
 }
 
 func TestIncludesFinderWithRegExpEmptyOutput(t *testing.T) {
-	include := builder.IncludesFinderWithRegExp("")
+	include := detector.IncludesFinderWithRegExp("")
 
 	require.Equal(t, "", include)
 }
@@ -43,7 +43,7 @@ func TestIncludesFinderWithRegExpPaddedIncludes(t *testing.T) {
 		" #               include <Wire.h>\n" +
 		"                                 ^\n" +
 		"compilation terminated.\n"
-	include := builder.IncludesFinderWithRegExp(output)
+	include := detector.IncludesFinderWithRegExp(output)
 
 	require.Equal(t, "Wire.h", include)
 }
@@ -53,7 +53,7 @@ func TestIncludesFinderWithRegExpPaddedIncludes2(t *testing.T) {
 		" #\t\t\tinclude <Wire.h>\n" +
 		"                                 ^\n" +
 		"compilation terminated.\n"
-	include := builder.IncludesFinderWithRegExp(output)
+	include := detector.IncludesFinderWithRegExp(output)
 
 	require.Equal(t, "Wire.h", include)
 }
@@ -62,7 +62,7 @@ func TestIncludesFinderWithRegExpPaddedIncludes3(t *testing.T) {
 	output := "/some/path/sketch.ino:1:33: fatal error: SPI.h: No such file or directory\n" +
 		"compilation terminated.\n"
 
-	include := builder.IncludesFinderWithRegExp(output)
+	include := detector.IncludesFinderWithRegExp(output)
 
 	require.Equal(t, "SPI.h", include)
 }
@@ -71,7 +71,7 @@ func TestIncludesFinderWithRegExpPaddedIncludes4(t *testing.T) {
 	output := "In file included from /tmp/arduino_modified_sketch_815412/binouts.ino:52:0:\n" +
 		"/tmp/arduino_build_static/sketch/regtable.h:31:22: fatal error: register.h: No such file or directory\n"
 
-	include := builder.IncludesFinderWithRegExp(output)
+	include := detector.IncludesFinderWithRegExp(output)
 
 	require.Equal(t, "register.h", include)
 }

legacy/builder/test/libraries_loader_test.go

@@ -20,8 +20,8 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/arduino/arduino-cli/arduino/builder/detector"
 	"github.com/arduino/arduino-cli/arduino/libraries"
-	"github.com/arduino/arduino-cli/arduino/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	paths "github.com/arduino/go-paths-helper"
@@ -47,7 +47,7 @@ func TestLoadLibrariesAVR(t *testing.T) {
 	ctx = prepareBuilderTestContext(t, ctx, nil, "arduino:avr:leonardo")
 	defer cleanUpBuilderTestContext(t, ctx)
 
-	lm, libsResolver, _, err := builder.LibrariesLoader(
+	lm, libsResolver, _, err := detector.LibrariesLoader(
 		false, nil,
 		ctx.BuiltInLibrariesDirs, ctx.LibraryDirs, ctx.OtherLibrariesDirs,
 		ctx.ActualPlatform, ctx.TargetPlatform,
@@ -151,7 +151,7 @@ func TestLoadLibrariesSAM(t *testing.T) {
 	ctx = prepareBuilderTestContext(t, ctx, nil, "arduino:sam:arduino_due_x_dbg")
 	defer cleanUpBuilderTestContext(t, ctx)
 
-	lm, libsResolver, _, err := builder.LibrariesLoader(
+	lm, libsResolver, _, err := detector.LibrariesLoader(
 		false, nil,
 		ctx.BuiltInLibrariesDirs, ctx.LibraryDirs, ctx.OtherLibrariesDirs,
 		ctx.ActualPlatform, ctx.TargetPlatform,
@@ -228,7 +228,7 @@ func TestLoadLibrariesAVRNoDuplicateLibrariesFolders(t *testing.T) {
 	ctx = prepareBuilderTestContext(t, ctx, nil, "arduino:avr:leonardo")
 	defer cleanUpBuilderTestContext(t, ctx)
 
-	lm, _, _, err := builder.LibrariesLoader(
+	lm, _, _, err := detector.LibrariesLoader(
 		false, nil,
 		ctx.BuiltInLibrariesDirs, ctx.LibraryDirs, ctx.OtherLibrariesDirs,
 		ctx.ActualPlatform, ctx.TargetPlatform,
@@ -251,7 +251,7 @@ func TestLoadLibrariesMyAVRPlatform(t *testing.T) {
 	ctx = prepareBuilderTestContext(t, ctx, nil, "my_avr_platform:avr:custom_yun")
 	defer cleanUpBuilderTestContext(t, ctx)
 
-	lm, _, _, err := builder.LibrariesLoader(
+	lm, _, _, err := detector.LibrariesLoader(
 		false, nil,
 		ctx.BuiltInLibrariesDirs, ctx.LibraryDirs, ctx.OtherLibrariesDirs,
 		ctx.ActualPlatform, ctx.TargetPlatform,

legacy/builder/test/unused_compiled_libraries_remover_test.go

@@ -18,7 +18,7 @@ package test
 import (
 	"testing"
 
-	bldr "github.com/arduino/arduino-cli/arduino/builder"
+	"github.com/arduino/arduino-cli/arduino/builder/detector"
 	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/legacy/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
@@ -37,7 +37,7 @@ func TestUnusedCompiledLibrariesRemover(t *testing.T) {
 
 	ctx := &types.Context{}
 	ctx.LibrariesBuildPath = temp
-	ctx.SketchLibrariesDetector = bldr.NewSketchLibrariesDetector(
+	ctx.SketchLibrariesDetector = detector.NewSketchLibrariesDetector(
 		nil, nil, false, false, false, nil, nil, nil, nil,
 	)
 	ctx.SketchLibrariesDetector.AppendImportedLibraries(&libraries.Library{Name: "Bridge"})
@@ -60,7 +60,7 @@ func TestUnusedCompiledLibrariesRemover(t *testing.T) {
 func TestUnusedCompiledLibrariesRemoverLibDoesNotExist(t *testing.T) {
 	ctx := &types.Context{}
 	ctx.LibrariesBuildPath = paths.TempDir().Join("test")
-	ctx.SketchLibrariesDetector = bldr.NewSketchLibrariesDetector(
+	ctx.SketchLibrariesDetector = detector.NewSketchLibrariesDetector(
 		nil, nil, false, false, false, nil, nil, nil, nil,
 	)
 	ctx.SketchLibrariesDetector.AppendImportedLibraries(&libraries.Library{Name: "Bridge"})
@@ -80,7 +80,7 @@ func TestUnusedCompiledLibrariesRemoverNoUsedLibraries(t *testing.T) {
 	NoError(t, temp.Join("dummy_file").WriteFile([]byte{}))
 
 	ctx := &types.Context{}
-	ctx.SketchLibrariesDetector = bldr.NewSketchLibrariesDetector(
+	ctx.SketchLibrariesDetector = detector.NewSketchLibrariesDetector(
 		nil, nil, false, false, false, nil, nil, nil, nil,
 	)
 	ctx.LibrariesBuildPath = temp