ayrton
/
CMPUT_415_tester
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented the map checker 

- Tests passing
pull/5/head
Ayrton Chilibeck 2024-01-14 17:00:12 -07:00
parent 809e6837eb
commit 4cd54923c9
Signed by: ayrton
GPG Key ID: BAE24A03DCBF160D
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/validate.rs
View File

@ -32,7 +32,6 @@ pub fn validate(verbosity: u8, config: util::config::Config) {
print_unmached(in_to_out.1); print_unmached(in_to_out.1);
print_invalid_pairs(invalid, in_suffix, out_suffix); print_invalid_pairs(invalid, in_suffix, out_suffix);
} }
/** /**
@ -110,7 +109,7 @@ fn map_files(in_files: Vec<PathBuf>, out_files: Vec<PathBuf>, config: &util::con
cl.retain(|x| !r.contains(&x)); cl.retain(|x| !r.contains(&x));
res.1.append(&mut cl); res.1.append(&mut cl);
println!("{:?}", res); // println!("{:?}", res);
return res; return res;
} }
@ -124,7 +123,15 @@ fn map_files(in_files: Vec<PathBuf>, out_files: Vec<PathBuf>, config: &util::con
* @return A vector of tuples with (input, output) PathBufs * @return A vector of tuples with (input, output) PathBufs
*/ */
fn check_mappings(mappings: Vec<(PathBuf, PathBuf)>, in_suffix: &str, out_suffix: &str) -> Vec<(PathBuf, PathBuf)> { fn check_mappings(mappings: Vec<(PathBuf, PathBuf)>, in_suffix: &str, out_suffix: &str) -> Vec<(PathBuf, PathBuf)> {
return vec![(PathBuf::from("a"), PathBuf::from("b"))]; let mut res: Vec<(PathBuf, PathBuf)> = vec![];
for tup in &mappings {
if !(tup.0.as_path().extension().unwrap() == in_suffix) || !(tup.1.as_path().extension().unwrap() == out_suffix) {
res.push(tup.clone());
}
}
// println!("{:?}", res);
return res;
} }
/** /**
@ -144,7 +151,7 @@ fn collect_invalid(files: &Vec<PathBuf>, suf: &str) -> Vec<PathBuf> {
res.push(file.clone()); res.push(file.clone());
} }
} }
println!("{:?}", res);
return res return res
} }
/** /**
@ -320,7 +327,7 @@ mod tests {
print_invalid_pairs(invalid.clone(), in_suffix, out_suffix); print_invalid_pairs(invalid.clone(), in_suffix, out_suffix);
assert!(&invalid.contains(&(in_files[0].clone(), out_files[0].clone()))); assert!(&invalid.contains(&(in_files[0].clone(), out_files[0].clone())));
assert!(&invalid.contains(&(in_files[1].clone(), out_files[1].clone()))); assert!(&invalid.contains(&(in_files[1].clone(), out_files[1].clone())));
assert!(&invalid.contains(&(in_files[2].clone(), out_files[2].clone()))); assert!(!&invalid.contains(&(in_files[2].clone(), out_files[2].clone())));
assert!(!&invalid.contains(&(in_files[3].clone(), out_files[3].clone()))); assert!(!&invalid.contains(&(in_files[3].clone(), out_files[3].clone())));
assert!(!&invalid.contains(&(in_files[4].clone(), out_files[4].clone()))); assert!(!&invalid.contains(&(in_files[4].clone(), out_files[4].clone())));