Refactor common assertion to shared module.

Author: elle-j

crates/resolc/src/tests/cli/asm.rs

@@ -2,8 +2,6 @@
 
 #![cfg(test)]
 
-use revive_common;
-
 use crate::tests::cli::utils;
 
 const ASM_OPTION: &str = "--asm";
@@ -12,13 +10,7 @@ const ASM_OPTION: &str = "--asm";
 fn runs_with_valid_input_file() {
     const ARGUMENTS: &[&str] = &[utils::SOLIDITY_CONTRACT_PATH, ASM_OPTION];
     let resolc_result = utils::execute_resolc(ARGUMENTS);
-    assert!(
-        resolc_result.success,
-        "Providing a valid input file should succeed with exit code {}, got {}.\nDetails: {}",
-        revive_common::EXIT_CODE_SUCCESS,
-        resolc_result.code,
-        resolc_result.output
-    );
+    utils::assert_command_success(&resolc_result, "Providing a valid input file");
 
     for pattern in &["deploy", "call", "seal_return"] {
         assert!(

crates/resolc/src/tests/cli/output_dir.rs

@@ -4,7 +4,6 @@
 
 use std::path::Path;
 
-use revive_common;
 use rstest::rstest;
 
 use crate::tests::cli::utils;
@@ -30,13 +29,7 @@ fn assert_valid_output_file(
     output_file_type: &str,
     output_file_path: &str,
 ) {
-    assert!(
-        result.success,
-        "Providing an output directory should succeed with exit code {}, got {}.\nDetails: {}",
-        revive_common::EXIT_CODE_SUCCESS,
-        result.code,
-        result.output
-    );
+    utils::assert_command_success(&result, "Providing an output directory");
 
     assert!(
         result.output.contains("Compiler run successful"),

crates/resolc/src/tests/cli/standard_json.rs

@@ -2,8 +2,6 @@
 
 #![cfg(test)]
 
-use revive_common;
-
 use crate::tests::cli::utils;
 
 const JSON_OPTION: &str = "--standard-json";
@@ -13,13 +11,7 @@ fn runs_with_valid_input_file() {
     const ARGUMENTS: &[&str] = &[JSON_OPTION];
     let resolc_result =
         utils::execute_resolc_with_stdin_input(ARGUMENTS, utils::STANDARD_JSON_CONTRACTS_PATH);
-    assert!(
-        resolc_result.success,
-        "Providing a valid input file to stdin should succeed with exit code {}, got {}.\nDetails: {}",
-        revive_common::EXIT_CODE_SUCCESS,
-        resolc_result.code,
-        resolc_result.output
-    );
+    utils::assert_command_success(&resolc_result, "Providing a valid input file to stdin");
 
     assert!(
         resolc_result.output.contains("contracts"),

crates/resolc/src/tests/cli/usage.rs

@@ -9,12 +9,7 @@ use crate::tests::cli::utils;
 fn shows_usage_with_help() {
     const ARGUMENTS: &[&str] = &["--help"];
     let resolc_result = utils::execute_resolc(ARGUMENTS);
-    assert!(
-        resolc_result.success,
-        "Providing the `--help` option should succeed with exit code {}, got {}.",
-        revive_common::EXIT_CODE_SUCCESS,
-        resolc_result.code
-    );
+    utils::assert_command_success(&resolc_result, "Providing the `--help` option");
 
     assert!(
         resolc_result.output.contains("Usage: resolc"),

crates/resolc/src/tests/cli/utils.rs

@@ -83,6 +83,16 @@ pub fn assert_equal_exit_codes(solc_result: &CommandResult, resolc_result: &Comm
     );
 }
 
+pub fn assert_command_success(result: &CommandResult, error_message_prefix: &str) {
+    assert!(
+        result.success,
+        "{error_message_prefix} should succeed with exit code {}, got {}.\nDetails: {}",
+        revive_common::EXIT_CODE_SUCCESS,
+        result.code,
+        result.output
+    );
+}
+
 pub fn assert_command_failure(result: &CommandResult, error_message_prefix: &str) {
     assert!(
         !result.success,

crates/resolc/src/tests/cli/yul.rs

@@ -2,8 +2,6 @@
 
 #![cfg(test)]
 
-use revive_common;
-
 use crate::tests::cli::utils;
 
 pub const YUL_OPTION: &str = "--yul";
@@ -15,13 +13,7 @@ const SOLC_YUL_OPTION: &str = "--strict-assembly";
 fn runs_with_valid_input_file() {
     const ARGUMENTS: &[&str] = &[utils::YUL_CONTRACT_PATH, YUL_OPTION];
     let resolc_result = utils::execute_resolc(ARGUMENTS);
-    assert!(
-        resolc_result.success,
-        "Providing a valid input file should succeed with exit code {}, got {}.\nDetails: {}",
-        revive_common::EXIT_CODE_SUCCESS,
-        resolc_result.code,
-        resolc_result.output
-    );
+    utils::assert_command_success(&resolc_result, "Providing a valid input file");
 
     assert!(
         resolc_result