Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #19868 - CYBAI:specific-assertion, r=emilio

Browse source 
Use specific assertions

Similar to #19865
r? jdm

Note: Should I squash all the commits into one commit?

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because it should not break anything

<!-- 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/19868)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-01-25 18:06:33 -06:00 • committed by GitHub
commit c9ba16f9fb
40 changed files with 90 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/unit/style/logical_geometry.rs
View file

@ -29,9 +29,9 @@ fn test_size_round_trip() {
let physical = Size2D::new(1u32, 2u32);
for &mode in modes().iter() {
let logical = LogicalSize::from_physical(mode, physical);
assert!(logical.to_physical(mode) == physical);
assert!(logical.width(mode) == 1);
assert!(logical.height(mode) == 2);
assert_eq!(logical.to_physical(mode), physical);
assert_eq!(logical.width(mode), 1);
assert_eq!(logical.height(mode), 2);
}
}
@ -41,9 +41,9 @@ fn test_point_round_trip() {
let container = Size2D::new(100, 200);
for &mode in modes().iter() {
let logical = LogicalPoint::from_physical(mode, physical, container);
assert!(logical.to_physical(mode, container) == physical);
assert!(logical.x(mode, container) == 1);
assert!(logical.y(mode, container) == 2);
assert_eq!(logical.to_physical(mode, container), physical);
assert_eq!(logical.x(mode, container), 1);
assert_eq!(logical.y(mode, container), 2);
}
}
@ -52,11 +52,11 @@ fn test_margin_round_trip() {
let physical = SideOffsets2D::new(1u32, 2u32, 3u32, 4u32);
for &mode in modes().iter() {
let logical = LogicalMargin::from_physical(mode, physical);
assert!(logical.to_physical(mode) == physical);
assert!(logical.top(mode) == 1);
assert!(logical.right(mode) == 2);
assert!(logical.bottom(mode) == 3);
assert!(logical.left(mode) == 4);
assert_eq!(logical.to_physical(mode), physical);
assert_eq!(logical.top(mode), 1);
assert_eq!(logical.right(mode), 2);
assert_eq!(logical.bottom(mode), 3);
assert_eq!(logical.left(mode), 4);
}
}
@ -66,6 +66,6 @@ fn test_rect_round_trip() {
let container = Size2D::new(100, 200);
for &mode in modes().iter() {
let logical = LogicalRect::from_physical(mode, physical, container);
assert!(logical.to_physical(mode, container) == physical);
assert_eq!(logical.to_physical(mode, container), physical);
}
}

8
tests/unit/style/viewport.rs
View file

@ -75,12 +75,12 @@ fn test_meta_viewport<F>(meta: &str, callback: F)
macro_rules! assert_decl_len {
($declarations:ident == 1) => {
assert!($declarations.len() == 1,
assert_eq!($declarations.len(), 1,
"expected 1 declaration; have {}: {:?})",
$declarations.len(), $declarations)
};
($declarations:ident == $len:expr) => {
assert!($declarations.len() == $len,
assert_eq!($declarations.len(), $len,
"expected {} declarations; have {}: {:?})",
$len, $declarations.len(), $declarations)
}
@ -109,12 +109,12 @@ macro_rules! assert_decl_eq {
($d:expr, $origin:ident, $expected:ident: $value:expr) => {{
assert_eq!($d.origin, Origin::$origin);
assert_eq!($d.descriptor, ViewportDescriptor::$expected($value));
assert!($d.important == false, "descriptor should not be !important");
assert_eq!($d.important, false, "descriptor should not be !important");
}};
($d:expr, $origin:ident, $expected:ident: $value:expr, !important) => {{
assert_eq!($d.origin, Origin::$origin);
assert_eq!($d.descriptor, ViewportDescriptor::$expected($value));
assert!($d.important == true, "descriptor should be !important");
assert_eq!($d.important, true, "descriptor should be !important");
}};
}