Skip to content

Commit 6fa5eda

Browse files
committed
fix(schema): Rename DiscoverCase::run to selected
I feel this better clarifies things in light of `--list`, `--fail-fast`, etc
1 parent dafbfd5 commit 6fa5eda

9 files changed

Lines changed: 171 additions & 168 deletions

File tree

crates/libtest-json/event.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"mode": {
3434
"$ref": "#/$defs/RunMode"
3535
},
36-
"run": {
36+
"selected": {
3737
"description": "Whether selected to be run by the user",
3838
"type": "boolean"
3939
},

crates/libtest-json/src/event.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub enum Event {
2323
feature = "serde",
2424
serde(default = "true_default", skip_serializing_if = "is_true")
2525
)]
26-
run: bool,
26+
selected: bool,
2727
#[cfg_attr(
2828
feature = "serde",
2929
serde(default, skip_serializing_if = "Option::is_none")
@@ -103,7 +103,7 @@ impl Event {
103103
Self::DiscoverCase {
104104
name,
105105
mode,
106-
run,
106+
selected,
107107
elapsed_s,
108108
} => {
109109
buffer.key("event").unwrap();
@@ -122,11 +122,11 @@ impl Event {
122122
buffer.value(mode.as_str()).unwrap();
123123
}
124124

125-
if !run {
125+
if !selected {
126126
buffer.val_sep().unwrap();
127-
buffer.key("run").unwrap();
127+
buffer.key("selected").unwrap();
128128
buffer.keyval_sep().unwrap();
129-
buffer.value(run).unwrap();
129+
buffer.value(selected).unwrap();
130130
}
131131

132132
if let Some(elapsed_s) = elapsed_s {

crates/libtest-json/tests/roundtrip.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fn discover_case() {
3434
libtest_json::Event::DiscoverCase {
3535
name: "Hello\tworld!".to_owned(),
3636
mode: libtest_json::RunMode::Test,
37-
run: true,
37+
selected: true,
3838
elapsed_s: None,
3939
},
4040
str![[r#"{"event":"discover_case","name":"Hello\tworld!"}"#]],
@@ -44,11 +44,11 @@ fn discover_case() {
4444
libtest_json::Event::DiscoverCase {
4545
name: "Hello\tworld!".to_owned(),
4646
mode: libtest_json::RunMode::Bench,
47-
run: false,
47+
selected: false,
4848
elapsed_s: Some(libtest_json::Elapsed(Default::default())),
4949
},
5050
str![[
51-
r#"{"event":"discover_case","name":"Hello\tworld!","mode":"bench","run":false,"elapsed_s":"0"}"#
51+
r#"{"event":"discover_case","name":"Hello\tworld!","mode":"bench","selected":false,"elapsed_s":"0"}"#
5252
]],
5353
);
5454
}

crates/libtest2-harness/src/harness.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ fn discover(
230230
notifier.notify(notify::Event::DiscoverCase {
231231
name: case.name().to_owned(),
232232
mode: RunMode::Test,
233-
run: retain_case,
233+
selected: retain_case,
234234
elapsed_s: Some(notify::Elapsed(start.elapsed())),
235235
})?;
236236
}

crates/libtest2-harness/src/notify/pretty.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ impl<W: std::io::Write> super::Notifier for PrettyRunNotifier<W> {
3232
self.summary.notify(event.clone())?;
3333
match event {
3434
Event::DiscoverStart { .. } => {}
35-
Event::DiscoverCase { name, run, .. } => {
36-
if run {
35+
Event::DiscoverCase { name, selected, .. } => {
36+
if selected {
3737
self.name_width = name.len().max(self.name_width);
3838
}
3939
}

crates/libtest2-harness/src/notify/summary.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ impl super::Notifier for Summary {
8888
fn notify(&mut self, event: Event) -> std::io::Result<()> {
8989
match event {
9090
Event::DiscoverStart { .. } => {}
91-
Event::DiscoverCase { run, .. } => {
92-
if run {
91+
Event::DiscoverCase { selected, .. } => {
92+
if selected {
9393
self.num_run += 1;
9494
} else {
9595
self.num_filtered_out += 1;

crates/libtest2-harness/src/notify/terse.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@ impl<W: std::io::Write> super::Notifier for TerseListNotifier<W> {
2121
match event {
2222
Event::DiscoverStart { .. } => {}
2323
Event::DiscoverCase {
24-
name, mode, run, ..
24+
name,
25+
mode,
26+
selected,
27+
..
2528
} => {
26-
if run {
29+
if selected {
2730
let mode = mode.as_str();
2831
writeln!(self.writer, "{name}: {mode}")?;
2932
self.tests += 1;

0 commit comments

Comments
 (0)