Cleanup test env

Open-CMSIS-Pack · Feb 13, 2024 · ec73be6 · ec73be6
1 parent 65b34ea
commit ec73be6
Show file tree

Hide file tree

Showing 11 changed files with 141 additions and 135 deletions.
diff --git a/cmd/cbuild/commands/build/buildcprj_test.go b/cmd/cbuild/commands/build/buildcprj_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Arm Limited. All rights reserved.
+ * Copyright (c) 2023-2024 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,6 +8,7 @@ package build_test
 
 import (
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
@@ -16,10 +17,11 @@ import (
 )
 
 const testRoot = "../../../../test"
+const testDir = "command"
 
 func TestBuildCPRJCommand(t *testing.T) {
 	assert := assert.New(t)
-	cprjFile := testRoot + "/run/minimal.cprj"
+	cprjFile := filepath.Join(testRoot, testDir, "minimal.cprj")
 
 	t.Run("multiple arguments", func(t *testing.T) {
 		cmd := commands.NewRootCmd()
@@ -38,9 +40,9 @@ func TestBuildCPRJCommand(t *testing.T) {
 
 func TestPreLogConfiguration(t *testing.T) {
 	assert := assert.New(t)
-	logDir := testRoot + "/run/log"
-	logFile := logDir + "/test.log"
-	cprjFile := testRoot + "/run/minimal.cprj"
+	logDir := filepath.Join(testRoot, testDir, "log")
+	logFile := filepath.Join(logDir, "test.log")
+	cprjFile := filepath.Join(testRoot, testDir, "minimal.cprj")
 
 	t.Run("test normal verbosity level", func(t *testing.T) {
 		// No quiet, No debug

diff --git a/cmd/cbuild/commands/list/list_contexts_test.go b/cmd/cbuild/commands/list/list_contexts_test.go
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2023 Arm Limited. All rights reserved.
+ * Copyright (c) 2023-2024 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package list_test
 
 import (
+	"path/filepath"
 	"testing"
 
 	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
@@ -15,7 +16,7 @@ import (
 
 func TestListContextsCommand(t *testing.T) {
 	assert := assert.New(t)
-	csolutionFile := testRoot + "/run/TestSolution/test.csolution.yml"
+	csolutionFile := filepath.Join(testRoot, testDir, "TestSolution/test.csolution.yml")
 
 	t.Run("No arguments", func(t *testing.T) {
 		cmd := commands.NewRootCmd()

diff --git a/cmd/cbuild/commands/list/list_test.go b/cmd/cbuild/commands/list/list_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Arm Limited. All rights reserved.
+ * Copyright (c) 2023-2024 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -14,6 +14,7 @@ import (
 )
 
 const testRoot = "../../../../test"
+const testDir = "command"
 
 func TestListCommand(t *testing.T) {
 	assert := assert.New(t)

diff --git a/cmd/cbuild/commands/list/list_toolchains_test.go b/cmd/cbuild/commands/list/list_toolchains_test.go
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2023 Arm Limited. All rights reserved.
+ * Copyright (c) 2023-2024 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package list_test
 
 import (
+	"path/filepath"
 	"testing"
 
 	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
@@ -15,7 +16,7 @@ import (
 
 func TestListToolchainsCommand(t *testing.T) {
 	assert := assert.New(t)
-	csolutionFile := testRoot + "/run/TestSolution/test.csolution.yml"
+	csolutionFile := filepath.Join(testRoot, testDir, "TestSolution/test.csolution.yml")
 
 	t.Run("invalid flag", func(t *testing.T) {
 		cmd := commands.NewRootCmd()

diff --git a/cmd/cbuild/commands/root_test.go b/cmd/cbuild/commands/root_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2024 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,6 +8,7 @@ package commands_test
 
 import (
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
@@ -17,15 +18,16 @@ import (
 )
 
 const testRoot = "../../../test"
+const testDir = "command"
 
 func init() {
-	inittest.TestInitialization(testRoot)
+	inittest.TestInitialization(testRoot, testDir)
 }
 
 func TestCommands(t *testing.T) {
 	assert := assert.New(t)
-	cprjFile := testRoot + "/run/minimal.cprj"
-	csolutionFile := testRoot + "/run/test.csolution.yml"
+	cprjFile := filepath.Join(testRoot, testDir, "minimal.cprj")
+	csolutionFile := filepath.Join(testRoot, testDir, "test.csolution.yml")
 
 	t.Run("test version", func(t *testing.T) {
 		cmd := commands.NewRootCmd()
@@ -72,8 +74,8 @@ func TestCommands(t *testing.T) {
 
 func TestPreLogConfiguration(t *testing.T) {
 	assert := assert.New(t)
-	logDir := testRoot + "/run/log"
-	logFile := logDir + "/test.log"
+	logDir := filepath.Join(testRoot, testDir, "log")
+	logFile := filepath.Join(logDir, "test.log")
 
 	t.Run("test normal verbosity level", func(t *testing.T) {
 		// No quiet, No debug

diff --git a/pkg/builder/cbuildidx/builder_test.go b/pkg/builder/cbuildidx/builder_test.go
@@ -20,17 +20,18 @@ import (
 )
 
 const testRoot = "../../../test"
+const testDir = "cbuildidx"
 
 func init() {
-	inittest.TestInitialization(testRoot)
+	inittest.TestInitialization(testRoot, testDir)
 }
 
 type RunnerMock struct{}
 
 func (r RunnerMock) ExecuteCommand(program string, quiet bool, args ...string) (string, error) {
 	if strings.Contains(program, "cbuild2cmake") {
-		_ = os.MkdirAll(testRoot+"/run/tmp", 0755)
-		cmakelistFile := testRoot + "/run/tmp/CMakeLists.txt"
+		_ = os.MkdirAll(filepath.Join(testRoot, testDir, "tmp"), 0755)
+		cmakelistFile := filepath.Join(testRoot, testDir, "tmp/CMakeLists.txt")
 		file, _ := os.Create(cmakelistFile)
 		defer file.Close()
 	} else if strings.Contains(program, "cpackget") {
@@ -53,19 +54,19 @@ func TestCheckCbuildIdx(t *testing.T) {
 	}
 
 	t.Run("test valid cbuild-idx", func(t *testing.T) {
-		b.InputFile = testRoot + "/run/Hello.cbuild-idx.yml"
+		b.InputFile = filepath.Join(testRoot, testDir, "Hello.cbuild-idx.yml")
 		err := b.checkCbuildIdx()
 		assert.Nil(err)
 	})
 
 	t.Run("test existent file, invalid extension", func(t *testing.T) {
-		b.InputFile = testRoot + "/run/main.c"
+		b.InputFile = filepath.Join(testRoot, testDir, "main.c")
 		err := b.checkCbuildIdx()
 		assert.Error(err)
 	})
 
 	t.Run("test invalid file", func(t *testing.T) {
-		b.InputFile = testRoot + "/run/invalid-file.cbuild-idx.yml"
+		b.InputFile = filepath.Join(testRoot, testDir, "invalid-file.cbuild-idx.yml")
 		err := b.checkCbuildIdx()
 		assert.Error(err)
 	})
@@ -77,7 +78,7 @@ func TestGetDirs(t *testing.T) {
 	b := CbuildIdxBuilder{
 		builder.BuilderParams{
 			Runner:    RunnerMock{},
-			InputFile: testRoot + "/run/Hello.cbuild-idx.yml",
+			InputFile: filepath.Join(testRoot, testDir, "Hello.cbuild-idx.yml"),
 			Options: builder.Options{
 				Contexts: []string{"Hello.Debug+AVH"},
 			},
@@ -87,8 +88,8 @@ func TestGetDirs(t *testing.T) {
 	t.Run("test valid directories in cprj", func(t *testing.T) {
 		dirs, err := b.getDirs()
 		assert.Nil(err)
-		intDir, _ := filepath.Abs(testRoot + "/run/tmp")
-		outDir, _ := filepath.Abs(testRoot + "/run/out/AVH")
+		intDir, _ := filepath.Abs(filepath.Join(testRoot, testDir, "tmp"))
+		outDir, _ := filepath.Abs(filepath.Join(testRoot, testDir, "out/AVH"))
 		assert.Equal(intDir, dirs.IntDir)
 		assert.Equal(outDir, dirs.OutDir)
 	})
@@ -98,14 +99,14 @@ func TestGetDirs(t *testing.T) {
 		b.Options.OutDir = "cmdOptionsOutDir"
 		dirs, err := b.getDirs()
 		assert.Nil(err)
-		intDir, _ := filepath.Abs(testRoot + "/run/tmp")
+		intDir, _ := filepath.Abs(filepath.Join(testRoot, testDir, "tmp"))
 		outDir, _ := filepath.Abs(b.Options.OutDir)
 		assert.Equal(intDir, dirs.IntDir)
 		assert.Equal(outDir, dirs.OutDir)
 	})
 
 	t.Run("test invalid cprj", func(t *testing.T) {
-		b.InputFile = testRoot + "/run/invalid-file.cbuild-idx.yml"
+		b.InputFile = filepath.Join(testRoot, testDir, "invalid-file.cbuild-idx.yml")
 		_, err := b.getDirs()
 		assert.Error(err)
 	})
@@ -125,21 +126,21 @@ func TestClean(t *testing.T) {
 	t.Run("test clean directories, invalid tool", func(t *testing.T) {
 		vars.CmakeBin = testRoot + "/bin/invalid-tool"
 
-		dirs.OutDir = testRoot + "/run/OutDir"
+		dirs.OutDir = filepath.Join(testRoot, testDir, "OutDir")
 		_ = os.MkdirAll(dirs.OutDir, 0755)
 		err := b.clean(dirs, vars)
 		assert.Error(err)
 
-		dirs.IntDir = testRoot + "/run/IntDir"
+		dirs.IntDir = filepath.Join(testRoot, testDir, "IntDir")
 		_ = os.MkdirAll(dirs.IntDir, 0755)
 		err = b.clean(dirs, vars)
 		assert.Error(err)
 	})
 
 	t.Run("test clean directories", func(t *testing.T) {
 		vars.CmakeBin = testRoot + "/bin/cmake"
-		dirs.IntDir = testRoot + "/run/tmp"
-		dirs.OutDir = testRoot + "/run/OutDir"
+		dirs.IntDir = filepath.Join(testRoot, testDir, "tmp")
+		dirs.OutDir = filepath.Join(testRoot, testDir, "OutDir")
 		_ = os.MkdirAll(dirs.IntDir, 0755)
 		_ = os.MkdirAll(dirs.OutDir, 0755)
 		err := b.clean(dirs, vars)
@@ -149,15 +150,15 @@ func TestClean(t *testing.T) {
 
 func TestBuild(t *testing.T) {
 	assert := assert.New(t)
-	configs := inittest.GetTestConfigs(testRoot)
+	configs := inittest.GetTestConfigs(testRoot, testDir)
 
 	b := CbuildIdxBuilder{
 		builder.BuilderParams{
 			Runner:    RunnerMock{},
-			InputFile: testRoot + "/run/Hello.cbuild-idx.yml",
+			InputFile: filepath.Join(testRoot, testDir, "Hello.cbuild-idx.yml"),
 			Options: builder.Options{
 				Contexts: []string{"Hello.Debug+AVH"},
-				OutDir:   testRoot + "/run/OutDir",
+				OutDir:   filepath.Join(testRoot, testDir, "OutDir"),
 				Packs:    true,
 			},
 			InstallConfigs: utils.Configurations{
@@ -191,7 +192,7 @@ func TestBuild(t *testing.T) {
 	})
 
 	t.Run("test build log", func(t *testing.T) {
-		b.Options.LogFile = testRoot + "/run/log/test.log"
+		b.Options.LogFile = filepath.Join(testRoot, testDir, "log/test.log")
 		err := b.Build()
 		assert.Nil(err)
 	})
@@ -210,7 +211,7 @@ func TestBuild(t *testing.T) {
 	})
 
 	t.Run("test build makefile generator", func(t *testing.T) {
-		b.Options.OutDir = testRoot + "/run/OutDir"
+		b.Options.OutDir = filepath.Join(testRoot, testDir, "OutDir")
 		b.Options.Debug = true
 		b.Options.Generator = "Unix Makefiles"
 		err := b.Build()