Modified tests in main_test.go to use the new arduino-cli setup

Author: MatteoPologruto

internal/integrationtest/main/main_test.go

@@ -21,22 +21,15 @@ import (
 	"testing"
 
 	"github.com/arduino/arduino-cli/internal/integrationtest"
-	"github.com/arduino/go-paths-helper"
 	"github.com/stretchr/testify/require"
 	semver "go.bug.st/relaxed-semver"
-	"go.bug.st/testsuite"
-	"go.bug.st/testsuite/requirejson"
+	"go.bug.st/testifyjson/requirejson"
 )
 
 func TestHelp(t *testing.T) {
-	env := testsuite.NewEnvironment(t)
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
 	defer env.CleanUp()
 
-	cli := integrationtest.NewArduinoCliWithinEnvironment(env, &integrationtest.ArduinoCLIConfig{
-		ArduinoCLIPath:         paths.New("..", "..", "..", "arduino-cli"),
-		UseSharedStagingFolder: true,
-	})
-
 	// Run help and check the output message
 	stdout, stderr, err := cli.Run("help")
 	require.NoError(t, err)
@@ -45,14 +38,9 @@ func TestHelp(t *testing.T) {
 }
 
 func TestVersion(t *testing.T) {
-	env := testsuite.NewEnvironment(t)
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
 	defer env.CleanUp()
 
-	cli := integrationtest.NewArduinoCliWithinEnvironment(env, &integrationtest.ArduinoCLIConfig{
-		ArduinoCLIPath:         paths.New("..", "..", "..", "arduino-cli"),
-		UseSharedStagingFolder: true,
-	})
-
 	// Run version and check the output message
 	stdout, stderr, err := cli.Run("version")
 	require.NoError(t, err)
@@ -87,14 +75,9 @@ func TestVersion(t *testing.T) {
 
 func TestLogOptions(t *testing.T) {
 	// Using version as a test command
-	env := testsuite.NewEnvironment(t)
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
 	defer env.CleanUp()
 
-	cli := integrationtest.NewArduinoCliWithinEnvironment(env, &integrationtest.ArduinoCLIConfig{
-		ArduinoCLIPath:         paths.New("..", "..", "..", "arduino-cli"),
-		UseSharedStagingFolder: true,
-	})
-
 	// No logs
 	stdout, _, err := cli.Run("version")
 	require.NoError(t, err)
@@ -143,14 +126,9 @@ func TestLogOptions(t *testing.T) {
 
 func TestInventoryCreation(t *testing.T) {
 	// Using version as a test command
-	env := testsuite.NewEnvironment(t)
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
 	defer env.CleanUp()
 
-	cli := integrationtest.NewArduinoCliWithinEnvironment(env, &integrationtest.ArduinoCLIConfig{
-		ArduinoCLIPath:         paths.New("..", "..", "..", "arduino-cli"),
-		UseSharedStagingFolder: true,
-	})
-
 	// no logs
 	stdout, _, err := cli.Run("version")
 	require.NoError(t, err)