Skip to content

Commit f2a8a5d

Browse files
committed
fix(json)!: Make schema snake_case
This better reflects rustc's json messages
1 parent f17aa40 commit f2a8a5d

5 files changed

Lines changed: 125 additions & 125 deletions

File tree

crates/libtest-json/event.schema.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"properties": {
88
"event": {
99
"type": "string",
10-
"const": "discover-start"
10+
"const": "discover_start"
1111
}
1212
},
1313
"required": [
@@ -29,7 +29,7 @@
2929
},
3030
"event": {
3131
"type": "string",
32-
"const": "discover-case"
32+
"const": "discover_case"
3333
}
3434
},
3535
"required": [
@@ -52,7 +52,7 @@
5252
},
5353
"event": {
5454
"type": "string",
55-
"const": "discover-complete"
55+
"const": "discover_complete"
5656
}
5757
},
5858
"required": [
@@ -64,7 +64,7 @@
6464
"properties": {
6565
"event": {
6666
"type": "string",
67-
"const": "suite-start"
67+
"const": "suite_start"
6868
}
6969
},
7070
"required": [
@@ -79,7 +79,7 @@
7979
},
8080
"event": {
8181
"type": "string",
82-
"const": "case-start"
82+
"const": "case_start"
8383
}
8484
},
8585
"required": [
@@ -125,7 +125,7 @@
125125
},
126126
"event": {
127127
"type": "string",
128-
"const": "case-complete"
128+
"const": "case_complete"
129129
}
130130
},
131131
"required": [
@@ -148,7 +148,7 @@
148148
},
149149
"event": {
150150
"type": "string",
151-
"const": "suite-complete"
151+
"const": "suite_complete"
152152
}
153153
},
154154
"required": [

crates/libtest-json/src/event.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#[derive(Clone, Debug)]
22
#[cfg_attr(feature = "unstable-schema", derive(schemars::JsonSchema))]
33
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
4-
#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
4+
#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
55
#[cfg_attr(feature = "serde", serde(tag = "event"))]
66
pub enum Event {
77
DiscoverStart,
@@ -81,7 +81,7 @@ fn is_true(yes: &bool) -> bool {
8181
#[derive(Copy, Clone, Default, Debug, PartialEq, Eq)]
8282
#[cfg_attr(feature = "unstable-schema", derive(schemars::JsonSchema))]
8383
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
84-
#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
84+
#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
8585
pub enum RunMode {
8686
#[default]
8787
Test,
@@ -104,7 +104,7 @@ impl RunMode {
104104
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
105105
#[cfg_attr(feature = "unstable-schema", derive(schemars::JsonSchema))]
106106
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
107-
#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
107+
#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
108108
pub enum RunStatus {
109109
Ignored,
110110
Failed,

crates/libtest-json/tests/roundtrip.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fn t(input: libtest_json::Event, snapshot: impl IntoData) {
1818
fn discover_start() {
1919
t(
2020
libtest_json::Event::DiscoverStart,
21-
str![[r#"{"event":"discover-start"}"#]],
21+
str![[r#"{"event":"discover_start"}"#]],
2222
);
2323
}
2424

@@ -30,7 +30,7 @@ fn discover_case() {
3030
mode: libtest_json::RunMode::Test,
3131
run: true,
3232
},
33-
str![[r#"{"event":"discover-case","name":"Hello\tworld!"}"#]],
33+
str![[r#"{"event":"discover_case","name":"Hello\tworld!"}"#]],
3434
);
3535

3636
t(
@@ -39,30 +39,30 @@ fn discover_case() {
3939
mode: libtest_json::RunMode::Bench,
4040
run: false,
4141
},
42-
str![[r#"{"event":"discover-case","name":"Hello\tworld!","mode":"bench","run":false}"#]],
42+
str![[r#"{"event":"discover_case","name":"Hello\tworld!","mode":"bench","run":false}"#]],
4343
);
4444
}
4545

4646
#[test]
4747
fn discover_complete() {
4848
t(
4949
libtest_json::Event::DiscoverComplete { elapsed_s: None },
50-
str![[r#"{"event":"discover-complete"}"#]],
50+
str![[r#"{"event":"discover_complete"}"#]],
5151
);
5252

5353
t(
5454
libtest_json::Event::DiscoverComplete {
5555
elapsed_s: Some(libtest_json::Elapsed(Default::default())),
5656
},
57-
str![[r#"{"event":"discover-complete","elapsed_s":"0"}"#]],
57+
str![[r#"{"event":"discover_complete","elapsed_s":"0"}"#]],
5858
);
5959
}
6060

6161
#[test]
6262
fn suite_start() {
6363
t(
6464
libtest_json::Event::SuiteStart,
65-
str![[r#"{"event":"suite-start"}"#]],
65+
str![[r#"{"event":"suite_start"}"#]],
6666
);
6767
}
6868

@@ -72,7 +72,7 @@ fn case_start() {
7272
libtest_json::Event::CaseStart {
7373
name: "Hello\tworld!".to_owned(),
7474
},
75-
str![[r#"{"event":"case-start","name":"Hello\tworld!"}"#]],
75+
str![[r#"{"event":"case_start","name":"Hello\tworld!"}"#]],
7676
);
7777
}
7878

@@ -86,7 +86,7 @@ fn case_complete() {
8686
message: None,
8787
elapsed_s: None,
8888
},
89-
str![[r#"{"event":"case-complete","name":"Hello\tworld!"}"#]],
89+
str![[r#"{"event":"case_complete","name":"Hello\tworld!"}"#]],
9090
);
9191

9292
t(
@@ -98,7 +98,7 @@ fn case_complete() {
9898
elapsed_s: Some(libtest_json::Elapsed(Default::default())),
9999
},
100100
str![[
101-
r#"{"event":"case-complete","name":"Hello\tworld!","mode":"bench","status":"ignored","message":"This\tfailed","elapsed_s":"0"}"#
101+
r#"{"event":"case_complete","name":"Hello\tworld!","mode":"bench","status":"ignored","message":"This\tfailed","elapsed_s":"0"}"#
102102
]],
103103
);
104104
}
@@ -107,13 +107,13 @@ fn case_complete() {
107107
fn suite_complete() {
108108
t(
109109
libtest_json::Event::SuiteComplete { elapsed_s: None },
110-
str![[r#"{"event":"suite-complete"}"#]],
110+
str![[r#"{"event":"suite_complete"}"#]],
111111
);
112112

113113
t(
114114
libtest_json::Event::SuiteComplete {
115115
elapsed_s: Some(libtest_json::Elapsed(Default::default())),
116116
},
117-
str![[r#"{"event":"suite-complete","elapsed_s":"0"}"#]],
117+
str![[r#"{"event":"suite_complete","elapsed_s":"0"}"#]],
118118
);
119119
}

0 commit comments

Comments
 (0)