diff options
Diffstat (limited to 'tests/env_filter/per_layer.rs')
| -rw-r--r-- | tests/env_filter/per_layer.rs | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/tests/env_filter/per_layer.rs b/tests/env_filter/per_layer.rs index 4b143b8..229b9ff 100644 --- a/tests/env_filter/per_layer.rs +++ b/tests/env_filter/per_layer.rs @@ -2,16 +2,16 @@ //! `Layer` filter). #![cfg(feature = "registry")] use super::*; -use tracing_mock::{event, field, layer, span}; +use tracing_mock::{layer, span}; #[test] fn level_filter_event() { let filter: EnvFilter = "info".parse().expect("filter should parse"); let (layer, handle) = layer::mock() - .event(event::mock().at_level(Level::INFO)) - .event(event::mock().at_level(Level::WARN)) - .event(event::mock().at_level(Level::ERROR)) - .done() + .event(expect::event().at_level(Level::INFO)) + .event(expect::event().at_level(Level::WARN)) + .event(expect::event().at_level(Level::ERROR)) + .only() .run_with_handle(); let _subscriber = tracing_subscriber::registry() @@ -34,18 +34,18 @@ fn same_name_spans() { .expect("filter should parse"); let (layer, handle) = layer::mock() .new_span( - span::mock() + expect::span() .named("foo") .at_level(Level::TRACE) - .with_field(field::mock("bar")), + .with_field(expect::field("bar")), ) .new_span( - span::mock() + expect::span() .named("foo") .at_level(Level::TRACE) - .with_field(field::mock("baz")), + .with_field(expect::field("baz")), ) - .done() + .only() .run_with_handle(); let _subscriber = tracing_subscriber::registry() @@ -62,12 +62,12 @@ fn same_name_spans() { fn level_filter_event_with_target() { let filter: EnvFilter = "info,stuff=debug".parse().expect("filter should parse"); let (layer, handle) = layer::mock() - .event(event::mock().at_level(Level::INFO)) - .event(event::mock().at_level(Level::DEBUG).with_target("stuff")) - .event(event::mock().at_level(Level::WARN).with_target("stuff")) - .event(event::mock().at_level(Level::ERROR)) - .event(event::mock().at_level(Level::ERROR).with_target("stuff")) - .done() + .event(expect::event().at_level(Level::INFO)) + .event(expect::event().at_level(Level::DEBUG).with_target("stuff")) + .event(expect::event().at_level(Level::WARN).with_target("stuff")) + .event(expect::event().at_level(Level::ERROR)) + .event(expect::event().at_level(Level::ERROR).with_target("stuff")) + .only() .run_with_handle(); let _subscriber = tracing_subscriber::registry() @@ -96,12 +96,12 @@ fn level_filter_event_with_target_and_span() { let (layer, handle) = layer::mock() .enter(cool_span.clone()) .event( - event::mock() + expect::event() .at_level(Level::DEBUG) .in_scope(vec![cool_span.clone()]), ) .exit(cool_span) - .done() + .only() .run_with_handle(); let _subscriber = tracing_subscriber::registry() @@ -129,12 +129,12 @@ fn not_order_dependent() { let filter: EnvFilter = "stuff=debug,info".parse().expect("filter should parse"); let (layer, finished) = layer::mock() - .event(event::mock().at_level(Level::INFO)) - .event(event::mock().at_level(Level::DEBUG).with_target("stuff")) - .event(event::mock().at_level(Level::WARN).with_target("stuff")) - .event(event::mock().at_level(Level::ERROR)) - .event(event::mock().at_level(Level::ERROR).with_target("stuff")) - .done() + .event(expect::event().at_level(Level::INFO)) + .event(expect::event().at_level(Level::DEBUG).with_target("stuff")) + .event(expect::event().at_level(Level::WARN).with_target("stuff")) + .event(expect::event().at_level(Level::ERROR)) + .event(expect::event().at_level(Level::ERROR).with_target("stuff")) + .only() .run_with_handle(); let _subscriber = tracing_subscriber::registry() @@ -164,9 +164,9 @@ fn add_directive_enables_event() { filter = filter.add_directive("hello=trace".parse().expect("directive should parse")); let (layer, finished) = layer::mock() - .event(event::mock().at_level(Level::INFO).with_target("hello")) - .event(event::mock().at_level(Level::TRACE).with_target("hello")) - .done() + .event(expect::event().at_level(Level::INFO).with_target("hello")) + .event(expect::event().at_level(Level::TRACE).with_target("hello")) + .only() .run_with_handle(); let _subscriber = tracing_subscriber::registry() @@ -187,21 +187,21 @@ fn span_name_filter_is_dynamic() { let cool_span = span::named("cool_span"); let uncool_span = span::named("uncool_span"); let (layer, finished) = layer::mock() - .event(event::mock().at_level(Level::INFO)) + .event(expect::event().at_level(Level::INFO)) .enter(cool_span.clone()) .event( - event::mock() + expect::event() .at_level(Level::DEBUG) .in_scope(vec![cool_span.clone()]), ) .enter(uncool_span.clone()) .event( - event::mock() + expect::event() .at_level(Level::WARN) .in_scope(vec![uncool_span.clone()]), ) .event( - event::mock() + expect::event() .at_level(Level::DEBUG) .in_scope(vec![uncool_span.clone()]), ) @@ -209,17 +209,17 @@ fn span_name_filter_is_dynamic() { .exit(cool_span) .enter(uncool_span.clone()) .event( - event::mock() + expect::event() .at_level(Level::WARN) .in_scope(vec![uncool_span.clone()]), ) .event( - event::mock() + expect::event() .at_level(Level::ERROR) .in_scope(vec![uncool_span.clone()]), ) .exit(uncool_span) - .done() + .only() .run_with_handle(); let _subscriber = tracing_subscriber::registry() @@ -260,12 +260,12 @@ fn multiple_dynamic_filters() { let (layer, handle) = layer::named("layer1") .enter(span.clone()) .event( - event::mock() + expect::event() .at_level(Level::DEBUG) .in_scope(vec![span.clone()]), ) .exit(span) - .done() + .only() .run_with_handle(); (layer.with_filter(filter), handle) }; @@ -276,12 +276,12 @@ fn multiple_dynamic_filters() { let (layer, handle) = layer::named("layer2") .enter(span.clone()) .event( - event::mock() + expect::event() .at_level(Level::INFO) .in_scope(vec![span.clone()]), ) .exit(span) - .done() + .only() .run_with_handle(); (layer.with_filter(filter), handle) }; |