Skip to content

Commit

Permalink
added missing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
serayuzgur committed May 4, 2017
1 parent 63f3174 commit bff3772
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
13 changes: 9 additions & 4 deletions src/service/query_api/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub fn parse(query: Option<&str>) -> Option<Queries> {
continue;
}
// wellcome, now we can start the real parsing
let parts = param.splitn(2,"=").collect::<Vec<&str>>();
let parts = param.splitn(2, "=").collect::<Vec<&str>>();
if parts.get(0).is_none() || parts.get(1).is_none() {
continue;
}
Expand Down Expand Up @@ -62,7 +62,7 @@ fn set_where_it_belongs(queries: &mut Queries, q: Query) {
}
"_filter" => {
let mut filter_vet = &mut queries.filter;
println!("parsing {}",q.value);
println!("parsing {}", q.value);
filter_vet.extend(q.value.split(",").map(Query::from).collect::<Vec<Query>>());
}
"_q" => {
Expand Down Expand Up @@ -118,6 +118,10 @@ impl PartialEq for Queries {
mod tests {
use super::*;
#[test]
fn parse_none_test() {
assert_eq!(parse(None), None);
}
#[test]
fn parse_fields_test() {
let mut queries = Queries::new();
{
Expand Down Expand Up @@ -146,8 +150,9 @@ mod tests {
let sort = &mut queries.sort;
sort.push(Sort::ASC("a".to_string()));
sort.push(Sort::DSC("b".to_string()));
sort.push(Sort::ASC("c".to_string()));
}
assert_eq!(parse(Some("_sort=a+,b-")), Some(queries));
assert_eq!(parse(Some("_sort=a+,b-,c")), Some(queries));
}

#[test]
Expand All @@ -161,7 +166,7 @@ mod tests {
assert_eq!(parse(Some("_filter=name=seray,active=true")), Some(queries));
}

#[test]
#[test]
fn parse_q_test() {
let mut queries = Queries::new();
{
Expand Down
5 changes: 5 additions & 0 deletions src/service/query_api/page.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,10 @@ mod tests {
Some(Page::OFFSET(123)));
assert_eq!(parse(Query::new("_limit", "=", "123")),
Some(Page::LIMIT(123)));

assert_ne!(parse(Query::new("_offset", "=", "123")),
Some(Page::LIMIT(123)));
assert_ne!(parse(Query::new("_offset", "=", "123")),
Some(Page::LIMIT(123)));
}
}
3 changes: 3 additions & 0 deletions src/service/query_api/sort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,8 @@ mod tests {
assert_eq!(parse("name"), None);
assert_eq!(parse("name+"), Some(Sort::ASC("name".to_string())));
assert_eq!(parse("name-"), Some(Sort::DSC("name".to_string())));

assert_ne!(parse("name+"), Some(Sort::DSC("name".to_string())));
assert_ne!(parse("name-"), Some(Sort::ASC("name".to_string())));
}
}

0 comments on commit bff3772

Please sign in to comment.