Ported legacy TestIncludesToIncludeFolders test

Author: cmaglie

internal/integrationtest/compile_4/compile_test.go

@@ -322,6 +322,10 @@ func testBuilderBridgeExample(t *testing.T, env *integrationtest.Environment, cl
 		require.True(t, buildPath.Join("BridgeExample.ino.hex").Exist())
 		require.True(t, buildPath.Join("libraries", "Bridge", "Mailbox.cpp.o").Exist())
 
+		libs := out.BuilderResult.UsedLibraries
+		require.Len(t, libs, 1)
+		require.Equal(t, "Bridge", libs[0].Name)
+
 		// Build again...
 		out2, err2 := tryBuild(t, env, cli, "arduino:avr:leonardo", "no-clean")
 		require.NoError(t, err2)

legacy/builder/test/includes_to_include_folders_test.go

@@ -27,30 +27,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestIncludesToIncludeFolders(t *testing.T) {
-	ctx := prepareBuilderTestContext(t, nil, paths.New("downloaded_libraries", "Bridge", "examples", "Bridge", "Bridge.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
-	require.Equal(t, 1, len(importedLibraries))
-	require.Equal(t, "Bridge", importedLibraries[0].Name)
-}
-
 func TestIncludesToIncludeFoldersANewLibrary(t *testing.T) {
 	ctx := prepareBuilderTestContext(t, nil, paths.New("sketch10", "sketch10.ino"), "arduino:avr:leonardo")
 	defer cleanUpBuilderTestContext(t, ctx)