liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: Move assert_eq to utils

This commit is contained in:
Nathan Adams 2023-01-27 18:05:08 +01:00 committed by kmeisthax
parent a741f373b4
commit 4418431bfe
2 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/tests/regression_tests.rs
View File

@ -169,7 +169,7 @@ fn shared_object_avm1() -> Result<(), Error> {
// Verify that the flash cookie matches the expected one
let expected = std::fs::read("tests/swfs/avm1/shared_object/RuffleTest.sol")?;
assert_eq!(
std::assert_eq!(
expected,
memory_storage_backend
.get("localhost//RuffleTest")
@ -222,7 +222,7 @@ fn shared_object_avm2() -> Result<(), Error> {
// Verify that the flash cookie matches the expected one
let expected = std::fs::read("tests/swfs/avm2/shared_object/RuffleTest.sol")?;
assert_eq!(
std::assert_eq!(
expected,
memory_storage_backend
.get("localhost//RuffleTest")
@ -249,34 +249,6 @@ fn shared_object_avm2() -> Result<(), Error> {
Ok(())
}
/// Wrapper around string slice that makes debug output `{:?}` to print string same way as `{}`.
/// Used in different `assert*!` macros in combination with `pretty_assertions` crate to make
/// test failures to show nice diffs.
/// Courtesy of https://github.com/colin-kiegel/rust-pretty-assertions/issues/24
#[derive(PartialEq, Eq)]
#[doc(hidden)]
pub struct PrettyString<'a>(pub &'a str);
/// Make diff to display string as multi-line string
impl<'a> std::fmt::Debug for PrettyString<'a> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
f.write_str(self.0)
}
}
macro_rules! assert_eq {
($left:expr, $right:expr) => {
pretty_assertions::assert_eq!(PrettyString($left.as_ref()), PrettyString($right.as_ref()));
};
($left:expr, $right:expr, $message:expr) => {
pretty_assertions::assert_eq!(
PrettyString($left.as_ref()),
PrettyString($right.as_ref()),
$message
);
};
}
/// Loads an SWF and runs it through the Ruffle core for a number of frames.
/// Tests that the trace output matches the given expected output.
#[allow(clippy::too_many_arguments)]

32
tests/tests/util/mod.rs
View File

@ -3,3 +3,35 @@
pub mod options;
pub mod test;
/// Wrapper around string slice that makes debug output `{:?}` to print string same way as `{}`.
/// Used in different `assert*!` macros in combination with `pretty_assertions` crate to make
/// test failures to show nice diffs.
/// Courtesy of https://github.com/colin-kiegel/rust-pretty-assertions/issues/24
#[derive(PartialEq, Eq)]
#[doc(hidden)]
pub struct PrettyString<'a>(pub &'a str);
/// Make diff to display string as multi-line string
impl<'a> std::fmt::Debug for PrettyString<'a> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
f.write_str(self.0)
}
}
#[macro_export]
macro_rules! assert_eq_pretty {
($left:expr, $right:expr) => {
pretty_assertions::assert_eq!(
$crate::util::PrettyString($left.as_ref()),
$crate::util::PrettyString($right.as_ref())
);
};
($left:expr, $right:expr, $message:expr) => {
pretty_assertions::assert_eq!(
$crate::util::PrettyString($left.as_ref()),
$crate::util::PrettyString($right.as_ref()),
$message
);
};
}