Skip to content

Commit 9459ceb

Browse files
Leonardo ArcariZachBray
authored andcommitted
refactor(rust): use fluent API in unit test
1 parent e73b268 commit 9459ceb

1 file changed

Lines changed: 64 additions & 55 deletions

File tree

rust/tests/optional_field_nullify_test.rs

Lines changed: 64 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -123,32 +123,37 @@ fn encode_extension_car_for_optional_field_test(
123123
);
124124
car = car.header(0).parent()?;
125125

126-
car.cup_holder_count_opt(cup_holder_count);
127126
if nullify {
128127
// When enabled, tests expect optional message fields to be encoded as "absent".
129-
car.nullify_optional_fields();
128+
car.cup_holder_count_opt(cup_holder_count)
129+
.nullify_optional_fields();
130130
}
131-
car.serial_number(1234);
132-
car.model_year(2013);
133-
car.available(ExtBooleanType::T);
134-
car.code(ExtModel::A);
135-
car.some_numbers(&[0, 1, 2, 3]);
136-
car.vehicle_code(b"abcdef");
137-
138-
extras.set_cruise_control(true);
139-
extras.set_sports_pack(true);
140-
extras.set_sun_roof(false);
131+
else
132+
{
133+
car.cup_holder_count_opt(cup_holder_count);
134+
}
135+
car.serial_number(1234)
136+
.model_year(2013)
137+
.available(ExtBooleanType::T)
138+
.code(ExtModel::A)
139+
.some_numbers(&[0, 1, 2, 3])
140+
.vehicle_code(b"abcdef");
141+
142+
extras
143+
.set_cruise_control(true)
144+
.set_sports_pack(true)
145+
.set_sun_roof(false);
141146
car.extras(extras);
142147

143148
let mut engine = car.engine_encoder();
144-
engine.capacity(2000);
145-
engine.num_cylinders(4);
146-
engine.manufacturer_code(b"123");
147-
engine.efficiency(35);
148-
engine.booster_enabled(ExtBooleanType::T);
149+
engine
150+
.capacity(2000)
151+
.num_cylinders(4)
152+
.manufacturer_code(b"123")
153+
.efficiency(35)
154+
.booster_enabled(ExtBooleanType::T);
149155
let mut booster = engine.booster_encoder();
150-
booster.boost_type(ExtBoostType::NITROUS);
151-
booster.horse_power(200);
156+
booster.boost_type(ExtBoostType::NITROUS).horse_power(200);
152157
engine = booster.parent()?;
153158
let _car = engine.parent()?;
154159

@@ -210,36 +215,36 @@ fn nullify_on_composite_and_group_without_optional_fields_has_no_effect() -> Tes
210215
);
211216
car = car.header(0).parent()?;
212217

213-
car.serial_number(1234);
214-
car.model_year(2013);
215-
car.available(ExtBooleanType::T);
216-
car.code(ExtModel::A);
217-
car.some_numbers(&[0, 1, 2, 3]);
218-
car.vehicle_code(b"abcdef");
219-
220-
extras.set_cruise_control(true);
221-
extras.set_sports_pack(true);
222-
extras.set_sun_roof(false);
218+
car.serial_number(1234)
219+
.model_year(2013)
220+
.available(ExtBooleanType::T)
221+
.code(ExtModel::A)
222+
.some_numbers(&[0, 1, 2, 3])
223+
.vehicle_code(b"abcdef");
224+
225+
extras
226+
.set_cruise_control(true)
227+
.set_sports_pack(true)
228+
.set_sun_roof(false);
223229
car.extras(extras);
224230

225231
let mut engine = car.engine_encoder();
226-
engine.capacity(2000);
227-
engine.num_cylinders(4);
228-
engine.manufacturer_code(b"123");
229-
engine.efficiency(35);
230-
engine.booster_enabled(ExtBooleanType::T);
232+
engine
233+
.capacity(2000)
234+
.num_cylinders(4)
235+
.manufacturer_code(b"123")
236+
.efficiency(35)
237+
.booster_enabled(ExtBooleanType::T);
231238
// Engine has no optional primitive scalar fields, so nullify must be a no-op.
232239
engine.nullify_optional_fields();
233240
let mut booster = engine.booster_encoder();
234-
booster.boost_type(ExtBoostType::NITROUS);
235-
booster.horse_power(200);
241+
booster.boost_type(ExtBoostType::NITROUS).horse_power(200);
236242
engine = booster.parent()?;
237243
car = engine.parent()?;
238244

