Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core: fix linked list tests reusing Registrations #1016

Merged
merged 5 commits into from
Oct 5, 2020
Merged

core: fix linked list tests reusing Registrations #1016

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1db78f1
core: fix linked list tests reusing Registrations
hawkw Oct 5, 2020
128c9e5
core: simplify test callsites
hawkw Oct 5, 2020
8cb25a4
add test for pushing a bunch of stuff
hawkw Oct 5, 2020
35f5a49
fixup new test
hawkw Oct 5, 2020
e90c19c
clippy, etc
hawkw Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 67 additions & 16 deletions tracing-core/src/callsite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,23 +276,11 @@ impl LinkedList {
mod tests {
use super::*;

#[derive(Eq, PartialEq)]
struct Cs1;
static CS1: Cs1 = Cs1;
static REG1: Registration = Registration::new(&CS1);
struct TestCallsite;
static CS1: TestCallsite = TestCallsite;
static CS2: TestCallsite = TestCallsite;

impl Callsite for Cs1 {
fn set_interest(&self, _interest: Interest) {}
fn metadata(&self) -> &Metadata<'_> {
unimplemented!("not needed for this test")
}
}

struct Cs2;
static CS2: Cs2 = Cs2;
static REG2: Registration = Registration::new(&CS2);

impl Callsite for Cs2 {
impl Callsite for TestCallsite {
fn set_interest(&self, _interest: Interest) {}
fn metadata(&self) -> &Metadata<'_> {
unimplemented!("not needed for this test")
Expand All @@ -301,6 +289,9 @@ mod tests {

#[test]
fn linked_list_push() {
static REG1: Registration = Registration::new(&CS1);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LOL I knoew this was dumb good catch

static REG2: Registration = Registration::new(&CS2);

let linked_list = LinkedList::new();

linked_list.push(&REG1);
Expand All @@ -325,9 +316,69 @@ mod tests {
});
}

#[test]
fn linked_list_push_several() {
static REG1: Registration = Registration::new(&CS1);
static REG2: Registration = Registration::new(&CS2);
static REG3: Registration = Registration::new(&CS1);
static REG4: Registration = Registration::new(&CS2);

let linked_list = LinkedList::new();

fn expect<'a>(
callsites: &'a mut impl Iterator<Item = &'static Registration>,
) -> impl FnMut(&'static Registration) + 'a {
move |reg: &'static Registration| {
let ptr = callsites
.next()
.expect("list contained more than the expected number of registrations!");

assert!(
ptr::eq(reg, ptr),
"Registration pointers need to match ({:?} != {:?})",
reg,
ptr
);
}
}

linked_list.push(&REG1);
linked_list.push(&REG2);
let regs = [&REG2, &REG1];
let mut callsites = regs.iter().copied();
linked_list.for_each(expect(&mut callsites));
assert!(
callsites.next().is_none(),
"some registrations were expected but not present: {:?}",
callsites
);

linked_list.push(&REG3);
let regs = [&REG3, &REG2, &REG1];
let mut callsites = regs.iter().copied();
linked_list.for_each(expect(&mut callsites));
assert!(
callsites.next().is_none(),
"some registrations were expected but not present: {:?}",
callsites
);

linked_list.push(&REG4);
let regs = [&REG4, &REG3, &REG2, &REG1];
let mut callsites = regs.iter().copied();
linked_list.for_each(expect(&mut callsites));
assert!(
callsites.next().is_none(),
"some registrations were expected but not present: {:?}",
callsites
);
}

#[test]
#[should_panic]
fn linked_list_repeated() {
static REG1: Registration = Registration::new(&CS1);

let linked_list = LinkedList::new();

linked_list.push(&REG1);
Expand Down