Fix jetbrains tests for windows

Author: agrasth

artifactory/cli/ide/jetbrains/cli.go

@@ -111,12 +111,18 @@ func getJetbrainsRepoKeyAndURL(c *components.Context) (repoKey, repositoryURL st
 			return
 		}
 	}
-	baseUrl := strings.TrimRight(artDetails.Url, "/")
+	// Use ArtifactoryUrl if available (when using flags), otherwise use Url (when using config)
+	baseUrl := artDetails.ArtifactoryUrl
+	if baseUrl == "" {
+		baseUrl = artDetails.Url
+	}
+	baseUrl = strings.TrimRight(baseUrl, "/")
+
 	urlSuffix := c.GetStringFlagValue(urlSuffixFlag)
 	if urlSuffix != "" {
 		urlSuffix = "/" + strings.TrimLeft(urlSuffix, "/")
 	}
-	repositoryURL = baseUrl + "/artifactory/api/jetbrainsplugins/" + repoKey + urlSuffix
+	repositoryURL = baseUrl + "/api/jetbrainsplugins/" + repoKey + urlSuffix
 	return
 }
 

artifactory/cli/ide/vscode/cli.go

@@ -116,12 +116,18 @@ func getVscodeRepoKeyAndURL(c *components.Context) (repoKey, serviceURL string,
 			return
 		}
 	}
-	baseUrl := strings.TrimRight(artDetails.Url, "/")
+	// Use ArtifactoryUrl if available (when using flags), otherwise use Url (when using config)
+	baseUrl := artDetails.ArtifactoryUrl
+	if baseUrl == "" {
+		baseUrl = artDetails.Url
+	}
+	baseUrl = strings.TrimRight(baseUrl, "/")
+
 	urlSuffix := c.GetStringFlagValue(urlSuffixFlag)
 	if urlSuffix == "" {
 		urlSuffix = "_apis/public/gallery"
 	}
-	serviceURL = baseUrl + "/artifactory/api/vscodeextensions/" + repoKey + "/" + strings.TrimLeft(urlSuffix, "/")
+	serviceURL = baseUrl + "/api/vscodeextensions/" + repoKey + "/" + strings.TrimLeft(urlSuffix, "/")
 	return
 }
 

artifactory/commands/ide/jetbrains/jetbrains.go

@@ -160,9 +160,21 @@ func (jc *JetbrainsCommand) detectJetBrainsIDEs() error {
 
 	switch runtime.GOOS {
 	case "darwin":
-		configBasePath = filepath.Join(os.Getenv("HOME"), "Library", "Application Support", "JetBrains")
+		// Check for test override first, then use standard HOME location
+		testHome := os.Getenv("TEST_HOME")
+		if testHome != "" {
+			configBasePath = filepath.Join(testHome, "Library", "Application Support", "JetBrains")
+		} else {
+			configBasePath = filepath.Join(os.Getenv("HOME"), "Library", "Application Support", "JetBrains")
+		}
 	case "windows":
-		configBasePath = filepath.Join(os.Getenv("APPDATA"), "JetBrains")
+		// Check for test override first, then use standard APPDATA location
+		testAppData := os.Getenv("TEST_APPDATA")
+		if testAppData != "" {
+			configBasePath = filepath.Join(testAppData, "JetBrains")
+		} else {
+			configBasePath = filepath.Join(os.Getenv("APPDATA"), "JetBrains")
+		}
 	case "linux":
 		// Respect XDG_CONFIG_HOME environment variable
 		xdgConfigHome := os.Getenv("XDG_CONFIG_HOME")

artifactory/commands/ide/jetbrains/jetbrains_test.go

@@ -460,3 +460,52 @@ func BenchmarkJetbrainsCommand_ParseIDEFromDirName(b *testing.B) {
 		}
 	}
 }
+
+func TestJetbrainsCommand_DetectJetBrainsIDEs_WithTestAppData(t *testing.T) {
+	// Test TEST_APPDATA support for Windows testing environments
+
+	// Create temporary directory for TEST_APPDATA
+	tempDir := t.TempDir()
+
+	// Create mock JetBrains configuration directory structure
+	jetbrainsDir := filepath.Join(tempDir, "JetBrains")
+	ideaDir := filepath.Join(jetbrainsDir, "IntelliJIdea2023.3")
+	err := os.MkdirAll(ideaDir, 0755)
+	require.NoError(t, err)
+
+	// Create mock idea.properties file
+	propertiesPath := filepath.Join(ideaDir, "idea.properties")
+	propertiesContent := "# Test properties\nide.system.path=${user.home}/.local/share/JetBrains/IntelliJIdea2023.3\n"
+	err = os.WriteFile(propertiesPath, []byte(propertiesContent), 0644)
+	require.NoError(t, err)
+
+	// Set TEST_APPDATA environment variable
+	originalTestAppData := os.Getenv("TEST_APPDATA")
+	defer func() {
+		if originalTestAppData != "" {
+			_ = os.Setenv("TEST_APPDATA", originalTestAppData)
+		} else {
+			_ = os.Unsetenv("TEST_APPDATA")
+		}
+	}()
+	err = os.Setenv("TEST_APPDATA", tempDir)
+	require.NoError(t, err)
+
+	// Create JetBrains command and test detection
+	cmd := &JetbrainsCommand{}
+
+	// For testing, temporarily modify runtime.GOOS to simulate Windows behavior
+	// Note: We can't actually change runtime.GOOS, so this test documents the intended behavior
+	if runtime.GOOS == "windows" {
+		// Run detection - should find our mock IDE
+		err = cmd.detectJetBrainsIDEs()
+		// Should succeed when TEST_APPDATA points to our mock directory
+		require.NoError(t, err)
+		require.Len(t, cmd.detectedIDEs, 1)
+		require.Equal(t, "IntelliJ IDEA", cmd.detectedIDEs[0].Name)
+		require.Equal(t, "2023.3", cmd.detectedIDEs[0].Version)
+	} else {
+		// On non-Windows, TEST_APPDATA should not affect detection
+		t.Logf("TEST_APPDATA test is primarily for Windows environments")
+	}
+}