239245
fuel_figures = car.fuel_figures_encoder(1, fuel_figures);
240246
assert_eq!(Some(0), fuel_figures.advance()?);
241-
fuel_figures.speed(77);
242-
fuel_figures.mpg(12.5);
247+
fuel_figures.speed(77).mpg(12.5);
243248
// FuelFigures group also has no optional primitive scalar fields; expect no change.
244249
fuel_figures.nullify_optional_fields();
245250
let _car = fuel_figures.parent()?;
@@ -263,17 +268,17 @@ fn nullify_on_composite_and_group_without_optional_fields_has_no_effect() -> Tes
263268
fn opt_setters_work_as_expected() -> TestResult {
264269
let mut some_buf = vec![0u8; 256];
265270
let mut encoder = create_issue_895_encoder(&mut some_buf);
266-
encoder.optional_float_opt(Some(2.07));
267-
encoder.optional_double_opt(Some(4.12));
271+
encoder
272+
.optional_float_opt(Some(2.07))
273+
.optional_double_opt(Some(4.12));
268274

269275
let decoder = decode_issue_895(some_buf.as_slice());
270276
assert_eq!(Some(2.07), decoder.optional_float());
271277
assert_eq!(Some(4.12), decoder.optional_double());
272278

273279
let mut none_buf = vec![0u8; 256];
274280
let mut encoder = create_issue_895_encoder(&mut none_buf);
275-
encoder.optional_float_opt(None);
276-
encoder.optional_double_opt(None);
281+
encoder.optional_float_opt(None).optional_double_opt(None);
277282

278283
let decoder = decode_issue_895(none_buf.as_slice());
279284
assert_eq!(None, decoder.optional_float());
@@ -287,8 +292,9 @@ fn nullify_optional_fields_sets_all_to_none() -> TestResult {
287292
use issue_895::Encoder;
288293
let mut buf = vec![0u8; 256];
289294
let mut encoder = create_issue_895_encoder(&mut buf);
290-
encoder.optional_float_opt(Some(2.07));
291-
encoder.optional_double_opt(Some(4.12));
295+
encoder
296+
.optional_float_opt(Some(2.07))
297+
.optional_double_opt(Some(4.12));
292298
// Message-level nullify should clear every optional primitive scalar field.
293299
encoder.nullify_optional_fields();
294300

@@ -306,8 +312,7 @@ fn composite_nullify_optional_fields_sets_fields_to_none() -> TestResult {
306312
let mut encoder = create_issue_972_encoder(&mut buffer);
307313
encoder.old_field(777);
308314
let mut new_composite_encoder = encoder.new_field_encoder();
309-
new_composite_encoder.f1(2007);
310-
new_composite_encoder.f2(2012);
315+
new_composite_encoder.f1(2007).f2(2012);
311316
// Composite-level nullify should clear composite optional primitive fields.
312317
new_composite_encoder.nullify_optional_fields();
313318
let _encoder = new_composite_encoder.parent()?;
@@ -353,9 +358,10 @@ fn group_nullify_optional_fields_sets_optional_fields_to_none() -> TestResult {
353358

354359
quote_entries = quote_sets.quote_entries_encoder(1, quote_entries);
355360
assert_eq!(Some(0), quote_entries.advance()?);
356-
quote_entries.security_id_opt(Some(111));
357-
quote_entries.bid_size_opt(Some(222));
358-
quote_entries.offer_size_opt(Some(333));
361+
quote_entries
362+
.security_id_opt(Some(111))
363+
.bid_size_opt(Some(222))
364+
.offer_size_opt(Some(333));
359365
// Group-level nullify should clear all optional primitive scalar fields in the entry.
360366
quote_entries.nullify_optional_fields();
361367

@@ -384,9 +390,10 @@ fn nullify_optional_fields_sets_optional_enum_field_to_null_value() -> TestResul
384390
let mut control_buffer = vec![0u8; 256];
385391
let mut control_encoder = create_optional_enum_nullify_encoder(&mut control_buffer);
386392
// Optionality is declared on the field, matching IR optional enum semantics.
387-
control_encoder.optional_enum_opt(Some(OenEnumType::One));
388393
// This field is required, even if its enum type encoding is optional.
389-
control_encoder.required_enum_from_optional_type(OenOptionalEncodingEnumType::Alpha);
394+
control_encoder
395+
.optional_enum_opt(Some(OenEnumType::One))
396+
.required_enum_from_optional_type(OenOptionalEncodingEnumType::Alpha);
390397
let mut control_composite = control_encoder.optional_composite_encoder();
391398
control_composite.optional_counter_opt(Some(77));
392399
let _control_encoder = control_composite.parent()?;
@@ -402,8 +409,9 @@ fn nullify_optional_fields_sets_optional_enum_field_to_null_value() -> TestResul
402409

403410
let mut none_buffer = vec![0u8; 256];
404411
let mut none_encoder = create_optional_enum_nullify_encoder(&mut none_buffer);
405-
none_encoder.optional_enum_opt(None);
406-
none_encoder.required_enum_from_optional_type(OenOptionalEncodingEnumType::Beta);
412+
none_encoder
413+
.optional_enum_opt(None)
414+
.required_enum_from_optional_type(OenOptionalEncodingEnumType::Beta);
407415
let mut none_composite = none_encoder.optional_composite_encoder();
408416
none_composite.optional_counter_opt(None);
409417
let _none_encoder = none_composite.parent()?;
@@ -419,8 +427,9 @@ fn nullify_optional_fields_sets_optional_enum_field_to_null_value() -> TestResul
419427

420428
let mut nullified_buffer = vec![0u8; 256];
421429
let mut nullified_encoder = create_optional_enum_nullify_encoder(&mut nullified_buffer);
422-
nullified_encoder.optional_enum_opt(Some(OenEnumType::Two));
423-
nullified_encoder.required_enum_from_optional_type(OenOptionalEncodingEnumType::Beta);
430+
nullified_encoder
431+
.optional_enum_opt(Some(OenEnumType::Two))
432+
.required_enum_from_optional_type(OenOptionalEncodingEnumType::Beta);
424433
let mut nullified_composite = nullified_encoder.optional_composite_encoder();
425434
nullified_composite.optional_counter_opt(Some(88));
426435
nullified_encoder = nullified_composite.parent()?;

0 commit comments

Comments
 (0)