mirror of
https://github.com/servo/servo.git
synced 2025-08-04 05:00:08 +01:00
Auto merge of #13814 - Manishearth:move-macro, r=emilio
Fix style unit tests, move parse_longhand macro to parse tests module We weren't running the style unit tests. The parse_longhand macro is useful for all tests. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13814) <!-- Reviewable:end -->
This commit is contained in:
commit
a2e42fa13b
4 changed files with 13 additions and 10 deletions
|
@ -237,7 +237,9 @@ class MachCommands(CommandBase):
|
||||||
|
|
||||||
if features:
|
if features:
|
||||||
args += ["--features", "%s" % ' '.join(features)]
|
args += ["--features", "%s" % ' '.join(features)]
|
||||||
return call(args, env=env, cwd=self.servo_crate())
|
err = call(args, env=env, cwd=self.servo_crate())
|
||||||
|
if err is not 0:
|
||||||
|
return err
|
||||||
|
|
||||||
# Run style tests with the testing feature
|
# Run style tests with the testing feature
|
||||||
if has_style:
|
if has_style:
|
||||||
|
|
|
@ -11,14 +11,6 @@ use style::properties::shorthands::mask;
|
||||||
use style::stylesheets::Origin;
|
use style::stylesheets::Origin;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
macro_rules! parse_longhand {
|
|
||||||
($name:ident, $s:expr) => {{
|
|
||||||
let url = Url::parse("http://localhost").unwrap();
|
|
||||||
let context = ParserContext::new(Origin::Author, &url, Box::new(CSSErrorReporterTest));
|
|
||||||
$name::parse(&context, &mut Parser::new($s)).unwrap()
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn mask_shorthand_should_parse_all_available_properties_when_specified() {
|
fn mask_shorthand_should_parse_all_available_properties_when_specified() {
|
||||||
let url = Url::parse("http://localhost").unwrap();
|
let url = Url::parse("http://localhost").unwrap();
|
||||||
|
|
|
@ -32,6 +32,14 @@ macro_rules! assert_roundtrip {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
macro_rules! parse_longhand {
|
||||||
|
($name:ident, $s:expr) => {{
|
||||||
|
let url = Url::parse("http://localhost").unwrap();
|
||||||
|
let context = ParserContext::new(Origin::Author, &url, Box::new(CSSErrorReporterTest));
|
||||||
|
$name::parse(&context, &mut Parser::new($s)).unwrap()
|
||||||
|
}};
|
||||||
|
}
|
||||||
|
|
||||||
mod basic_shape;
|
mod basic_shape;
|
||||||
mod mask;
|
mod mask;
|
||||||
mod position;
|
mod position;
|
||||||
|
|
|
@ -421,7 +421,8 @@ mod shorthand_serialization {
|
||||||
|
|
||||||
let position = DeclaredValue::Value(ListStylePosition::inside);
|
let position = DeclaredValue::Value(ListStylePosition::inside);
|
||||||
let image = DeclaredValue::Value(ListStyleImage::Url(
|
let image = DeclaredValue::Value(ListStyleImage::Url(
|
||||||
Url::parse("http://servo/test.png").unwrap()
|
Url::parse("http://servo/test.png").unwrap(),
|
||||||
|
UrlExtraData {},
|
||||||
));
|
));
|
||||||
let style_type = DeclaredValue::Value(ListStyleType::disc);
|
let style_type = DeclaredValue::Value(ListStyleType::disc);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue