diff --git a/tests/unit/style/parsing/image.rs b/tests/unit/style/parsing/image.rs index 33ccb88cb0c0..1082f8e0b907 100644 --- a/tests/unit/style/parsing/image.rs +++ b/tests/unit/style/parsing/image.rs @@ -29,126 +29,3 @@ fn test_linear_gradient() { // Parsing without and assert_roundtrip_with_context!(Image::parse, "linear-gradient(red, green)"); } - -#[test] -fn test_radial_gradient() { - // Parsing with all values - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(circle closest-side at 20px 30px, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(ellipse closest-side at 20px 30px, red, green)", - "radial-gradient(closest-side at 20px 30px, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(closest-side circle at 20px 30px, red, green)", - "radial-gradient(circle closest-side at 20px 30px, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(closest-side ellipse at 20px 30px, red, green)", - "radial-gradient(closest-side at 20px 30px, red, green)" - ); - - // Parsing with and reversed - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(closest-side circle at 20px 30px, red, green)", - "radial-gradient(circle closest-side at 20px 30px, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(closest-corner ellipse at 20px 30px, red, green)", - "radial-gradient(closest-corner at 20px 30px, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(30px circle, red, green)", - "radial-gradient(30px at center center, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(30px 40px ellipse, red, green)", - "radial-gradient(30px 40px at center center, red, green)" - ); - - // Parsing without - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(circle, red, green)", - "radial-gradient(circle at center center, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(ellipse, red, green)", - "radial-gradient(at center center, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(circle at 20px 30px, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(ellipse at 20px 30px, red, green)", - "radial-gradient(at 20px 30px, red, green)" - ); - - // Parsing without - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(20px at 20px 30px, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(20px 30px at left center, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(closest-side at center, red, green)", - "radial-gradient(closest-side at center center, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(20px, red, green)", - "radial-gradient(20px at center center, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(20px 30px, red, green)", - "radial-gradient(20px 30px at center center, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(closest-side, red, green)", - "radial-gradient(closest-side at center center, red, green)" - ); - - // Parsing without and - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(at center, red, green)", - "radial-gradient(at center center, red, green)" - ); - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(at center bottom, red, green)" - ); - assert_roundtrip_with_context!(Image::parse, "radial-gradient(at 40px 50px, red, green)"); - - // Parsing with just color stops - assert_roundtrip_with_context!( - Image::parse, - "radial-gradient(red, green)", - "radial-gradient(at center center, red, green)" - ); - - // Parsing repeating radial gradient - assert_roundtrip_with_context!( - Image::parse, - "repeating-radial-gradient(red, green)", - "repeating-radial-gradient(at center center, red, green)" - ); -} diff --git a/tests/unit/style/rule_tree/bench.rs b/tests/unit/style/rule_tree/bench.rs index a11174c6c351..9da1eb698e34 100644 --- a/tests/unit/style/rule_tree/bench.rs +++ b/tests/unit/style/rule_tree/bench.rs @@ -12,7 +12,7 @@ use style::media_queries::MediaList; use style::properties::{longhands, Importance, PropertyDeclaration, PropertyDeclarationBlock}; use style::rule_tree::{CascadeLevel, RuleTree, StrongRuleNode, StyleSource}; use style::shared_lock::{SharedRwLock, StylesheetGuards}; -use style::stylesheets::{CssRule, Origin, Stylesheet}; +use style::stylesheets::{AllowImportRules, CssRule, Origin, Stylesheet}; use style::thread_state::{self, ThreadState}; use test::{self, Bencher}; @@ -67,6 +67,7 @@ fn parse_rules(lock: &SharedRwLock, css: &str) -> Vec<(StyleSource, CascadeLevel Some(&ErrorringErrorReporter), QuirksMode::NoQuirks, 0, + AllowImportRules::Yes, ); let guard = s.shared_lock.read(); let rules = s.contents.rules.read_with(&guard); diff --git a/tests/unit/style/stylesheets.rs b/tests/unit/style/stylesheets.rs index d346a42b4cdd..c70aaa08f5c9 100644 --- a/tests/unit/style/stylesheets.rs +++ b/tests/unit/style/stylesheets.rs @@ -11,8 +11,7 @@ use style::context::QuirksMode; use style::error_reporting::{ContextualParseError, ParseErrorReporter}; use style::media_queries::MediaList; use style::shared_lock::SharedRwLock; -use style::stylesheets::Origin; -use style::stylesheets::Stylesheet; +use style::stylesheets::{AllowImportRules, Origin, Stylesheet}; #[derive(Debug)] struct CSSError { @@ -106,6 +105,7 @@ fn test_report_error_stylesheet() { Some(&error_reporter), QuirksMode::NoQuirks, 5, + AllowImportRules::Yes, ); error_reporter.assert_messages_contain(&[ @@ -116,7 +116,7 @@ fn test_report_error_stylesheet() { ), ( 9, - 27, + 43, "Unsupported property declaration: 'background-image:", ), // FIXME: column should be around 56 (10, 17, "Unsupported property declaration: 'invalid: true;'"), @@ -169,6 +169,7 @@ fn test_no_report_unrecognized_vendor_properties() { Some(&error_reporter), QuirksMode::NoQuirks, 0, + AllowImportRules::Yes, ); error_reporter.assert_messages_contain(&[( @@ -202,6 +203,7 @@ fn test_source_map_url() { None, QuirksMode::NoQuirks, 0, + AllowImportRules::Yes, ); let url_opt = stylesheet.contents.source_map_url.read(); assert_eq!(*url_opt, test.1); @@ -229,6 +231,7 @@ fn test_source_url() { None, QuirksMode::NoQuirks, 0, + AllowImportRules::Yes, ); let url_opt = stylesheet.contents.source_url.read(); assert_eq!(*url_opt, test.1); diff --git a/tests/unit/style/viewport.rs b/tests/unit/style/viewport.rs index eeedc653fc87..445ec4bf8fd3 100644 --- a/tests/unit/style/viewport.rs +++ b/tests/unit/style/viewport.rs @@ -12,7 +12,7 @@ use style::media_queries::{Device, MediaList, MediaType}; use style::parser::ParserContext; use style::shared_lock::{SharedRwLock, StylesheetGuards}; use style::stylesheets::viewport_rule::*; -use style::stylesheets::{CssRuleType, Origin, Stylesheet, StylesheetInDocument}; +use style::stylesheets::{AllowImportRules, CssRuleType, Origin, Stylesheet, StylesheetInDocument}; use style::values::generics::length::LengthPercentageOrAuto::{self, Auto}; use style::values::generics::NonNegative; use style::values::specified::LengthPercentage; @@ -36,6 +36,7 @@ macro_rules! stylesheet { None, QuirksMode::NoQuirks, 0, + AllowImportRules::Yes, )) }; }