Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Cleanup some code nearest step

Browse Source
This commit is contained in:
Dennis 2024-05-30 18:32:06 +02:00
parent 3f14453f5b
commit 32dffeb54d
No known key found for this signature in database
GPG Key ID: 6937EAEA33A3FA5D
2 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/common/osrm_world.rs
View File

@ -1,4 +1,4 @@
use std::{collections::{HashMap, HashSet}, fs::File, path::PathBuf};
use std::{collections::HashMap, fs::File, path::PathBuf};
use crate::Point;
use cucumber::World;

76
tests/cucumber.rs
View File

@ -158,10 +158,6 @@ fn request_nearest(world: &mut OSRMWorld, step: &Step) {
} else {
println!("{cache_path:?} does not exist");
}
// extract osm file (partition, preprocess)
// parse table from Step and build query list
// run queries (in parallel) and validate results
let routed_path = path.join("build").join("osrm-routed");
if !routed_path.exists() {
@ -170,53 +166,51 @@ fn request_nearest(world: &mut OSRMWorld, step: &Step) {
// parse query data
let t = &step.table.as_ref().expect("no query table specified");
let test_cases: Vec<_> = t.rows.iter().skip(1).map(|row|{
assert_eq!(row.len(), 2, "test case broken: row needs to have two entries");
let query = row.get(0).unwrap();
let expected = row.get(1).unwrap();
assert_eq!(query.len(), 1);
assert_eq!(expected.len(), 1);
(query.chars().next().unwrap(), expected.chars().next().unwrap())
}).collect();
let test_cases: Vec<_> = t
.rows
.iter()
.skip(1)
.map(|row| {
assert_eq!(
row.len(),
2,
"test case broken: row needs to have two entries"
);
let query = row.get(0).unwrap();
let expected = row.get(1).unwrap();
assert_eq!(query.len(), 1);
assert_eq!(expected.len(), 1);
(
query.chars().next().unwrap(),
expected.chars().next().unwrap(),
)
})
.collect();
let data_path = cache_path.join(world.scenario_id.to_owned() + ".osrm");
println!("{routed_path:?} {}", data_path.to_str().unwrap());
// TODO: this should be a let statement to reduce nesting?
match Command::new(routed_path)
let handle = Command::new(routed_path)
.arg(data_path.to_str().unwrap())
.spawn()
{
Ok(mut child) => {
.spawn();
for (query, expected) in test_cases {
let query_coord = world.get_location(query);
let expected_coord = world.get_location(expected);
println!("{query_coord:?} => {expected_coord:?}");
}
if let Err(e) = child.kill() {
panic!("shutdown failed: {e}");
}
},
Err(e) => panic!("{e}"),
if let Err(e) = handle {
panic!("{e}");
}
// parse expected results
// parse and run test cases
for (query, expected) in test_cases {
let query_coord = world.get_location(query);
let expected_coord = world.get_location(expected);
// run queries
println!("{query_coord:?} => {expected_coord:?}");
// run queries
// check results
// check results
}
// match Command::new(routed_path)
// .arg(data_path.to_str().unwrap().spawn();
// .output()
// {
// Ok(o) => println!("{o:?}"),
// Err(e) => panic!("{e}"),
// }
// todo!("nearest {step:?}");
if let Err(e) = handle.expect("osrm-routed died unexpectedly").kill() {
panic!("shutdown failed: {e}");
}
}
// TODO: move to different file