Honor selected JDK during Maven detection

This commit is contained in:
王鹏
2026-10-09 12:23:10 +08:00
parent 2f3d275021
commit d524d160f6
4 changed files with 117 additions and 11 deletions

View File

@@ -5,7 +5,7 @@ from pathlib import Path
from unittest.mock import patch
import deploy_tool.environment as environment_module
from deploy_tool.environment import check_environment, load_tool_paths, save_tool_paths
from deploy_tool.environment import check_environment, load_tool_paths, resolve_tool_path, save_tool_paths
class EnvironmentTests(unittest.TestCase):
@@ -69,6 +69,59 @@ class EnvironmentTests(unittest.TestCase):
self.assertEqual(results[0].command[0], str(node))
self.assertEqual(results[0].version, "v16.20.2")
def test_resolves_maven_root_bin_directory_and_command_file(self):
with tempfile.TemporaryDirectory() as tmp:
root = Path(tmp) / "apache-maven-3.10.0"
command = root / "bin" / "mvn.cmd"
command.parent.mkdir(parents=True)
command.write_text("@echo off", encoding="utf-8")
self.assertEqual(resolve_tool_path("Maven", root), command)
self.assertEqual(resolve_tool_path("Maven", command.parent), command)
self.assertEqual(resolve_tool_path("Maven", command), command)
def test_manual_maven_uses_selected_jdk_as_java_home(self):
with tempfile.TemporaryDirectory() as tmp:
root = Path(tmp)
java = root / "jdk-8" / "bin" / "java.exe"
maven = root / "apache-maven" / "bin" / "mvn.cmd"
java.parent.mkdir(parents=True)
maven.parent.mkdir(parents=True)
java.write_text("", encoding="utf-8")
maven.write_text("", encoding="utf-8")
completed = subprocess.CompletedProcess([str(maven), "-version"], 0, "Maven 3.10.0", "")
with patch("deploy_tool.environment.subprocess.run", return_value=completed) as run:
results = check_environment(
checks={"Maven": ["mvn", "-version"]},
manual_paths={"JDK": java, "Maven": maven},
)
self.assertTrue(results[0].installed)
self.assertEqual(run.call_args.kwargs["env"]["JAVA_HOME"], str(java.parent.parent))
self.assertTrue(run.call_args.kwargs["env"]["PATH"].startswith(str(java.parent)))
def test_manual_maven_failure_is_not_hidden_by_path_failure(self):
with tempfile.TemporaryDirectory() as tmp:
maven = Path(tmp) / "mvn.cmd"
maven.write_text("", encoding="utf-8")
def runner(command):
if command[0] == str(maven):
return subprocess.CompletedProcess(command, 1, "", "JAVA_HOME is not defined correctly")
raise FileNotFoundError(command[0])
result = check_environment(
runner=runner,
checks={"Maven": ["mvn", "-version"]},
manual_paths={"Maven": maven},
search_roots=[],
)[0]
self.assertFalse(result.installed)
self.assertEqual(result.source, "手动指定")
self.assertIn("JAVA_HOME", result.message)
def test_discovers_executable_from_known_search_paths(self):
with tempfile.TemporaryDirectory() as tmp:
mysql = Path(tmp) / "MySQL" / "MySQL Server 8.4" / "bin" / "mysql.exe"