move pmd test files

Author: zhamborova

tools/pmdConfigCreator_test.go tools/test/pmd/pmdConfigCreator_test.gotools/pmdConfigCreator_test.go renamed to tools/test/pmd/pmdConfigCreator_test.go

@@ -1,4 +1,4 @@
-package tools
+package pmd
 
 import (
 	"encoding/xml"
@@ -7,6 +7,9 @@ import (
 	"strings"
 	"testing"
 
+	"codacy/cli-v2/tools"
+	"codacy/cli-v2/tools/pmd"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -35,13 +38,18 @@ type PMDProperty struct {
 	Value string `xml:"value,attr"`
 }
 
+// CreatePmdConfig is a wrapper around the actual implementation to make it testable
+func CreatePmdConfig(config tools.ToolConfiguration) string {
+	return pmd.CreatePmdConfig(config)
+}
+
 func TestCreatePmdConfig(t *testing.T) {
 	// Setup test configuration with patterns
-	config := ToolConfiguration{
-		PatternsConfiguration: []PatternConfiguration{
+	config := tools.ToolConfiguration{
+		PatternsConfiguration: []tools.PatternConfiguration{
 			{
 				PatternId: "java/codestyle/AtLeastOneConstructor",
-				ParameterConfigurations: []PatternParameterConfiguration{
+				ParameterConfigurations: []tools.PatternParameterConfiguration{
 					{
 						Name:  "enabled",
 						Value: "true",
@@ -50,7 +58,7 @@ func TestCreatePmdConfig(t *testing.T) {
 			},
 			{
 				PatternId: "java/design/UnusedPrivateField",
-				ParameterConfigurations: []PatternParameterConfiguration{
+				ParameterConfigurations: []tools.PatternParameterConfiguration{
 					{
 						Name:  "enabled",
 						Value: "true",
@@ -59,7 +67,7 @@ func TestCreatePmdConfig(t *testing.T) {
 			},
 			{
 				PatternId: "java/design/LoosePackageCoupling",
-				ParameterConfigurations: []PatternParameterConfiguration{
+				ParameterConfigurations: []tools.PatternParameterConfiguration{
 					{
 						Name:  "enabled",
 						Value: "true",
@@ -77,7 +85,7 @@ func TestCreatePmdConfig(t *testing.T) {
 	generatedConfig := CreatePmdConfig(config)
 
 	// Read expected ruleset
-	expectedRulesetPath := filepath.Join("testdata", "repositories", "pmd", "expected-ruleset.xml")
+	expectedRulesetPath := "expected-ruleset.xml"
 	expectedRulesetBytes, err := os.ReadFile(expectedRulesetPath)
 	if err != nil {
 		t.Fatalf("Failed to read expected ruleset: %v", err)
@@ -105,11 +113,11 @@ func TestCreatePmdConfig(t *testing.T) {
 }
 
 func TestCreatePmdConfigWithDisabledRules(t *testing.T) {
-	config := ToolConfiguration{
-		PatternsConfiguration: []PatternConfiguration{
+	config := tools.ToolConfiguration{
+		PatternsConfiguration: []tools.PatternConfiguration{
 			{
 				PatternId: "java/codestyle/AtLeastOneConstructor",
-				ParameterConfigurations: []PatternParameterConfiguration{
+				ParameterConfigurations: []tools.PatternParameterConfiguration{
 					{
 						Name:  "enabled",
 						Value: "false",
@@ -163,8 +171,8 @@ func TestCreatePmdConfigEmpty(t *testing.T) {
 	}
 	defer os.Chdir(cwd)
 
-	config := ToolConfiguration{
-		PatternsConfiguration: []PatternConfiguration{},
+	config := tools.ToolConfiguration{
+		PatternsConfiguration: []tools.PatternConfiguration{},
 	}
 
 	obtainedConfig := CreatePmdConfig(config)

tools/pmdRunner_test.go tools/test/pmd/pmdRunner_test.gotools/pmdRunner_test.go renamed to tools/test/pmd/pmdRunner_test.go

@@ -1,4 +1,4 @@
-package tools
+package pmd
 
 import (
 	"encoding/json"
@@ -8,6 +8,8 @@ import (
 	"strings"
 	"testing"
 
+	"codacy/cli-v2/tools/pmd"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -50,20 +52,20 @@ func TestRunPmdToFile(t *testing.T) {
 	}
 
 	// Use the correct path relative to tools directory
-	testDirectory := filepath.Join(currentDirectory, "testdata", "repositories", "pmd")
+	testDirectory := "."
 	tempResultFile := filepath.Join(os.TempDir(), "pmd.sarif")
 	defer os.Remove(tempResultFile)
 
 	// Use absolute paths
 	repositoryToAnalyze := testDirectory
 	// Use the standard ruleset file for testing the PMD runner functionality
-	rulesetFile := filepath.Join(testDirectory, "pmd-ruleset.xml")
+	rulesetFile := "pmd-ruleset.xml"
 
 	// Use the same path as defined in plugin.yaml
 	pmdBinary := filepath.Join(homeDirectory, ".cache/codacy/tools/[email protected]/pmd-bin-6.55.0/bin/run.sh")
 
 	// Run PMD
-	err = RunPmd(repositoryToAnalyze, pmdBinary, nil, tempResultFile, "sarif", rulesetFile)
+	err = pmd.RunPmd(repositoryToAnalyze, pmdBinary, nil, tempResultFile, "sarif", rulesetFile)
 	if err != nil {
 		t.Fatalf("Failed to run pmd: %v", err)
 	}