Description: avoid not-in-Debian crate yare Author: Jonas Smedegaard Forwarded: not-needed Last-Update: 2025-01-23 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/library/Cargo.toml +++ b/library/Cargo.toml @@ -30,7 +30,6 @@ url.workspace = true [dev-dependencies] -yare = { version = "3" } similar-asserts = { version = "1", features = ["serde", "unicode"] } [lints] --- a/library/src/parse/element/test.rs +++ b/library/src/parse/element/test.rs @@ -47,56 +47,6 @@ .find_map(|child| grab_element_from_child(child, tag_name)) } -#[yare::parameterized( - one_thing = { r#" - - -

The Title

This is the expected contents of the 'content' property.

This will be included as well.

- - - - "#, 1 }, - only_one_valid = { r#" -

- Bricklayer's Arms - 3 Charlotte Road, - City of London, - EC2A 3PE, - UK -

-"#, 1} -)] -fn only_top_level_item_elements(html: &str, count: usize) { - let property_item_doc = from_html_str(html); - - let matched_elements = - MatchedElements::for_document(&property_item_doc).expect("parsed the doc"); - - assert_eq!( - matched_elements.top_level_elements().len(), - count, - "computes correct count of roots" - ); -} - #[test] fn expand_items_only_children() -> Result<(), crate::Error> { let base_url: url::Url = "https://example.com".parse()?; @@ -271,60 +221,6 @@ property_count: usize, } -#[yare::parameterized( - bare = { - r#" - - -

- A wild place. -

- - -"#, - Expectation { top_level_elements: 1, property_count: 1 } }, - with_props = { - r#" - - -

Great.

This is the expected contents of the 'content' property.

This will be included as well.

- - -"#, - Expectation { top_level_elements: 1, property_count: 2 } }, - // FIXME: This is happening due to some nesting logic error possibly in `translate_location`. - h_entry_implied_name_negative = { - r#" -

I really like Microformats

This should not imply a p-name since it has a nested microformat.

-"#, - Expectation { top_level_elements: 1, property_count: 1 } }, - -)] -fn element_locations(html: &str, expecting: Expectation) -> Result<(), crate::Error> { - let doc = from_html_str(html); - let elements = MatchedElements::for_document(&doc).expect("parsed the doc"); - - let item_elems = elements.top_level_elements(); - assert_eq!(item_elems.len(), expecting.top_level_elements); - - let item = elements - .expand_item_from_element(Arc::clone(&item_elems[0]), &"http://example.com".parse()?)?; - - assert_eq!(item.properties.len(), expecting.property_count); - Ok(()) -} - #[test] fn element_locations_for_document_with_properties() -> Result<(), crate::Error> { let base_url: url::Url = "https://example.com".parse()?; --- a/library/src/parse/property/explicit/test.rs +++ b/library/src/parse/property/explicit/test.rs @@ -33,37 +33,6 @@ Ok(()) } -#[yare::parameterized( - direct = { - r#""#, - "time", temporal::Value::Timestamp(temporal::Stamp::parse("2014-01-01")?) - }, - abbr_title = { - r#"June 29"#, - "abbr", temporal::Value::Timestamp(temporal::Stamp::parse("2013-06-29")?) - } -)] -fn temporal_value(html: &str, tag: &str, value: temporal::Value) -> Result<(), crate::Error> { - let elem = grab_element_from_document(&from_html_str(html), tag).unwrap(); - - let parser = explicit::PropertyParser::new( - Arc::new(ElementRef { - index: 0, - node: Node { elem }, - }), - DeclKind::Temporal("timing".to_string()), - "http://example.com".parse()?, - ); - - assert_eq!( - parser.expand()?, - Some(("timing".to_string(), PropertyValue::Temporal(value))), - "expanded a direct temporal property" - ); - - Ok(()) -} - #[test] fn html() -> Result<(), crate::Error> { let elem = grab_element_from_document( @@ -95,37 +64,6 @@ ); Ok(()) -} - -#[yare::parameterized( - bare = { "span", r#"The name."# }, - nested = { "div", r#"

- The name. -

