Skip to content

update event assertion in unit tests #501

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

Merged
wangjj9219 merged 2 commits into from
May 21, 2021
Merged

update event assertion in unit tests #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7eba6c8
update event assertion in unit tests
wangjj9219 May 21, 2021
1b39abe
use assert_last_event to assert
wangjj9219 May 21, 2021
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
3 changes: 1 addition & 2 deletions auction/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ fn bid_should_work() {
})
);
assert_ok!(AuctionModule::bid(Origin::signed(ALICE), 0, 20));
let bid_event = Event::auction(crate::Event::Bid(0, ALICE, 20));
assert!(System::events().iter().any(|record| record.event == bid_event));
System::assert_last_event(Event::auction(crate::Event::Bid(0, ALICE, 20)));
assert_eq!(
AuctionModule::auction_info(0),
Some(AuctionInfo {
Expand Down
126 changes: 66 additions & 60 deletions authority/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,22 +74,22 @@ fn schedule_dispatch_at_work() {
true,
Box::new(call.clone())
));
let event = mock::Event::authority(Event::Scheduled(
System::assert_last_event(mock::Event::authority(Event::Scheduled(
OriginCaller::authority(DelayedOrigin {
delay: 1,
origin: Box::new(OriginCaller::system(RawOrigin::Root)),
}),
1,
));
assert!(System::events().iter().any(|record| record.event == event));
)));

run_to_block(2);
let event = mock::Event::pallet_scheduler(pallet_scheduler::Event::<Runtime>::Dispatched(
(2, 0),
Some([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()),
Ok(()),
System::assert_last_event(mock::Event::pallet_scheduler(
pallet_scheduler::Event::<Runtime>::Dispatched(
(2, 0),
Some([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()),
Ok(()),
),
));
assert!(System::events().iter().any(|record| record.event == event));

// with_delayed_origin = false
assert_ok!(Authority::schedule_dispatch(
Expand All @@ -99,16 +99,15 @@ fn schedule_dispatch_at_work() {
false,
Box::new(call.clone())
));
let event = mock::Event::authority(Event::Scheduled(OriginCaller::system(RawOrigin::Root), 2));
assert!(System::events().iter().any(|record| record.event == event));
System::assert_last_event(mock::Event::authority(Event::Scheduled(
OriginCaller::system(RawOrigin::Root),
2,
)));

run_to_block(3);
let event = mock::Event::pallet_scheduler(pallet_scheduler::Event::<Runtime>::Dispatched(
(3, 0),
Some([0, 0, 2, 0, 0, 0].to_vec()),
Ok(()),
System::assert_last_event(mock::Event::pallet_scheduler(
pallet_scheduler::Event::<Runtime>::Dispatched((3, 0), Some([0, 0, 2, 0, 0, 0].to_vec()), Ok(())),
));
assert!(System::events().iter().any(|record| record.event == event));
});
}

Expand All @@ -133,22 +132,22 @@ fn schedule_dispatch_after_work() {
true,
Box::new(call.clone())
));
let event = mock::Event::authority(Event::Scheduled(
System::assert_last_event(mock::Event::authority(Event::Scheduled(
OriginCaller::authority(DelayedOrigin {
delay: 0,
origin: Box::new(OriginCaller::system(RawOrigin::Root)),
}),
1,
));
assert!(System::events().iter().any(|record| record.event == event));
)));

run_to_block(2);
let event = mock::Event::pallet_scheduler(pallet_scheduler::Event::<Runtime>::Dispatched(
(2, 0),
Some([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()),
Ok(()),
System::assert_last_event(mock::Event::pallet_scheduler(
pallet_scheduler::Event::<Runtime>::Dispatched(
(2, 0),
Some([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()),
Ok(()),
),
));
assert!(System::events().iter().any(|record| record.event == event));

// with_delayed_origin = false
assert_ok!(Authority::schedule_dispatch(
Expand All @@ -158,16 +157,15 @@ fn schedule_dispatch_after_work() {
false,
Box::new(call.clone())
));
let event = mock::Event::authority(Event::Scheduled(OriginCaller::system(RawOrigin::Root), 2));
assert!(System::events().iter().any(|record| record.event == event));
System::assert_last_event(mock::Event::authority(Event::Scheduled(
OriginCaller::system(RawOrigin::Root),
2,
)));

run_to_block(3);
let event = mock::Event::pallet_scheduler(pallet_scheduler::Event::<Runtime>::Dispatched(
(3, 0),
Some([0, 0, 2, 0, 0, 0].to_vec()),
Ok(()),
System::assert_last_event(mock::Event::pallet_scheduler(
pallet_scheduler::Event::<Runtime>::Dispatched((3, 0), Some([0, 0, 2, 0, 0, 0].to_vec()), Ok(())),
));
assert!(System::events().iter().any(|record| record.event == event));
});
}

Expand All @@ -188,14 +186,13 @@ fn fast_track_scheduled_dispatch_work() {
true,
Box::new(call.clone())
));
let event = mock::Event::authority(Event::Scheduled(
System::assert_last_event(mock::Event::authority(Event::Scheduled(
OriginCaller::authority(DelayedOrigin {
delay: 1,
origin: Box::new(OriginCaller::system(RawOrigin::Root)),
}),
0,
));
assert!(System::events().iter().any(|record| record.event == event));
)));

let schedule_origin = {
let origin: <Runtime as Config>::Origin = From::from(Origin::root());
Expand All @@ -214,15 +211,14 @@ fn fast_track_scheduled_dispatch_work() {
0,
DispatchTime::At(4),
));
let event = mock::Event::authority(Event::FastTracked(
System::assert_last_event(mock::Event::authority(Event::FastTracked(
OriginCaller::authority(DelayedOrigin {
delay: 1,
origin: Box::new(OriginCaller::system(RawOrigin::Root)),
}),
0,
4,
));
assert!(System::events().iter().any(|record| record.event == event));
)));

assert_ok!(Authority::schedule_dispatch(
Origin::root(),
Expand All @@ -231,17 +227,22 @@ fn fast_track_scheduled_dispatch_work() {
false,
Box::new(call.clone())
));
let event = mock::Event::authority(Event::Scheduled(OriginCaller::system(RawOrigin::Root), 1));
assert!(System::events().iter().any(|record| record.event == event));
System::assert_last_event(mock::Event::authority(Event::Scheduled(
OriginCaller::system(RawOrigin::Root),
1,
)));

assert_ok!(Authority::fast_track_scheduled_dispatch(
Origin::root(),
frame_system::RawOrigin::Root.into(),
1,
DispatchTime::At(4),
));
let event = mock::Event::authority(Event::FastTracked(OriginCaller::system(RawOrigin::Root), 1, 4));
assert!(System::events().iter().any(|record| record.event == event));
System::assert_last_event(mock::Event::authority(Event::FastTracked(
OriginCaller::system(RawOrigin::Root),
1,
4,
)));
});
}

Expand All @@ -262,14 +263,13 @@ fn delay_scheduled_dispatch_work() {
true,
Box::new(call.clone())
));
let event = mock::Event::authority(Event::Scheduled(
System::assert_last_event(mock::Event::authority(Event::Scheduled(
OriginCaller::authority(DelayedOrigin {
delay: 1,
origin: Box::new(OriginCaller::system(RawOrigin::Root)),
}),
0,
));
assert!(System::events().iter().any(|record| record.event == event));
)));

let schedule_origin = {
let origin: <Runtime as Config>::Origin = From::from(Origin::root());
Expand All @@ -288,15 +288,14 @@ fn delay_scheduled_dispatch_work() {
0,
4,
));
let event = mock::Event::authority(Event::Delayed(
System::assert_last_event(mock::Event::authority(Event::Delayed(
OriginCaller::authority(DelayedOrigin {
delay: 1,
origin: Box::new(OriginCaller::system(RawOrigin::Root)),
}),
0,
5,
));
assert!(System::events().iter().any(|record| record.event == event));
)));

assert_ok!(Authority::schedule_dispatch(
Origin::root(),
Expand All @@ -305,17 +304,22 @@ fn delay_scheduled_dispatch_work() {
false,
Box::new(call.clone())
));
let event = mock::Event::authority(Event::Scheduled(OriginCaller::system(RawOrigin::Root), 1));
assert!(System::events().iter().any(|record| record.event == event));
System::assert_last_event(mock::Event::authority(Event::Scheduled(
OriginCaller::system(RawOrigin::Root),
1,
)));

assert_ok!(Authority::delay_scheduled_dispatch(
Origin::root(),
frame_system::RawOrigin::Root.into(),
1,
4,
));
let event = mock::Event::authority(Event::Delayed(OriginCaller::system(RawOrigin::Root), 1, 5));
assert!(System::events().iter().any(|record| record.event == event));
System::assert_last_event(mock::Event::authority(Event::Delayed(
OriginCaller::system(RawOrigin::Root),
1,
5,
)));
});
}

Expand All @@ -335,14 +339,13 @@ fn cancel_scheduled_dispatch_work() {
true,
Box::new(call.clone())
));
let event = mock::Event::authority(Event::Scheduled(
System::assert_last_event(mock::Event::authority(Event::Scheduled(
OriginCaller::authority(DelayedOrigin {
delay: 1,
origin: Box::new(OriginCaller::system(RawOrigin::Root)),
}),
0,
));
assert!(System::events().iter().any(|record| record.event == event));
)));

let schedule_origin = {
let origin: <Runtime as Config>::Origin = From::from(Origin::root());
Expand All @@ -356,14 +359,13 @@ fn cancel_scheduled_dispatch_work() {

let pallets_origin = schedule_origin.caller().clone();
assert_ok!(Authority::cancel_scheduled_dispatch(Origin::root(), pallets_origin, 0));
let event = mock::Event::authority(Event::Cancelled(
System::assert_last_event(mock::Event::authority(Event::Cancelled(
OriginCaller::authority(DelayedOrigin {
delay: 1,
origin: Box::new(OriginCaller::system(RawOrigin::Root)),
}),
0,
));
assert!(System::events().iter().any(|record| record.event == event));
)));

assert_ok!(Authority::schedule_dispatch(
Origin::root(),
Expand All @@ -372,15 +374,19 @@ fn cancel_scheduled_dispatch_work() {
false,
Box::new(call.clone())
));
let event = mock::Event::authority(Event::Scheduled(OriginCaller::system(RawOrigin::Root), 1));
assert!(System::events().iter().any(|record| record.event == event));
System::assert_last_event(mock::Event::authority(Event::Scheduled(
OriginCaller::system(RawOrigin::Root),
1,
)));

assert_ok!(Authority::cancel_scheduled_dispatch(
Origin::root(),
frame_system::RawOrigin::Root.into(),
1
));
let event = mock::Event::authority(Event::Cancelled(OriginCaller::system(RawOrigin::Root), 1));
assert!(System::events().iter().any(|record| record.event == event));
System::assert_last_event(mock::Event::authority(Event::Cancelled(
OriginCaller::system(RawOrigin::Root),
1,
)));
});
}
16 changes: 4 additions & 12 deletions currencies/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,33 +254,25 @@ fn call_event_should_work() {
assert_ok!(Currencies::transfer(Some(ALICE).into(), BOB, X_TOKEN_ID, 50));
assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 50);
assert_eq!(Currencies::free_balance(X_TOKEN_ID, &BOB), 150);

let transferred_event = Event::currencies(crate::Event::Transferred(X_TOKEN_ID, ALICE, BOB, 50));
assert!(System::events().iter().any(|record| record.event == transferred_event));
System::assert_last_event(Event::currencies(crate::Event::Transferred(X_TOKEN_ID, ALICE, BOB, 50)));

assert_ok!(<Currencies as MultiCurrency<AccountId>>::transfer(
X_TOKEN_ID, &ALICE, &BOB, 10
));
assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 40);
assert_eq!(Currencies::free_balance(X_TOKEN_ID, &BOB), 160);

let transferred_event = Event::currencies(crate::Event::Transferred(X_TOKEN_ID, ALICE, BOB, 10));
assert!(System::events().iter().any(|record| record.event == transferred_event));
System::assert_last_event(Event::currencies(crate::Event::Transferred(X_TOKEN_ID, ALICE, BOB, 10)));

assert_ok!(<Currencies as MultiCurrency<AccountId>>::deposit(
X_TOKEN_ID, &ALICE, 100
));
assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 140);

let transferred_event = Event::currencies(crate::Event::Deposited(X_TOKEN_ID, ALICE, 100));
assert!(System::events().iter().any(|record| record.event == transferred_event));
System::assert_last_event(Event::currencies(crate::Event::Deposited(X_TOKEN_ID, ALICE, 100)));

assert_ok!(<Currencies as MultiCurrency<AccountId>>::withdraw(
X_TOKEN_ID, &ALICE, 20
));
assert_eq!(Currencies::free_balance(X_TOKEN_ID, &ALICE), 120);

let transferred_event = Event::currencies(crate::Event::Withdrawn(X_TOKEN_ID, ALICE, 20));
assert!(System::events().iter().any(|record| record.event == transferred_event));
System::assert_last_event(Event::currencies(crate::Event::Withdrawn(X_TOKEN_ID, ALICE, 20)));
});
}
Loading