Skip to content

Commit d52b3da

Browse files
committed
Pass expected interval to check_samples test helper
Signed-off-by: Sahas Subramanian <sahas.subramanian@proton.me>
1 parent 3724605 commit d52b3da

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

src/logical_meter/logical_meter_handle.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,7 @@ mod tests {
350350
check_samples(
351351
samples,
352352
|q| q.as_watts(),
353+
TimeDelta::try_seconds(1).unwrap(),
353354
vec![
354355
Some(5.8),
355356
Some(6.0),
@@ -377,6 +378,7 @@ mod tests {
377378
check_samples(
378379
samples,
379380
|q| q.as_volt_amperes_reactive(),
381+
TimeDelta::try_seconds(1).unwrap(),
380382
vec![
381383
Some(-1.4),
382384
Some(-0.5),
@@ -403,6 +405,7 @@ mod tests {
403405
check_samples(
404406
samples,
405407
|q| q.as_volts(),
408+
TimeDelta::try_seconds(1).unwrap(),
406409
vec![
407410
Some(398.0),
408411
Some(397.67),
@@ -429,6 +432,7 @@ mod tests {
429432
check_samples(
430433
samples,
431434
|q| q.as_amperes(),
435+
TimeDelta::try_seconds(1).unwrap(),
432436
vec![
433437
Some(15.0),
434438
Some(14.75),
@@ -458,17 +462,20 @@ mod tests {
458462
fn check_samples<Q: Quantity>(
459463
samples: Vec<Sample<Q>>,
460464
extractor: impl Fn(Q) -> f32,
465+
expected_interval: TimeDelta,
461466
expected_values: Vec<Option<f32>>,
462467
) {
463468
let values = samples
464469
.iter()
465470
.map(|res| res.value().map(|v| extractor(v)))
466471
.collect::<Vec<_>>();
467472

468-
let one_second = TimeDelta::try_seconds(1).unwrap();
469-
470473
samples.as_slice().windows(2).for_each(|w| {
471-
assert_eq!(w[1].timestamp() - w[0].timestamp(), one_second);
474+
assert_eq!(
475+
w[1].timestamp() - w[0].timestamp(),
476+
expected_interval,
477+
"Samples are not spaced at the expected interval"
478+
);
472479
});
473480

474481
for (v, ev) in values.iter().zip(expected_values.iter()) {

0 commit comments

Comments
 (0)