"# }, - tag_abbr = { "abbr", r#"Wow."# }, - tag_link = { "link", r#""# }, -)] -fn plain(tag_name: &str, html: &str) -> Result<(), crate::Error> { - let elem = grab_element_from_document(&from_html_str(html), tag_name).unwrap(); - - let parser = PropertyParser::new( - Arc::new(ElementRef { - index: 0, - node: Node { elem }, - }), - DeclKind::Plain("name".to_string()), - "http://example.com".parse()?, - ); - - assert_eq!( - parser.expand()?, - Some(( - "name".to_string(), - PropertyValue::Plain("The name.".to_string()) - )) - ); - - Ok(()) } #[test] --- a/library/src/parse/property/implied/test.rs +++ b/library/src/parse/property/implied/test.rs @@ -4,118 +4,6 @@ ElementRef, }; -#[yare::parameterized( - simple = { - r#" wow

"#, "img", - Some(PropertyValue::Image(Image { - value: "http://example.com/photo.jpg".parse()?, - alt: Some("wow".to_string()), - })) - }, - hcard_impliedphoto_only_of_child = { - r#" -

- "#, "div", - Some(PropertyValue::Image(Image { - value: "http://example.com/jane.jpeg".parse()?, - alt: Some("Jane Doe".to_string()), - })) - }, - hcard_multiple_photos = { - r#" -

John Doe

- "#, "div", None - }, - hcard_pproperty = { - r#" -

- "#, "div", None - } - -)] -fn photo(html: &str, tag: &str, value: Option) -> Result<(), crate::Error> { - let base_url: url::Url = "http://example.com".parse()?; - let elem = grab_element_from_document(&from_html_str(html), tag).unwrap(); - - let parser = ImpliedPhotoExtractor(Arc::new(ElementRef { - index: 0, - node: Node { elem }, - })); - - assert!( - ImpliedPhotoExtractor::can_extract(&Default::default()), - "can expect to get an implied photo" - ); - - assert_eq!(parser.extract(&base_url), value, "implied a photo"); - Ok(()) -} - -#[yare::parameterized( - should_imply = { true, Properties::default() }, - p_prop = { false, Properties::from_iter(vec![ - ("name".to_string(), vec![PropertyValue::Plain("existing".to_string())]) - ])}, - e_prop = { false, Properties::from_iter(vec![ - ("name".to_string(), vec![ - PropertyValue::Fragment(Fragment { - html: "Implied name.".to_string(), - value: "Implied name.".to_string(), - ..Default::default() - }) - ]) - ])}, - nested_prop = { false, Properties::from_iter(vec![ - ("like-of".to_string(), vec![ - PropertyValue::Item(Item { - r#type: vec![microformats_types::KnownClass::Cite.into()], - ..Default::default() - }) - ]) - ])}, -)] -fn can_imply_name(assertion: bool, props: Properties) { - assert_eq!(ImpliedNameExtractor::can_extract(&props), assertion); -} - -#[yare::parameterized( - img_alt = {"img", r#" The implied name.

"#}, - abbr_title = {"abbr", r#"Not this."#}, - direct_img_alt = {"span", r#" The implied name.

"#}, - direct_area_alt = {"span", r#""#}, - direct_abbr_title = {"span", r#"Not this."#}, - nested_direct_img_alt = {"div", r#" The implied name.

"#}, - nested_direct_area_alt = {"div", r#""#}, - nested_direct_abbr_title = {"div", r#"Not this."#}, - weird_embed = {"p", r#" - -

The implied name.

- "#} -)] -fn name(tag: &str, html: &str) { - let base_url = "http://example.com".parse().unwrap(); - let full_html = match tag { - "span" => format!(r#"{html}"#), - "div" => format!(r#"

{html}

"#), - _ => html.to_string(), - }; - let direct_parser = ImpliedNameExtractor(Arc::new(ElementRef { - index: 0, - node: Node { - elem: grab_element_from_document(&from_html_str(&full_html), tag).unwrap(), - }, - })); - - assert_eq!( - direct_parser.extract(&base_url), - Some(PropertyValue::Plain("The implied name.".to_string())), - "implied a name directly" - ); -} - #[test] fn url() -> Result<(), crate::Error> { let dom = from_html_str(r#"

