Ported legacy TestIncludesToIncludeFoldersANewLibrary test

Author: cmaglie

internal/integrationtest/compile_4/compile_test.go

@@ -97,6 +97,7 @@ func TestCompileOfProblematicSketches(t *testing.T) {
 		{"SketchWithFunctionPointer", tryBuildAvrLeonardo},
 		{"USBHostExample", testBuilderUSBHostExample},
 		{"SketchWithConflictingLibraries", testBuilderSketchWithConflictingLibraries},
+		{"SketchLibraryProvidesAllIncludes", testBuilderSketchLibraryProvidesAllIncludes},
 	}.Run(t, env, cli)
 }
 
@@ -552,6 +553,19 @@ func testBuilderSketchWithConflictingLibraries(t *testing.T, env *integrationtes
 	})
 }
 
+func testBuilderSketchLibraryProvidesAllIncludes(t *testing.T, env *integrationtest.Environment, cli *integrationtest.ArduinoCLI) {
+	t.Run("Build", func(t *testing.T) {
+		// Build
+		out, err := tryBuild(t, env, cli, "arduino:avr:leonardo")
+		require.NoError(t, err)
+		libs := out.BuilderResult.UsedLibraries
+		slices.SortFunc(libs, func(x, y *builderLibrary) bool { return x.Name < y.Name })
+		require.Len(t, libs, 2)
+		require.Equal(t, "ANewLibrary-master", libs[0].Name)
+		require.Equal(t, "IRremote", libs[1].Name)
+	})
+}
+
 func tryBuildAvrLeonardo(t *testing.T, env *integrationtest.Environment, cli *integrationtest.ArduinoCLI) {
 	_, err := tryBuild(t, env, cli, "arduino:avr:leonardo")
 	require.NoError(t, err)

legacy/builder/test/sketch10/sketch10.ino renamed to internal/integrationtest/compile_4/testdata/SketchLibraryProvidesAllIncludes/SketchLibraryProvidesAllIncludes.ino

@@ -27,32 +27,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestIncludesToIncludeFoldersANewLibrary(t *testing.T) {
-	ctx := prepareBuilderTestContext(t, nil, paths.New("sketch10", "sketch10.ino"), "arduino:avr:leonardo")
-	defer cleanUpBuilderTestContext(t, ctx)
-	ctx.Verbose = true
-
-	var _err error
-	commands := []types.Command{
-		&builder.ContainerSetupHardwareToolsLibsSketchAndProps{},
-		types.BareCommand(func(ctx *types.Context) error {
-			ctx.LineOffset, _err = bldr.PrepareSketchBuildPath(ctx.Sketch, ctx.SourceOverride, ctx.SketchBuildPath)
-			return _err
-		}),
-		&builder.ContainerFindIncludes{},
-	}
-	for _, command := range commands {
-		err := command.Run(ctx)
-		NoError(t, err)
-	}
-
-	importedLibraries := ctx.ImportedLibraries
-	sort.Sort(ByLibraryName(importedLibraries))
-	require.Equal(t, 2, len(importedLibraries))
-	require.Equal(t, "ANewLibrary-master", importedLibraries[0].Name)
-	require.Equal(t, "IRremote", importedLibraries[1].Name)
-}
-
 func TestIncludesToIncludeFoldersDuplicateLibs(t *testing.T) {
 	ctx := &types.Context{
 		HardwareDirs:         paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware", "user_hardware"),

internal/integrationtest/compile_4/testdata/libraries/ANewLibrary-master/anewlibrary.h

@@ -31,10 +31,6 @@ import (
 //	tryBuild(t, paths.New("sketch_that_checks_if_SPI_has_transactions_and_includes_missing_Ethernet", "sketch.ino"))
 //}
 
-func TestTryBuild032(t *testing.T) {
-	tryBuild(t, paths.New("sketch10", "sketch10.ino"))
-}
-
 func TestTryBuild033(t *testing.T) {
 	tryBuild(t, paths.New("sketch_that_includes_arduino_h", "sketch_that_includes_arduino_h.ino"))
 }