aboutsummaryrefslogtreecommitdiff
path: root/tests/env_filter/main.rs
diff options
context:
space:
mode:
Diffstat (limited to 'tests/env_filter/main.rs')
-rw-r--r--tests/env_filter/main.rs159
1 files changed, 80 insertions, 79 deletions
diff --git a/tests/env_filter/main.rs b/tests/env_filter/main.rs
index ef984a6..1692181 100644
--- a/tests/env_filter/main.rs
+++ b/tests/env_filter/main.rs
@@ -3,20 +3,21 @@
mod per_layer;
use tracing::{self, subscriber::with_default, Level};
-use tracing_mock::{event, field, layer, span, subscriber};
+use tracing_mock::{expect, layer, span, subscriber};
use tracing_subscriber::{
filter::{EnvFilter, LevelFilter},
prelude::*,
+ Registry,
};
#[test]
fn level_filter_event() {
let filter: EnvFilter = "info".parse().expect("filter should parse");
let (subscriber, finished) = subscriber::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 = subscriber.with(filter);
@@ -38,18 +39,18 @@ fn same_name_spans() {
.expect("filter should parse");
let (subscriber, finished) = subscriber::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 = subscriber.with(filter);
with_default(subscriber, || {
@@ -64,12 +65,12 @@ fn same_name_spans() {
fn level_filter_event_with_target() {
let filter: EnvFilter = "info,stuff=debug".parse().expect("filter should parse");
let (subscriber, finished) = subscriber::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 = subscriber.with(filter);
@@ -95,20 +96,20 @@ fn level_filter_event_with_target_and_span_global() {
let cool_span = span::named("cool_span");
let uncool_span = span::named("uncool_span");
- let (subscriber, handle) = subscriber::mock()
+ 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)
.enter(uncool_span.clone())
.exit(uncool_span)
- .done()
+ .only()
.run_with_handle();
- let subscriber = subscriber.with(filter);
+ let subscriber = Registry::default().with(filter).with(layer);
with_default(subscriber, || {
{
@@ -133,12 +134,12 @@ fn not_order_dependent() {
let filter: EnvFilter = "stuff=debug,info".parse().expect("filter should parse");
let (subscriber, finished) = subscriber::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 = subscriber.with(filter);
@@ -167,9 +168,9 @@ fn add_directive_enables_event() {
filter = filter.add_directive("hello=trace".parse().expect("directive should parse"));
let (subscriber, finished) = subscriber::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 = subscriber.with(filter);
@@ -187,19 +188,19 @@ fn span_name_filter_is_dynamic() {
.parse()
.expect("filter should parse");
let (subscriber, finished) = subscriber::mock()
- .event(event::mock().at_level(Level::INFO))
- .enter(span::named("cool_span"))
- .event(event::mock().at_level(Level::DEBUG))
- .enter(span::named("uncool_span"))
- .event(event::mock().at_level(Level::WARN))
- .event(event::mock().at_level(Level::DEBUG))
- .exit(span::named("uncool_span"))
- .exit(span::named("cool_span"))
- .enter(span::named("uncool_span"))
- .event(event::mock().at_level(Level::WARN))
- .event(event::mock().at_level(Level::ERROR))
- .exit(span::named("uncool_span"))
- .done()
+ .event(expect::event().at_level(Level::INFO))
+ .enter(expect::span().named("cool_span"))
+ .event(expect::event().at_level(Level::DEBUG))
+ .enter(expect::span().named("uncool_span"))
+ .event(expect::event().at_level(Level::WARN))
+ .event(expect::event().at_level(Level::DEBUG))
+ .exit(expect::span().named("uncool_span"))
+ .exit(expect::span().named("cool_span"))
+ .enter(expect::span().named("uncool_span"))
+ .event(expect::event().at_level(Level::WARN))
+ .event(expect::event().at_level(Level::ERROR))
+ .exit(expect::span().named("uncool_span"))
+ .only()
.run_with_handle();
let subscriber = subscriber.with(filter);
@@ -245,10 +246,10 @@ mod per_layer_filter {
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()
@@ -271,18 +272,18 @@ mod per_layer_filter {
.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()
@@ -299,12 +300,12 @@ mod per_layer_filter {
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()
@@ -333,12 +334,12 @@ mod per_layer_filter {
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()
@@ -366,12 +367,12 @@ mod per_layer_filter {
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()
@@ -401,9 +402,9 @@ mod per_layer_filter {
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()
@@ -424,21 +425,21 @@ mod per_layer_filter {
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()]),
)
@@ -446,17 +447,17 @@ mod per_layer_filter {
.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()
@@ -497,12 +498,12 @@ mod per_layer_filter {
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)
};
@@ -513,12 +514,12 @@ mod per_layer_filter {
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)
};