"#); --- a/library/src/parse/test/mod.rs +++ b/library/src/parse/test/mod.rs @@ -3,88 +3,3 @@ use crate::parse::Parser; use microformats_types::Document; mod suite; - -#[yare::parameterized( - sample = { r#" - - - - - - -

- A pretty simple feed. -

- An initial entry. -

- A title. - - -

- Another title. -

- -

- - - - "#, - serde_json::from_value(serde_json::json!({ - "items": [ - { - "id": "feed", - "type": ["h-feed"], - "properties": {}, - "children": [ - { - "id": "entry1", - "type": ["h-entry"], - "properties": { - "name": ["An initial entry."], - }, - }, - { - "id": "entry2", - "type": ["h-entry"], - "properties": { - "name": ["A title."], - "uid": ["https://example.com/jump-uid"], - "url": ["https://example.com/jump-url"], - }, - }, - { - "id": "entry3", - "type": ["h-entry"], - "properties": { - "name": ["Another title."] - }, - } - ] - }, - { - "type": ["h-review"], - "id": "selfReview", - "properties": {}, - } - ], - "rels": {}, - "rel-urls": {} - })).unwrap() - } -)] -fn parse_into_document(html: &str, document: Document) -> Result<(), crate::Error> { - let parser = Parser::from_html(html.to_string())?; - - let result = parser.into_document(Some("http://example.com".parse()?)); - - similar_asserts::assert_serde_eq!( - actual: result.map_err(|e| e.to_string()), - expected: Ok(document), - "forms expected document" - ); - - Ok(()) -} --- a/library/src/parse/value_class/test.rs +++ b/library/src/parse/value_class/test.rs @@ -27,91 +27,3 @@ Some("2000-100 10:00Z".to_owned()) ); } - -#[yare::parameterized( - value_img = {"img", "

"}, - value_area = {"area", ""}, - value_data = {"data", ""}, - value_title_span = {"span", "Don't take this."}, - value_title = {"div", r#" -

- The Bricklayer's Arms -

- -

- - - - -

- "#} -)] -fn text_extraction(tag: &str, html: &str) { - let element = grab_element_from_document(&from_html_str(html), tag).unwrap(); - let vcp_extractor = ValueClassPropertyExtractor { - element: ElementPtr::new(ElementRef { - index: 0, - node: Node { elem: element }, - }), - hint: TypeHint::Plain, - }; - - assert_eq!( - vcp_extractor.extract_value_class(&"http://example.com".parse().unwrap()), - Ok(Some(PropertyValue::Plain( - "A cool place to be.".to_string() - ))), - "extracts the text" - ); -} - -#[yare::parameterized( - ins = { "ins", "", None}, - del = { "del", "", None}, - time = { "time", "", None}, - time_class = { "time", "", None}, - values = { "li", r#" -

- 26 July, from - 07pm -

- "#, Stamp::from_str("2009-06-26 07pm").ok().map(temporal::Value::Timestamp) }, - value_title_date = { "p", r#" -

- - March 14th 2013 -

- "#, Stamp::from_str("2013-03-14").ok().map(temporal::Value::Timestamp) }, - concat = { "span", r#" - - 26 July, from - 19:00-06:00 - - "#, Stamp::from_str("2009-06-26 19:00-0600").ok().map(temporal::Value::Timestamp)} - -)] -fn datetime( - tag: &str, - html: &str, - expecting_dt: Option, -) -> Result<(), crate::Error> { - let stamp = expecting_dt.unwrap_or_else(|| temporal::Value::Timestamp(Stamp::now())); - let dt = stamp.to_string(); - let element = - grab_element_from_document(&from_html_str(&html.replace("$dt", &dt)), tag).unwrap(); - let vcp_extractor = ValueClassPropertyExtractor { - element: ElementPtr::new(ElementRef { - index: 0, - node: Node { elem: element }, - }), - hint: TypeHint::Temporal, - }; - - assert_eq!( - vcp_extractor.extract_value_class(&"http://example.com".parse().unwrap()), - Ok(Some(PropertyValue::Temporal(stamp))), - "extracts the timestamp" - ); - - Ok(()) -}