rust
/
cargo
mirror of https://github.com/rust-lang/cargo
0
0
Fork 0
Code Issues Releases Wiki Activity

Auto merge of #13761 - weihanglo:pkgidspec, r=epage 

test(schemas): Ensure tests cover the correct case

Also, I am preparing an experiment of unidiff patch, which will introduce one more error kind.
This commit is contained in:
bors 2024-04-16 01:32:39 +00:00
parent 9f8adffe2e eacdfd2917
commit f8c4af5ec2
1 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
crates/cargo-util-schemas/src/core/package_id_spec.rs
View File

@ -318,6 +318,7 @@ enum ErrorKind {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::ErrorKind;
use super::PackageIdSpec; use super::PackageIdSpec;
use crate::core::{GitReference, SourceKind}; use crate::core::{GitReference, SourceKind};
use url::Url; use url::Url;
@ -602,31 +603,53 @@ mod tests {
#[test] #[test]
fn bad_parsing() { fn bad_parsing() {
assert!(PackageIdSpec::parse("baz:").is_err()); macro_rules! err {
assert!(PackageIdSpec::parse("baz:*").is_err()); ($spec:expr, $expected:pat) => {
assert!(PackageIdSpec::parse("baz@").is_err()); let err = PackageIdSpec::parse($spec).unwrap_err();
assert!(PackageIdSpec::parse("baz@*").is_err()); let kind = err.0;
assert!(PackageIdSpec::parse("baz@^1.0").is_err()); assert!(
assert!(PackageIdSpec::parse("https://baz:1.0").is_err()); matches!(kind, $expected),
assert!(PackageIdSpec::parse("https://#baz:1.0").is_err()); "`{}` parse error mismatch, got {kind:?}",
assert!( $spec
PackageIdSpec::parse("foobar+https://github.com/rust-lang/crates.io-index").is_err() );
};
}
err!("baz:", ErrorKind::PartialVersion(_));
err!("baz:*", ErrorKind::PartialVersion(_));
err!("baz@", ErrorKind::PartialVersion(_));
err!("baz@*", ErrorKind::PartialVersion(_));
err!("baz@^1.0", ErrorKind::PartialVersion(_));
err!("https://baz:1.0", ErrorKind::PartialVersion(_));
err!("https://#baz:1.0", ErrorKind::PartialVersion(_));
err!(
"foobar+https://github.com/rust-lang/crates.io-index",
ErrorKind::UnsupportedProtocol(_)
);
err!(
"path+https://github.com/rust-lang/crates.io-index",
ErrorKind::UnsupportedPathPlusScheme(_)
); );
assert!(PackageIdSpec::parse("path+https://github.com/rust-lang/crates.io-index").is_err());
// Only `git+` can use `?` // Only `git+` can use `?`
assert!(PackageIdSpec::parse("file:///path/to/my/project/foo?branch=dev").is_err()); err!(
assert!(PackageIdSpec::parse("path+file:///path/to/my/project/foo?branch=dev").is_err()); "file:///path/to/my/project/foo?branch=dev",
assert!(PackageIdSpec::parse( ErrorKind::UnexpectedQueryString(_)
"registry+https://github.com/rust-lang/cargo#0.52.0?branch=dev" );
) err!(
.is_err()); "path+file:///path/to/my/project/foo?branch=dev",
assert!(PackageIdSpec::parse( ErrorKind::UnexpectedQueryString(_)
"sparse+https://github.com/rust-lang/cargo#0.52.0?branch=dev" );
) err!(
.is_err()); "registry+https://github.com/rust-lang/cargo?branch=dev#0.52.0",
assert!(PackageIdSpec::parse("@1.2.3").is_err()); ErrorKind::UnexpectedQueryString(_)
assert!(PackageIdSpec::parse("registry+https://github.com").is_err()); );
assert!(PackageIdSpec::parse("https://crates.io/1foo#1.2.3").is_err()) err!(
"sparse+https://github.com/rust-lang/cargo?branch=dev#0.52.0",
ErrorKind::UnexpectedQueryString(_)
);
err!("@1.2.3", ErrorKind::NameValidation(_));
err!("registry+https://github.com", ErrorKind::NameValidation(_));
err!("https://crates.io/1foo#1.2.3", ErrorKind::NameValidation(_));
} }
} }