MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 11:53:49 +07:00
Code Issues Packages Projects Releases Wiki Activity

[tests] improving remote dev launcher test diagnostics

Browse Source 
GitOrigin-RevId: 437c45b2711c683578dbab03171760f271b9f3f2
This commit is contained in:
Roman Shevchenko
2024-09-11 09:55:12 +02:00
committed by intellij-monorepo-bot
parent c792d53f08
commit 08244e6c15
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
native/XPlatLauncher/tests/remote_dev_tests.rs
View File

@@ -29,10 +29,10 @@ mod tests {
#[test] #[test]
fn remote_dev_known_command_without_project_path_test() { fn remote_dev_known_command_without_project_path_test() {
let remote_dev_command = &["dumpLaunchParameters"]; let remote_dev_command = &["dumpLaunchParameters"];
let output = run_launcher(LauncherRunSpec::remote_dev().with_args(remote_dev_command)).stdout; let run_result = run_launcher(LauncherRunSpec::remote_dev().with_args(remote_dev_command));
assert!(output.contains("dump-launch-parameters"), "output:\n{}", output); check_output(&run_result, |output| output.contains("dump-launch-parameters"));
assert!(!output.contains("Usage: ./remote-dev-server [ij_command_name] [/path/to/project] [arguments...]"), "output:\n{}", output); check_output(&run_result, |output| !output.contains("Usage: ./remote-dev-server [ij_command_name] [/path/to/project] [arguments...]"));
} }
#[test] #[test]
@@ -46,12 +46,12 @@ mod tests {
fn remote_dev_known_command_with_project_path_test() { fn remote_dev_known_command_with_project_path_test() {
let test = prepare_test_env(LauncherLocation::RemoteDev); let test = prepare_test_env(LauncherLocation::RemoteDev);
let remote_dev_command = &["run", &test.project_dir.display().to_string()]; let remote_dev_command = &["run", &test.project_dir.display().to_string()];
let output = run_launcher_ext(&test, LauncherRunSpec::remote_dev().with_args(remote_dev_command)).stdout; let run_result = run_launcher_ext(&test, LauncherRunSpec::remote_dev().with_args(remote_dev_command));
let project_dir = format!("{:?}", &test.project_dir); let project_dir = format!("{:?}", &test.project_dir);
assert!(output.contains("remoteDevHost"), "'remoteDevHost' not in output:\n{}", output); check_output(&run_result, |output| output.contains("remoteDevHost"));
assert!(output.contains(project_dir.as_str()), "'{project_dir}' not in output:\n{}", output); check_output(&run_result, |output| output.contains(project_dir.as_str()));
assert!(!output.contains("Usage: ./remote-dev-server [ij_command_name] [/path/to/project] [arguments...]"), "output:\n{}", output); check_output(&run_result, |output| !output.contains("Usage: ./remote-dev-server [ij_command_name] [/path/to/project] [arguments...]"));
} }
#[test] #[test]
@@ -67,12 +67,12 @@ mod tests {
let project_dir = &test.project_dir.to_string_lossy().to_string(); let project_dir = &test.project_dir.to_string_lossy().to_string();
let remote_dev_command = &["warmup", project_dir]; let remote_dev_command = &["warmup", project_dir];
let output = run_launcher_ext(&test, LauncherRunSpec::remote_dev().with_args(remote_dev_command)).stdout; let run_result = run_launcher_ext(&test, LauncherRunSpec::remote_dev().with_args(remote_dev_command));
let project_dir_arg = &format!("--project-dir={}", project_dir.replace('\\', "\\\\")); let project_dir_arg = &format!("--project-dir={}", project_dir.replace('\\', "\\\\"));
assert!(output.contains("warmup"), "output:\n{}", output); check_output(&run_result, |output| output.contains("warmup"));
assert!(output.contains(project_dir_arg), "'{}' is not in the output:\n{}", project_dir_arg, output); check_output(&run_result, |output| output.contains(project_dir_arg));
assert!(!output.contains("Usage: ./remote-dev-server [ij_command_name] [/path/to/project] [arguments...]"), "output:\n{}", output); check_output(&run_result, |output| !output.contains("Usage: ./remote-dev-server [ij_command_name] [/path/to/project] [arguments...]"));
} }
#[test] #[test]
@@ -81,12 +81,10 @@ mod tests {
let remote_dev_command = &["serverMode", "print-cwd"]; let remote_dev_command = &["serverMode", "print-cwd"];
let launch_result = run_launcher_ext(&test, LauncherRunSpec::standard().with_args(remote_dev_command)); let launch_result = run_launcher_ext(&test, LauncherRunSpec::standard().with_args(remote_dev_command));
let output = launch_result.stdout;
check_output(&launch_result, |output| output.contains("Started in server mode"));
assert!(output.contains("Started in server mode"), "'serverMode' was not included in arguments:\n{}", output); check_output(&launch_result, |output| output.contains("Mode: remote-dev"));
assert!(output.contains("Mode: remote-dev"), "Launched in non-remote mode:\n{}", output); check_output(&launch_result, |output| output.contains("CWD="));
assert!(output.contains("CWD="), "Working directory was not printed:\n{}", output);
} }
#[test] #[test]
@@ -153,7 +151,7 @@ mod tests {
check_output(&launch_result, |output| output.contains(&expected_output)); check_output(&launch_result, |output| output.contains(&expected_output));
} }
fn check_output<Check>(run_result: &LauncherRunResult, check: Check) where Check: FnOnce(&String) -> bool{ fn check_output<Check>(run_result: &LauncherRunResult, check: Check) where Check: FnOnce(&String) -> bool {
assert!(check(&run_result.stdout), "stdout:\n{}\nstderr:\n{}", run_result.stdout, run_result.stderr) assert!(check(&run_result.stdout), "Output check failed; run result: {:?}", run_result);
} }
} }

4
native/XPlatLauncher/tests/utils/mod.rs
View File

@@ -484,8 +484,8 @@ impl LauncherRunResult {
impl Debug for LauncherRunResult { impl Debug for LauncherRunResult {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
f.write_fmt(format_args!( f.write_fmt(format_args!(
"\n** exit code: {:?} ({:?})\n** stderr: <<<{}>>>\n** stdout: <<<{}>>>", "\n** exit status: {} (code: {:?})\n** stderr: <<<{}>>>\n** stdout: <<<{}>>>",
self.exit_status.code(), self.exit_status, self.stderr, self.stdout)) self.exit_status, self.exit_status.code(), self.stderr, self.stdout))
} }
} }