Fix test path handling (#51)

* Update README, add test with one entity
* delete empty rows and use So(err, ShouldBeNil)
* Fix test path handling
* Update GitHub Actions to use newer versions
* Update test generators to use temp dirs

---------

Co-authored-by: andrey <[email protected]>

Author: qnqatop

.github/workflows/go.yml

@@ -25,11 +25,11 @@ jobs:
           --health-retries 5
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
-        go-version: '1.22.x'
+        go-version: '1.24.x'
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Prepare test db
       run: psql -d postgresql://postgres@localhost/newsportal < schema.sql
@@ -43,12 +43,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
-        go-version: '1.22.x'
+        go-version: '1.24.x'
 
     - name: Build
       run: go build -v ./...

.github/workflows/goreleaser.yml

@@ -19,12 +19,12 @@ jobs:
           fetch-depth: 0
       -
         name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.22.x'
+          go-version: '1.24.x'
       -
         name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
           version: latest

generators/xml-lang/generator_test.go

@@ -13,33 +13,34 @@ import (
 // todo: add generator.options.Output for generate to actual directory. Now it generate in expected dir where located .mfd
 // todo: not generate if *.vt.xml not exists, but err == nil
 func TestGenerator_Generate(t *testing.T) {
-	err := prepareFiles()
+	actualDir := t.TempDir()
+	err := prepareFiles(actualDir)
 	if err != nil {
 		t.Fatal(err)
 	}
+	mfdPathInActual := filepath.Join(actualDir, filepath.Base(testdata.PathExpectedMFD))
 
 	Convey("TestGenerator_Generate", t, func() {
 		Convey("Generate with Entity flag", func() {
 			generator := New()
-			generator.options.MFDPath = filepath.Join(testdata.PathActualMFD)
+			generator.options.MFDPath = mfdPathInActual
 			generator.options.Entities = []string{"category"}
 
 			t.Log("Generate only entity news xml-vt")
 			err = generator.Generate()
 			So(err, ShouldBeNil)
 
 			t.Logf("Check %s file", "en-one-entity.xml")
-			content, err := os.ReadFile(filepath.Join(testdata.PathActual, "en.xml"))
+			content, err := os.ReadFile(filepath.Join(actualDir, "en.xml"))
 			So(err, ShouldBeNil)
 			expectedContent, err := os.ReadFile(filepath.Join(testdata.PathExpected, "en-one-entity.xml"))
 			So(err, ShouldBeNil)
 			So(content, ShouldResemble, expectedContent)
-
 		})
 
 		Convey("Check correct generate", func() {
 			generator := New()
-			generator.options.MFDPath = testdata.PathActualMFD
+			generator.options.MFDPath = mfdPathInActual
 
 			t.Log("Generate xml-vt")
 			err = generator.Generate()
@@ -53,7 +54,7 @@ func TestGenerator_Generate(t *testing.T) {
 
 			for f := range expectedFilenames {
 				t.Logf("Check %s file", f)
-				content, err := os.ReadFile(filepath.Join(testdata.PathActual, f))
+				content, err := os.ReadFile(filepath.Join(actualDir, f))
 				So(err, ShouldBeNil)
 				expectedContent, err := os.ReadFile(filepath.Join(testdata.PathExpected, f))
 				So(err, ShouldBeNil)
@@ -63,29 +64,18 @@ func TestGenerator_Generate(t *testing.T) {
 	})
 }
 
-func prepareFiles() error {
-	// clearing actual test data
-	err := os.RemoveAll(testdata.PathActual)
-	if err != nil {
-		return err
-	}
-
-	err = os.MkdirAll(testdata.PathActual, 0775)
-	if err != nil {
-		return err
-	}
-
-	err = os.Link(testdata.PathExpectedMFD, testdata.PathActualMFD)
+func prepareFiles(actualPath string) error {
+	err := os.Link(testdata.PathExpectedMFD, filepath.Join(actualPath, filepath.Base(testdata.PathExpectedMFD)))
 	if err != nil && !os.IsExist(err) {
 		return err
 	}
 
-	err = os.Link(filepath.Join(testdata.PathExpected, testdata.FilenameXML), filepath.Join(testdata.PathActual, testdata.FilenameXML))
+	err = os.Link(filepath.Join(testdata.PathExpected, testdata.FilenameXML), filepath.Join(actualPath, testdata.FilenameXML))
 	if err != nil && !os.IsExist(err) {
 		return err
 	}
 
-	err = os.Link(filepath.Join(testdata.PathExpected, testdata.FilenameVTXML), filepath.Join(testdata.PathActual, testdata.FilenameVTXML))
+	err = os.Link(filepath.Join(testdata.PathExpected, testdata.FilenameVTXML), filepath.Join(actualPath, testdata.FilenameVTXML))
 	if err != nil && !os.IsExist(err) {
 		return err
 	}

generators/xml/generator_test.go

@@ -13,6 +13,9 @@ import (
 // todo: panic if ../testdata/actual/*.mfd exists and xml not exist
 func TestGenerator_Generate(t *testing.T) {
 	// Store the PATH environment variable in a variable
+	actualDir := t.TempDir()
+	mfdPathInActual := filepath.Join(actualDir, filepath.Base(testdata.PathExpectedMFD))
+
 	dbdsn, exists := os.LookupEnv("DB_DSN")
 	if !exists {
 		dbdsn = "postgres://postgres:postgres@localhost:5432/newsportal?sslmode=disable"
@@ -24,7 +27,7 @@ func TestGenerator_Generate(t *testing.T) {
 
 			generator.options.Def()
 			generator.options.URL = dbdsn
-			generator.options.Output = testdata.PathActualMFD
+			generator.options.Output = mfdPathInActual
 			generator.options.Packages = parseNamespacesFlag("portal:news,categories,tags")
 
 			t.Log("Generate xml")
@@ -39,7 +42,7 @@ func TestGenerator_Generate(t *testing.T) {
 
 			for f := range expectedFilenames {
 				t.Logf("Check %s file", f)
-				content, err := os.ReadFile(filepath.Join(testdata.PathActual, f))
+				content, err := os.ReadFile(filepath.Join(actualDir, f))
 				if err != nil {
 					t.Fatal(err)
 				}