Skip to content

Commit c356e5b

Browse files
epageepage
committed
fix(schema)!: Rename Suite to Run
1 parent 477aed1 commit c356e5b

9 files changed

Lines changed: 194 additions & 194 deletions

File tree

‎crates/libtest-json/event.schema.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
},
9595
"event": {
9696
"type": "string",
97-
"const": "suite_start"
97+
"const": "run_start"
9898
}
9999
},
100100
"required": [
@@ -188,7 +188,7 @@
188188
},
189189
"event": {
190190
"type": "string",
191-
"const": "suite_complete"
191+
"const": "run_complete"
192192
}
193193
},
194194
"required": [

‎crates/libtest-json/src/event.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub enum Event {
3737
)]
3838
elapsed_s: Option<Elapsed>,
3939
},
40-
SuiteStart {
40+
RunStart {
4141
#[cfg_attr(
4242
feature = "serde",
4343
serde(default, skip_serializing_if = "Option::is_none")
@@ -76,7 +76,7 @@ pub enum Event {
7676
)]
7777
elapsed_s: Option<Elapsed>,
7878
},
79-
SuiteComplete {
79+
RunComplete {
8080
#[cfg_attr(
8181
feature = "serde",
8282
serde(default, skip_serializing_if = "Option::is_none")
@@ -153,10 +153,10 @@ impl Event {
153153
buffer.value(String::from(*elapsed_s)).unwrap();
154154
}
155155
}
156-
Self::SuiteStart { elapsed_s } => {
156+
Self::RunStart { elapsed_s } => {
157157
buffer.key("event").unwrap();
158158
buffer.keyval_sep().unwrap();
159-
buffer.value("suite_start").unwrap();
159+
buffer.value("run_start").unwrap();
160160

161161
if let Some(elapsed_s) = elapsed_s {
162162
buffer.val_sep().unwrap();
@@ -226,10 +226,10 @@ impl Event {
226226
buffer.value(String::from(*elapsed_s)).unwrap();
227227
}
228228
}
229-
Self::SuiteComplete { elapsed_s } => {
229+
Self::RunComplete { elapsed_s } => {
230230
buffer.key("event").unwrap();
231231
buffer.keyval_sep().unwrap();
232-
buffer.value("suite_complete").unwrap();
232+
buffer.value("run_complete").unwrap();
233233

234234
if let Some(elapsed_s) = elapsed_s {
235235
buffer.val_sep().unwrap();

‎crates/libtest-json/tests/roundtrip.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ fn discover_complete() {
7171
#[test]
7272
fn suite_start() {
7373
t(
74-
libtest_json::Event::SuiteStart { elapsed_s: None },
75-
str![[r#"{"event":"suite_start"}"#]],
74+
libtest_json::Event::RunStart { elapsed_s: None },
75+
str![[r#"{"event":"run_start"}"#]],
7676
);
7777
t(
78-
libtest_json::Event::SuiteStart {
78+
libtest_json::Event::RunStart {
7979
elapsed_s: Some(libtest_json::Elapsed(Default::default())),
8080
},
81-
str![[r#"{"event":"suite_start","elapsed_s":"0"}"#]],
81+
str![[r#"{"event":"run_start","elapsed_s":"0"}"#]],
8282
);
8383
}
8484

@@ -130,14 +130,14 @@ fn case_complete() {
130130
#[test]
131131
fn suite_complete() {
132132
t(
133-
libtest_json::Event::SuiteComplete { elapsed_s: None },
134-
str![[r#"{"event":"suite_complete"}"#]],
133+
libtest_json::Event::RunComplete { elapsed_s: None },
134+
str![[r#"{"event":"run_complete"}"#]],
135135
);
136136

137137
t(
138-
libtest_json::Event::SuiteComplete {
138+
libtest_json::Event::RunComplete {
139139
elapsed_s: Some(libtest_json::Elapsed(Default::default())),
140140
},
141-
str![[r#"{"event":"suite_complete","elapsed_s":"0"}"#]],
141+
str![[r#"{"event":"run_complete","elapsed_s":"0"}"#]],
142142
);
143143
}

‎crates/libtest2-harness/src/harness.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ fn run(
250250
cases: Vec<Box<dyn Case>>,
251251
notifier: &mut dyn notify::Notifier,
252252
) -> std::io::Result<bool> {
253-
notifier.notify(notify::Event::SuiteStart {
253+
notifier.notify(notify::Event::RunStart {
254254
elapsed_s: Some(notify::Elapsed(start.elapsed())),
255255
})?;
256256

@@ -398,7 +398,7 @@ fn run(
398398
}
399399
}
400400

401-
notifier.notify(notify::Event::SuiteComplete {
401+
notifier.notify(notify::Event::RunComplete {
402402
elapsed_s: Some(notify::Elapsed(start.elapsed())),
403403
})?;
404404

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl<W: std::io::Write> super::Notifier for PrettyRunNotifier<W> {
3838
}
3939
}
4040
Event::DiscoverComplete { .. } => {}
41-
Event::SuiteStart { .. } => {
41+
Event::RunStart { .. } => {
4242
self.summary.write_start(&mut self.writer)?;
4343
}
4444
Event::CaseStart { name, .. } => {
@@ -59,7 +59,7 @@ impl<W: std::io::Write> super::Notifier for PrettyRunNotifier<W> {
5959
}
6060
writeln!(self.writer, "{style}{s}{style:#}")?;
6161
}
62-
Event::SuiteComplete { .. } => {
62+
Event::RunComplete { .. } => {
6363
self.summary.write_complete(&mut self.writer)?;
6464
}
6565
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ impl super::Notifier for Summary {
9696
}
9797
}
9898
Event::DiscoverComplete { .. } => {}
99-
Event::SuiteStart { .. } => {}
99+
Event::RunStart { .. } => {}
100100
Event::CaseStart { .. } => {}
101101
Event::CaseComplete {
102102
name,
@@ -115,7 +115,7 @@ impl super::Notifier for Summary {
115115
self.num_passed += 1;
116116
}
117117
},
118-
Event::SuiteComplete { elapsed_s, .. } => {
118+
Event::RunComplete { elapsed_s, .. } => {
119119
self.elapsed_s = elapsed_s;
120120
}
121121
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ impl<W: std::io::Write> super::Notifier for TerseListNotifier<W> {
3434
writeln!(self.writer, "{} tests", self.tests)?;
3535
writeln!(self.writer)?;
3636
}
37-
Event::SuiteStart { .. } => {}
37+
Event::RunStart { .. } => {}
3838
Event::CaseStart { .. } => {}
3939
Event::CaseComplete { .. } => {}
40-
Event::SuiteComplete { .. } => {}
40+
Event::RunComplete { .. } => {}
4141
}
4242
Ok(())
4343
}
@@ -65,7 +65,7 @@ impl<W: std::io::Write> super::Notifier for TerseRunNotifier<W> {
6565
Event::DiscoverStart { .. } => {}
6666
Event::DiscoverCase { .. } => {}
6767
Event::DiscoverComplete { .. } => {}
68-
Event::SuiteStart { .. } => {
68+
Event::RunStart { .. } => {
6969
self.summary.write_start(&mut self.writer)?;
7070
}
7171
Event::CaseStart { .. } => {}
@@ -78,7 +78,7 @@ impl<W: std::io::Write> super::Notifier for TerseRunNotifier<W> {
7878
write!(self.writer, "{style}{c}{style:#}")?;
7979
self.writer.flush()?;
8080
}
81-
Event::SuiteComplete { .. } => {
81+
Event::RunComplete { .. } => {
8282
self.summary.write_complete(&mut self.writer)?;
8383
}
8484
}

0 commit comments

Comments
 (0)