Auto merge of #13407 - fflorent:master, r=Ms2ger

#13262 Add a unit test verifying that SpecificFragmentInfo size

Add a unit test for `SpecificFragmentInfo`.

I made a similar test as for Fragment in size_of.rs, not sure whether that's the right way or what is asked. Don't hesitate to tell me your expectations :).

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [x] These changes fix #13262(github issue number if applicable).

<!-- Either: -->
- [X] There are tests for these changes OR

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/13407)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-09-26 19:02:26 -05:00 committed by GitHub
commit 412f4bbb6f
2 changed files with 26 additions and 14 deletions

View file

@ -98,3 +98,4 @@ pub mod wrapper;
// For unit tests: // For unit tests:
pub use fragment::Fragment; pub use fragment::Fragment;
pub use fragment::SpecificFragmentInfo;

View file

@ -3,24 +3,35 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use layout::Fragment; use layout::Fragment;
use layout::SpecificFragmentInfo;
use std::mem::size_of; use std::mem::size_of;
fn check_size_for(name: &'static str, expected: usize, actual: usize) {
if actual < expected {
panic!("Your changes have decreased the stack size of {} \
from {} to {}. Good work! Please update the size in tests/unit/layout/size_of.rs",
name, expected, actual);
}
if actual > expected {
panic!("Your changes have increased the stack size of {} \
from {} to {}. Please consider choosing a design which avoids this increase. \
If you feel that the increase is necessary, update the size in \
tests/unit/layout/size_of.rs.",
name, expected, actual);
}
}
#[test] #[test]
fn test_size_of_fragment() { fn test_size_of_fragment() {
let expected = 160; let expected = 160;
let actual = size_of::<Fragment>(); let actual = size_of::<Fragment>();
check_size_for("layout::fragment::Fragment", expected, actual);
if actual < expected {
panic!("Your changes have decreased the stack size of layout::fragment::Fragment \
from {} to {}. Good work! Please update the size in tests/unit/layout/size_of.rs",
expected, actual);
} }
if actual > expected { #[test]
panic!("Your changes have increased the stack size of layout::fragment::Fragment \ fn test_size_of_specific_fragment_info() {
from {} to {}. Please consider choosing a design which avoids this increase. \ let expected = 24;
If you feel that the increase is necessary, update the size in \ let actual = size_of::<SpecificFragmentInfo>();
tests/unit/layout/size_of.rs.", check_size_for("layout::fragment::SpecificFragmentInfo", expected, actual);
expected, actual);
}
} }