Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix cargo test without no args #78

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix cargo test without no args #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 60 additions & 42 deletions aptos-indexer-processors-sdk/testing-framework/src/cli_parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,32 @@ pub fn get_test_config() -> (bool, Option<String>) {
pub fn parse_test_args() -> TestArgs {
let raw_args: Vec<String> = std::env::args().collect();

// Find the "--" separator, or default to include all args after the test name
let clap_args_position = raw_args.iter().position(|arg| arg == "--");

// Determine the starting position for custom arguments
let custom_args_start = match clap_args_position {
Some(position) => position + 1, // Start after the "--" if it exists
None => 1, // Start after the test name, skip the first element
};

// Collect custom arguments based on determined start position
let custom_args: Vec<String> = raw_args[custom_args_start..].to_vec();
// Find the position of the "--" separator to identify custom arguments
let custom_args_start = raw_args
.iter()
.position(|arg| arg == "--")
.map_or(0, |pos| pos + 1);

// Collect custom arguments based on the determined start position
let custom_args: Vec<String> = raw_args[custom_args_start..]
.iter()
.filter(|&arg| arg != "--nocapture") // Ignore standard flags like --nocapture
.cloned()
.collect();

// Manually parse the "generate-output" flag
let generate_output_flag = custom_args.contains(&"generate-output".to_string());

// Manually parse the "--output-path" flag and get its associated value
// Manually parse the "output-path" flag and get its associated value
let output_path = custom_args
.windows(2)
.find(|args| args[0] == "output-path")
.map(|args| args[1].clone());

println!("Parsed generate_output_flag: {}", generate_output_flag);
println!(
"Parsed output_path: {}",
output_path.clone().unwrap_or_else(|| "None".to_string())
);
// Validate that --output-path is not provided without --generate-output
if output_path.is_some() && !generate_output_flag {
panic!("Error: output-path cannot be provided without generate-output.");
}

TestArgs {
generate_output: generate_output_flag,
Expand All @@ -58,30 +58,28 @@ pub fn parse_test_args() -> TestArgs {
#[cfg(test)]
mod tests {
use super::*;

pub fn parse_test_args_from_vec(args: Vec<String>) -> TestArgs {
// Find the "--" separator (if it exists)
let clap_args_position = args.iter().position(|arg| arg == "--");
let custom_args_start = args
.iter()
.position(|arg| arg == "--")
.map_or(0, |pos| pos + 1);

// Only pass the arguments that come after "--", if it exists
let custom_args: Vec<String> = match clap_args_position {
Some(position) => args[position + 1..].to_vec(), // Slice after `--`
None => Vec::new(), // If no `--` is found, treat as no custom args
};
let custom_args: Vec<String> = args[custom_args_start..]
.iter()
.filter(|&arg| arg != "--nocapture") // Ignore standard flags like --nocapture
.cloned()
.collect();

// Manually parse the "--generate-output" flag
let generate_output_flag = custom_args.contains(&"generate-output".to_string());

// Manually parse the "--output-path" flag and get its associated value
let output_path = custom_args
.windows(2)
.find(|args| args[0] == "output-path")
.map(|args| args[1].clone());

println!("Parsed generate_output_flag: {}", generate_output_flag);
println!(
"Parsed output_path: {}",
output_path.clone().unwrap_or_else(|| "None".to_string())
);
if output_path.is_some() && !generate_output_flag {
panic!("Error: output-path cannot be provided without generate-output.");
}

TestArgs {
generate_output: generate_output_flag,
Expand All @@ -91,27 +89,22 @@ mod tests {

#[test]
fn test_parse_generate_output_flag() {
let args = vec![
"test_binary".to_string(),
"--".to_string(),
"generate-output".to_string(),
];
let args = vec!["--".to_string(), "generate-output".to_string()];
let parsed = parse_test_args_from_vec(args);
assert!(parsed.generate_output);
assert_eq!(parsed.output_path, None);
}

#[test]
fn test_parse_output_path() {
fn test_parse_generate_output_flag_with_binary() {
let args = vec![
"test_binary".to_string(),
"--".to_string(),
"output-path".to_string(),
"/some/path".to_string(),
"generate-output".to_string(),
];
let parsed = parse_test_args_from_vec(args);
assert!(!parsed.generate_output);
assert_eq!(parsed.output_path, Some("/some/path".to_string()));
assert!(parsed.generate_output);
assert_eq!(parsed.output_path, None);
}

#[test]
Expand All @@ -135,4 +128,29 @@ mod tests {
assert!(!parsed.generate_output);
assert_eq!(parsed.output_path, None);
}

#[test]
#[should_panic(expected = "Error: output-path cannot be provided without generate-output.")]
fn test_output_path_without_generate_output() {
let args = vec![
"test_binary".to_string(),
"--".to_string(),
"output-path".to_string(),
"/some/path".to_string(),
];
parse_test_args_from_vec(args);
}

#[test]
fn test_ignore_nocapture_flag() {
let args = vec![
"test_binary".to_string(),
"--".to_string(),
"--nocapture".to_string(),
"generate-output".to_string(),
];
let parsed = parse_test_args_from_vec(args);
assert!(parsed.generate_output);
assert_eq!(parsed.output_path, None);
}
}
Loading