[rust] Refactor logic to read stdout and stderr in tests

Author: bonigarcia

rust/tests/browser_tests.rs

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::common::{assert_output, get_selenium_manager};
+use crate::common::{assert_output, get_selenium_manager, get_stdout};
 
 use exitcode::DATAERR;
 use rstest::rstest;
@@ -54,15 +54,13 @@ fn browser_version_test(
     .success()
     .code(0);
 
-    let stdout = &cmd.unwrap().stdout;
-    let output = std::str::from_utf8(stdout).unwrap();
-    println!("{}", output);
+    let stdout = get_stdout(&mut cmd);
 
-    assert!(output.contains(&driver_name));
-    if !browser_version.is_empty() && output.contains("cache") {
-        assert!(output.contains(&driver_version));
+    assert!(stdout.contains(&driver_name));
+    if !browser_version.is_empty() && stdout.contains("cache") {
+        assert!(stdout.contains(&driver_version));
     }
-    assert!(!output.contains("Error sending stats"));
+    assert!(!stdout.contains("Error sending stats"));
 }
 
 #[rstest]
@@ -148,9 +146,8 @@ fn browser_path_test(#[case] os: String, #[case] browser: String, #[case] browse
             .success()
             .code(0);
 
-        let stdout = &cmd.unwrap().stdout;
-        let output = std::str::from_utf8(stdout).unwrap();
-        println!("{}", output);
-        assert!(!output.contains("WARN"));
+        let stdout = get_stdout(&mut cmd);
+
+        assert!(!stdout.contains("WARN"));
     }
 }

rust/tests/common.rs

@@ -33,11 +33,9 @@ pub fn get_selenium_manager() -> Command {
 
 #[allow(dead_code)]
 pub fn assert_driver(cmd: &mut Command) {
-    let stdout = &cmd.unwrap().stdout;
-    let output = std::str::from_utf8(stdout).unwrap();
-    println!("{}", output);
+    let stdout = get_stdout(cmd);
 
-    let json: JsonOutput = serde_json::from_str(output).unwrap();
+    let json: JsonOutput = serde_json::from_str(&stdout).unwrap();
     let driver_path = Path::new(&json.result.driver_path);
     assert!(driver_path.exists());
     assert!(is_executable(driver_path));
@@ -72,10 +70,19 @@ pub fn exec_driver(cmd: &mut Command) -> String {
 }
 
 #[allow(dead_code)]
-pub fn display_output(cmd: &mut Command) {
+pub fn get_stdout(cmd: &mut Command) -> String {
     let stdout = &cmd.unwrap().stdout;
     let output = std::str::from_utf8(stdout).unwrap();
     println!("{}", output);
+    output.to_string()
+}
+
+#[allow(dead_code)]
+pub fn get_stderr(cmd: &mut Command) -> String {
+    let stderr = &cmd.unwrap().stderr;
+    let err_output = std::str::from_utf8(stderr).unwrap();
+    println!("stderr: {}", err_output);
+    err_output.to_string()
 }
 
 #[allow(dead_code)]

rust/tests/config_tests.rs

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::common::get_selenium_manager;
+use crate::common::{get_selenium_manager, get_stdout};
 
 use rstest::rstest;
 
@@ -44,4 +44,8 @@ fn config_test(#[case] browser_name: String) {
         .assert()
         .success()
         .code(0);
+
+    let stdout = get_stdout(&mut cmd);
+
+    assert!(!stdout.contains("WARN") && !stdout.contains("ERROR"));
 }

rust/tests/grid_tests.rs

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::common::{assert_output, get_selenium_manager};
+use crate::common::{assert_output, get_selenium_manager, get_stdout};
 
 use exitcode::DATAERR;
 use rstest::rstest;
@@ -33,11 +33,8 @@ fn grid_latest_test() {
         .success()
         .code(0);
 
-    let stdout = &cmd.unwrap().stdout;
-    let output = str::from_utf8(stdout).unwrap();
-    println!("{}", output);
-
-    let json: JsonOutput = serde_json::from_str(output).unwrap();
+    let stdout = get_stdout(&mut cmd);
+    let json: JsonOutput = serde_json::from_str(&stdout).unwrap();
     assert!(!json.logs.is_empty());
 
     let output_code = json.result.code;
@@ -61,11 +58,9 @@ fn grid_version_test(#[case] grid_version: &str) {
         .success()
         .code(0);
 
-    let stdout = &cmd.unwrap().stdout;
-    let output = str::from_utf8(stdout).unwrap();
-    println!("{}", output);
+    let stdout = get_stdout(&mut cmd);
 
-    let json: JsonOutput = serde_json::from_str(output).unwrap();
+    let json: JsonOutput = serde_json::from_str(&stdout).unwrap();
     let jar = Path::new(&json.result.driver_path);
     let jar_name = jar.file_name().unwrap().to_str().unwrap();
     assert!(jar_name.contains(grid_version));

rust/tests/offline_tests.rs

@@ -15,9 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::common::get_selenium_manager;
-
-use std::str;
+use crate::common::{get_selenium_manager, get_stdout};
 
 mod common;
 
@@ -29,8 +27,7 @@ fn offline_test() {
         .success()
         .code(0);
 
-    let stdout = &cmd.unwrap().stdout;
-    let output = str::from_utf8(stdout).unwrap();
-    println!("{output}");
-    assert!(output.contains("offline mode"));
+    let stdout = get_stdout(&mut cmd);
+
+    assert!(stdout.contains("offline mode"));
 }

rust/tests/output_tests.rs

@@ -15,11 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::common::get_selenium_manager;
+use crate::common::{get_selenium_manager, get_stderr, get_stdout};
 
 use selenium_manager::logger::{JsonOutput, MinimalJson, DRIVER_PATH};
 use std::path::Path;
-use std::str;
 
 mod common;
 
@@ -31,11 +30,9 @@ fn json_output_test() {
         .success()
         .code(0);
 
-    let stdout = &cmd.unwrap().stdout;
-    let output = str::from_utf8(stdout).unwrap();
-    println!("{}", output);
+    let stdout = get_stdout(&mut cmd);
 
-    let json: JsonOutput = serde_json::from_str(output).unwrap();
+    let json: JsonOutput = serde_json::from_str(&stdout).unwrap();
     assert!(!json.logs.is_empty());
 
     let output_code = json.result.code;
@@ -53,10 +50,8 @@ fn shell_output_test() {
         .success()
         .code(0);
 
-    let stdout = &cmd.unwrap().stdout;
-    let output = str::from_utf8(stdout).unwrap();
-    println!("{}", output);
-    assert!(output.contains(DRIVER_PATH));
+    let stdout = get_stdout(&mut cmd);
+    assert!(stdout.contains(DRIVER_PATH));
 }
 
 #[test]
@@ -67,16 +62,11 @@ fn mixed_output_test() {
         .success()
         .code(0);
 
-    let stdout = &cmd.unwrap().stdout;
-    let output = str::from_utf8(stdout).unwrap();
-    println!("stdout: {}", output);
-
-    let json: MinimalJson = serde_json::from_str(output).unwrap();
+    let stdout = get_stdout(&mut cmd);
+    let json: MinimalJson = serde_json::from_str(&stdout).unwrap();
     let driver = Path::new(&json.driver_path);
     assert!(driver.exists());
 
-    let stderr = &cmd.unwrap().stderr;
-    let err_output = str::from_utf8(stderr).unwrap();
-    println!("stderr: {}", err_output);
-    assert!(!err_output.is_empty());
+    let stderr = get_stderr(&mut cmd);
+    assert!(!stderr.is_empty());
 }