maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(nix-compat/aterm): migrate from test_case to rstest

Browse source 
Change-Id: If05fa3d0f41d45e3574e0c5ddff406cb33dc52f4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11470
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2024-04-19 14:30:17 +03:00 • committed by clbot
parent 2783143414
commit caedd6ff86
2 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tvix/nix-compat/src/aterm/escape.rs
View file

@ -16,12 +16,13 @@ pub fn escape_bytes<P: AsRef<[u8]>>(s: P) -> Vec<u8> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::escape_bytes; use super::escape_bytes;
use test_case::test_case; use rstest::rstest;
#[test_case(b"", b""; "empty")] #[rstest]
#[test_case(b"\"", b"\\\""; "doublequote")] #[case::empty(b"", b"")]
#[test_case(b":", b":"; "colon")] #[case::doublequote(b"\"", b"\\\"")]
fn escape(input: &[u8], expected: &[u8]) { #[case::colon(b":", b":")]
fn escape(#[case] input: &[u8], #[case] expected: &[u8]) {
assert_eq!(expected, escape_bytes(input)) assert_eq!(expected, escape_bytes(input))
} }
} }

41
tvix/nix-compat/src/aterm/parser.rs
View file

@ -76,25 +76,31 @@ pub(crate) fn parse_str_list(i: &[u8]) -> IResult<&[u8], Vec<String>> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use test_case::test_case; use rstest::rstest;
#[test_case(br#""""#, b"", b""; "empty")] #[rstest]
#[test_case(br#""Hello World""#, b"Hello World", b""; "hello world")] #[case::empty(br#""""#, b"", b"")]
#[test_case(br#""\"""#, br#"""#, b""; "doublequote")] #[case::hello_world(br#""Hello World""#, b"Hello World", b"")]
#[test_case(br#"":""#, b":", b""; "colon")] #[case::doublequote(br#""\"""#, br#"""#, b"")]
#[test_case(br#""\""Rest"#, br#"""#, b"Rest"; "doublequote rest")] #[case::colon(br#"":""#, b":", b"")]
fn parse_bstr_field(input: &[u8], expected: &[u8], exp_rest: &[u8]) { #[case::doublequote_rest(br#""\""Rest"#, br#"""#, b"Rest")]
fn test_parse_bstr_field(
#[case] input: &[u8],
#[case] expected: &[u8],
#[case] exp_rest: &[u8],
) {
let (rest, parsed) = super::parse_bstr_field(input).expect("must parse"); let (rest, parsed) = super::parse_bstr_field(input).expect("must parse");
assert_eq!(exp_rest, rest, "expected remainder"); assert_eq!(exp_rest, rest, "expected remainder");
assert_eq!(expected, parsed); assert_eq!(expected, parsed);
} }
#[test_case(br#""""#, "", b""; "empty")] #[rstest]
#[test_case(br#""Hello World""#, "Hello World", b""; "hello world")] #[case::empty(br#""""#, "", b"")]
#[test_case(br#""\"""#, r#"""#, b""; "doublequote")] #[case::hello_world(br#""Hello World""#, "Hello World", b"")]
#[test_case(br#"":""#, ":", b""; "colon")] #[case::doublequote(br#""\"""#, r#"""#, b"")]
#[test_case(br#""\""Rest"#, r#"""#, b"Rest"; "doublequote rest")] #[case::colon(br#"":""#, ":", b"")]
fn parse_string_field(input: &[u8], expected: &str, exp_rest: &[u8]) { #[case::doublequote_rest(br#""\""Rest"#, r#"""#, b"Rest")]
fn parse_string_field(#[case] input: &[u8], #[case] expected: &str, #[case] exp_rest: &[u8]) {
let (rest, parsed) = super::parse_string_field(input).expect("must parse"); let (rest, parsed) = super::parse_string_field(input).expect("must parse");
assert_eq!(exp_rest, rest, "expected remainder"); assert_eq!(exp_rest, rest, "expected remainder");
assert_eq!(expected, &parsed); assert_eq!(expected, &parsed);
@ -107,10 +113,11 @@ mod tests {
super::parse_string_field(&input).expect_err("must fail"); super::parse_string_field(&input).expect_err("must fail");
} }
#[test_case(br#"["foo"]"#, vec!["foo".to_string()], b""; "single foo")] #[rstest]
#[test_case(b"[]", vec![], b""; "empty list")] #[case::single_foo(br#"["foo"]"#, vec!["foo".to_string()], b"")]
#[test_case(b"[]blub", vec![], b"blub"; "empty list with rest")] #[case::empty_list(b"[]", vec![], b"")]
fn parse_list(input: &[u8], expected: Vec<String>, exp_rest: &[u8]) { #[case::empty_list_with_rest(b"[]blub", vec![], b"blub")]
fn parse_list(#[case] input: &[u8], #[case] expected: Vec<String>, #[case] exp_rest: &[u8]) {
let (rest, parsed) = super::parse_str_list(input).expect("must parse"); let (rest, parsed) = super::parse_str_list(input).expect("must parse");
assert_eq!(exp_rest, rest, "expected remainder"); assert_eq!(exp_rest, rest, "expected remainder");
assert_eq!(expected, parsed); assert_eq!(expected, parsed);