mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

revset: extract identifier/at_op parsing tests to separate functions

Browse source 
I'm going to add some unicode characters there, and the current test function
is pretty big.
This commit is contained in:
Yuya Nishihara 2024-11-25 15:32:11 +09:00
parent f9906dc403
commit 0fbf2913ac
1 changed files with 96 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

181
lib/src/revset_parser.rs
View file

@ -934,91 +934,6 @@ mod tests {
#[test]
fn test_parse_revset() {
// Parse "@" (the current working copy)
assert_eq!(parse_into_kind("@"), Ok(ExpressionKind::AtCurrentWorkspace));
assert_eq!(
parse_into_kind("main@"),
Ok(ExpressionKind::AtWorkspace("main".to_owned()))
);
assert_eq!(
parse_into_kind("main@origin"),
Ok(ExpressionKind::RemoteSymbol {
name: "main".to_owned(),
remote: "origin".to_owned()
})
);
// Quoted component in @ expression
assert_eq!(
parse_into_kind(r#""foo bar"@"#),
Ok(ExpressionKind::AtWorkspace("foo bar".to_owned()))
);
assert_eq!(
parse_into_kind(r#""foo bar"@origin"#),
Ok(ExpressionKind::RemoteSymbol {
name: "foo bar".to_owned(),
remote: "origin".to_owned()
})
);
assert_eq!(
parse_into_kind(r#"main@"foo bar""#),
Ok(ExpressionKind::RemoteSymbol {
name: "main".to_owned(),
remote: "foo bar".to_owned()
})
);
assert_eq!(
parse_into_kind(r#"'foo bar'@'bar baz'"#),
Ok(ExpressionKind::RemoteSymbol {
name: "foo bar".to_owned(),
remote: "bar baz".to_owned()
})
);
// Quoted "@" is not interpreted as a working copy or remote symbol
assert_eq!(
parse_into_kind(r#""@""#),
Ok(ExpressionKind::String("@".to_owned()))
);
assert_eq!(
parse_into_kind(r#""main@""#),
Ok(ExpressionKind::String("main@".to_owned()))
);
assert_eq!(
parse_into_kind(r#""main@origin""#),
Ok(ExpressionKind::String("main@origin".to_owned()))
);
// Internal '.', '-', and '+' are allowed
assert_eq!(
parse_into_kind("foo.bar-v1+7"),
Ok(ExpressionKind::Identifier("foo.bar-v1+7"))
);
assert_eq!(
parse_normalized("foo.bar-v1+7-"),
parse_normalized("(foo.bar-v1+7)-")
);
// '.' is not allowed at the beginning or end
assert_eq!(
parse_into_kind(".foo"),
Err(RevsetParseErrorKind::SyntaxError)
);
assert_eq!(
parse_into_kind("foo."),
Err(RevsetParseErrorKind::SyntaxError)
);
// Multiple '.', '-', '+' are not allowed
assert_eq!(
parse_into_kind("foo.+bar"),
Err(RevsetParseErrorKind::SyntaxError)
);
assert_eq!(
parse_into_kind("foo--bar"),
Err(RevsetParseErrorKind::SyntaxError)
);
assert_eq!(
parse_into_kind("foo+-bar"),
Err(RevsetParseErrorKind::SyntaxError)
);
// Parse a parenthesized symbol
assert_eq!(parse_normalized("(foo)"), parse_normalized("foo"));
// Parse a quoted symbol
assert_eq!(
parse_into_kind("\"foo\""),
@ -1225,6 +1140,44 @@ mod tests {
);
}
#[test]
fn test_parse_identifier() {
// Internal '.', '-', and '+' are allowed
assert_eq!(
parse_into_kind("foo.bar-v1+7"),
Ok(ExpressionKind::Identifier("foo.bar-v1+7"))
);
assert_eq!(
parse_normalized("foo.bar-v1+7-"),
parse_normalized("(foo.bar-v1+7)-")
);
// '.' is not allowed at the beginning or end
assert_eq!(
parse_into_kind(".foo"),
Err(RevsetParseErrorKind::SyntaxError)
);
assert_eq!(
parse_into_kind("foo."),
Err(RevsetParseErrorKind::SyntaxError)
);
// Multiple '.', '-', '+' are not allowed
assert_eq!(
parse_into_kind("foo.+bar"),
Err(RevsetParseErrorKind::SyntaxError)
);
assert_eq!(
parse_into_kind("foo--bar"),
Err(RevsetParseErrorKind::SyntaxError)
);
assert_eq!(
parse_into_kind("foo+-bar"),
Err(RevsetParseErrorKind::SyntaxError)
);
// Parse a parenthesized symbol
assert_eq!(parse_normalized("(foo)"), parse_normalized("foo"));
}
#[test]
fn test_parse_string_literal() {
// "\<char>" escapes
@ -1310,6 +1263,64 @@ mod tests {
);
}
#[test]
fn parse_at_workspace_and_remote_symbol() {
// Parse "@" (the current working copy)
assert_eq!(parse_into_kind("@"), Ok(ExpressionKind::AtCurrentWorkspace));
assert_eq!(
parse_into_kind("main@"),
Ok(ExpressionKind::AtWorkspace("main".to_owned()))
);
assert_eq!(
parse_into_kind("main@origin"),
Ok(ExpressionKind::RemoteSymbol {
name: "main".to_owned(),
remote: "origin".to_owned()
})
);
// Quoted component in @ expression
assert_eq!(
parse_into_kind(r#""foo bar"@"#),
Ok(ExpressionKind::AtWorkspace("foo bar".to_owned()))
);
assert_eq!(
parse_into_kind(r#""foo bar"@origin"#),
Ok(ExpressionKind::RemoteSymbol {
name: "foo bar".to_owned(),
remote: "origin".to_owned()
})
);
assert_eq!(
parse_into_kind(r#"main@"foo bar""#),
Ok(ExpressionKind::RemoteSymbol {
name: "main".to_owned(),
remote: "foo bar".to_owned()
})
);
assert_eq!(
parse_into_kind(r#"'foo bar'@'bar baz'"#),
Ok(ExpressionKind::RemoteSymbol {
name: "foo bar".to_owned(),
remote: "bar baz".to_owned()
})
);
// Quoted "@" is not interpreted as a working copy or remote symbol
assert_eq!(
parse_into_kind(r#""@""#),
Ok(ExpressionKind::String("@".to_owned()))
);
assert_eq!(
parse_into_kind(r#""main@""#),
Ok(ExpressionKind::String("main@".to_owned()))
);
assert_eq!(
parse_into_kind(r#""main@origin""#),
Ok(ExpressionKind::String("main@origin".to_owned()))
);
}
#[test]
fn test_parse_revset_alias_symbol_decl() {
let mut aliases_map = RevsetAliasesMap::new();