Skip to content

Commit dafbfd5

Browse files
committed
fix(schema)!: Remove mode from CaseComplete
This is less a state of an individual Case and more of the operation as a whole and is a bit redundant.
1 parent c356e5b commit dafbfd5

4 files changed

Lines changed: 1 addition & 20 deletions

File tree

crates/libtest-json/event.schema.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,6 @@
133133
"name": {
134134
"type": "string"
135135
},
136-
"mode": {
137-
"$ref": "#/$defs/RunMode"
138-
},
139136
"status": {
140137
"description": "`None` means success",
141138
"anyOf": [

crates/libtest-json/src/event.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ pub enum Event {
5454
},
5555
CaseComplete {
5656
name: String,
57-
#[cfg_attr(
58-
feature = "serde",
59-
serde(default, skip_serializing_if = "RunMode::is_default")
60-
)]
61-
mode: RunMode,
6257
/// `None` means success
6358
#[cfg_attr(
6459
feature = "serde",
@@ -184,7 +179,6 @@ impl Event {
184179
}
185180
Self::CaseComplete {
186181
name,
187-
mode,
188182
status,
189183
message,
190184
elapsed_s,
@@ -198,13 +192,6 @@ impl Event {
198192
buffer.keyval_sep().unwrap();
199193
buffer.value(name).unwrap();
200194

201-
if !mode.is_default() {
202-
buffer.val_sep().unwrap();
203-
buffer.key("mode").unwrap();
204-
buffer.keyval_sep().unwrap();
205-
buffer.value(mode.as_str()).unwrap();
206-
}
207-
208195
if let Some(status) = status {
209196
buffer.val_sep().unwrap();
210197
buffer.key("status").unwrap();

crates/libtest-json/tests/roundtrip.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ fn case_complete() {
105105
t(
106106
libtest_json::Event::CaseComplete {
107107
name: "Hello\tworld!".to_owned(),
108-
mode: libtest_json::RunMode::Test,
109108
status: None,
110109
message: None,
111110
elapsed_s: None,
@@ -116,13 +115,12 @@ fn case_complete() {
116115
t(
117116
libtest_json::Event::CaseComplete {
118117
name: "Hello\tworld!".to_owned(),
119-
mode: libtest_json::RunMode::Bench,
120118
status: Some(libtest_json::RunStatus::Ignored),
121119
message: Some("This\tfailed".to_owned()),
122120
elapsed_s: Some(libtest_json::Elapsed(Default::default())),
123121
},
124122
str![[
125-
r#"{"event":"case_complete","name":"Hello\tworld!","mode":"bench","status":"ignored","message":"This\tfailed","elapsed_s":"0"}"#
123+
r#"{"event":"case_complete","name":"Hello\tworld!","status":"ignored","message":"This\tfailed","elapsed_s":"0"}"#
126124
]],
127125
);
128126
}

crates/libtest2-harness/src/harness.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,6 @@ fn run_case(
440440
let message = err.and_then(|e| e.cause().map(|c| c.to_string()));
441441
notifier.notify(notify::Event::CaseComplete {
442442
name: case.name().to_owned(),
443-
mode: RunMode::Test,
444443
status,
445444
message,
446445
elapsed_s: Some(notify::Elapsed(start.elapsed())),

0 commit comments

Comments
 (0)