Skip to content

Commit 7ebba85

Browse files
Merge pull request #115 from sine-fdn/martin/random-data-fix
fix: EnergyConsumptionUnit JSON serialization
2 parents c6dd17e + 8bb6878 commit 7ebba85

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

gen/schemas/hoc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
"l",
179179
"kg",
180180
"kWh",
181-
"mJ"
181+
"MJ"
182182
]
183183
},
184184
"Feedstock": {

gen/schemas/toc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
"l",
190190
"kg",
191191
"kWh",
192-
"mJ"
192+
"MJ"
193193
]
194194
},
195195
"Feedstock": {

gen/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ pub enum EnergyConsumptionUnit {
355355
L,
356356
Kg,
357357
KWh,
358+
#[serde(rename = "MJ")]
358359
MJ,
359360
}
360361

gen/tests/tests.rs

+15
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,18 @@ fn test_ship_foot_deser() {
127127
let ship_foot: ShipmentFootprint = serde_json::from_str(json).unwrap();
128128
assert_eq!(ship_foot, expected)
129129
}
130+
131+
#[test]
132+
fn test_energyconsumptionunit_deser() {
133+
use EnergyConsumptionUnit::*;
134+
let test_vectors = vec![
135+
("\"l\"", L),
136+
("\"kg\"", Kg),
137+
("\"kWh\"", KWh),
138+
("\"MJ\"", MJ),
139+
];
140+
141+
for (expect, input) in &test_vectors {
142+
assert_eq!(expect, &serde_json::to_string(input).unwrap());
143+
}
144+
}

0 commit comments

Comments
 (0)