restructured

Author: Dominik Przybyl

pkg/content_manager_int_test.go test/content_manager_test.go

@@ -1,6 +1,6 @@
 //go:build int_test
 
-package pkg_test
+package test
 
 import (
 	"crypto/sha256"
@@ -18,7 +18,7 @@ import (
 	"testing"
 )
 
-//go:embed int_test_content
+//go:embed resources
 var VaultFS embed.FS
 
 func TestPullDir(t *testing.T) {
@@ -95,7 +95,7 @@ func TestPullFilterRoots(t *testing.T) {
 func TestPullFilterFile(t *testing.T) {
 	workDir := pathx.RandomDir(os.TempDir(), "filter")
 	defer func() { _ = pathx.DeleteIfExists(workDir) }()
-	if err := copyFile("int_test_content", workDir, "int_test_content/filter.xml"); err != nil {
+	if err := copyFile("resources", workDir, "resources/filter.xml"); err != nil {
 		t.Fatal(err)
 	}
 	filterFile := filepath.Join(workDir, pkg.FilterXML)
@@ -210,7 +210,7 @@ func testPushContent(t *testing.T, relPath string, expectedFiles []string) {
 
 	workDir := pathx.RandomDir(os.TempDir(), "content_push")
 	defer func() { _ = pathx.DeleteIfExists(workDir) }()
-	if err := copyFiles("int_test_content/new_content", workDir); err != nil {
+	if err := copyFiles("resources/new_content", workDir); err != nil {
 		t.Fatal(err)
 	}
 
@@ -284,7 +284,7 @@ func pushContent(contentManager *pkg.ContentManager, instance pkg.Instance, path
 func installMainContent(packageManager *pkg.PackageManager) (string, error) {
 	workDir := pathx.RandomDir(os.TempDir(), "content_pull")
 	defer func() { _ = pathx.DeleteIfExists(workDir) }()
-	if err := copyFiles("int_test_content/main_content", workDir); err != nil {
+	if err := copyFiles("resources/main_content", workDir); err != nil {
 		return "", err
 	}
 	pkgFile := pathx.RandomFileName(os.TempDir(), "content_pull", ".zip")
@@ -473,7 +473,7 @@ func checkPullResult(resultDir string, expectedFiles []string) ([]string, error)
 	if err != nil {
 		return nil, err
 	}
-	files2, err := determineExpectedFiles("int_test_content/main_content/jcr_root", expectedFiles)
+	files2, err := determineExpectedFiles("resources/main_content/jcr_root", expectedFiles)
 	if err != nil {
 		return nil, err
 	}
@@ -486,12 +486,12 @@ func checkPushResult(resultDir string, expectedFiles []string) ([]string, error)
 	if err != nil {
 		return nil, err
 	}
-	files2, err := determineTestFiles("int_test_content/main_content/jcr_root")
+	files2, err := determineTestFiles("resources/main_content/jcr_root")
 	if err != nil {
 		return nil, err
 	}
 	diffFiles := determineDifferenceFiles(files1, files2)
-	files3, err := determineExpectedFiles("int_test_content/new_content/jcr_root", expectedFiles)
+	files3, err := determineExpectedFiles("resources/new_content/jcr_root", expectedFiles)
 	if err != nil {
 		return nil, err
 	}

pkg/filter_file_test.go test/filter_file_test.go

@@ -1,6 +1,6 @@
 //go:build int_test
 
-package pkg_test
+package test
 
 import (
 	"github.com/wttech/aemc/pkg/common/tplx"
@@ -24,15 +24,15 @@ func testFilterFile(t *testing.T, filterFile string, expectedFile string, data m
 }
 
 func TestFilterRoots(t *testing.T) {
-	testFilterFile(t, "vault/META-INF/vault/filter.xml", "int_test_content/filter_roots.xml",
+	testFilterFile(t, "vault/META-INF/vault/filter.xml", "resources/filter_roots.xml",
 		map[string]any{
 			"FilterRoots": []string{"/apps/my_site", "/content/my_site"},
 		},
 	)
 }
 
 func TestExcludePatterns(t *testing.T) {
-	testFilterFile(t, "vault/META-INF/vault/filter.xml", "int_test_content/exclude_patterns.xml",
+	testFilterFile(t, "vault/META-INF/vault/filter.xml", "resources/exclude_patterns.xml",
 		map[string]any{
 			"FilterRoots":     []string{"/apps/my_site", "/content/my_site"},
 			"ExcludePatterns": []string{"/apps/my_site/cq:dialog(/.*)?", "/apps/my_site/rep:policy(/.*)?"},

pkg/filter_root_test.go test/filter_root_test.go

@@ -1,6 +1,6 @@
 //go:build int_test
 
-package pkg_test
+package test
 
 import (
 	"github.com/wttech/aemc/pkg"
@@ -14,7 +14,7 @@ import (
 func TestDetermineFilterRoot(t *testing.T) {
 	workDir := pathx.RandomDir(os.TempDir(), "filter_root")
 	defer func() { _ = pathx.DeleteIfExists(workDir) }()
-	if err := copyFiles("int_test_content/repo", workDir); err != nil {
+	if err := copyFiles("resources/repo", workDir); err != nil {
 		t.Fatal(err)
 	}
 

pkg/int_test_content/exclude_patterns.xml test/resources/exclude_patterns.xml

@@ -1,6 +1,6 @@
 //go:build int_test
 
-package pkg_test
+package test
 
 import (
 	"github.com/wttech/aemc/pkg"
@@ -15,7 +15,7 @@ import (
 func TestDetermineSyncFile(t *testing.T) {
 	workDir := pathx.RandomDir(os.TempDir(), "sync_file")
 	defer func() { _ = pathx.DeleteIfExists(workDir) }()
-	if err := copyFiles("int_test_content/repo", workDir); err != nil {
+	if err := copyFiles("resources/repo", workDir); err != nil {
 		t.Fatal(err)
 	}