admar
/
sinoptik
forked from paul/sinoptik
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compact merge tests by using constructors 

Add the constructors to sample/item structs for testing purposes.
This commit is contained in:
Paul van Tilburg 2022-05-08 13:54:17 +02:00
parent 5a23e83b7f
commit 34b63ec94d
Signed by untrusted user: paul
GPG Key ID: C6DE073EDA9EEC4D
3 changed files with 42 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/maps.rs
View File

@ -308,6 +308,13 @@ pub(crate) struct Sample {
pub(crate) score: u8,
}
impl Sample {
#[cfg(test)]
pub(crate) fn new(time: DateTime<Utc>, score: u8) -> Self {
Self { time, score }
}
}
/// Builds a scoring histogram for the map key.
fn map_key_histogram() -> MapKeyHistogram {
MAP_KEY

148
src/providers/combined.rs
View File

@ -25,6 +25,13 @@ pub(crate) struct Item {
value: f32,
}
impl Item {
#[cfg(test)]
pub(crate) fn new(time: DateTime<Utc>, value: f32) -> Self {
Self { time, value }
}
}
/// Merges pollen samples and AQI items into combined items.
///
/// The merging drops items from either the pollen samples or from the AQI items if they are not
@ -162,48 +169,18 @@ mod tests {
let t_2 = t_now.checked_add_signed(Duration::minutes(132)).unwrap();
let pollen_samples = Vec::from([
BuienradarSample {
time: t_m2,
score: 4,
},
BuienradarSample {
time: t_m1,
score: 5,
},
BuienradarSample {
time: t_0,
score: 1,
},
BuienradarSample {
time: t_1,
score: 3,
},
BuienradarSample {
time: t_2,
score: 2,
},
BuienradarSample::new(t_m2, 4),
BuienradarSample::new(t_m1, 5),
BuienradarSample::new(t_0, 1),
BuienradarSample::new(t_1, 3),
BuienradarSample::new(t_2, 2),
]);
let aqi_items = Vec::from([
LuchtmeetnetItem {
time: t_m2,
value: 4.0,
},
LuchtmeetnetItem {
time: t_m1,
value: 5.0,
},
LuchtmeetnetItem {
time: t_0,
value: 1.1,
},
LuchtmeetnetItem {
time: t_1,
value: 2.9,
},
LuchtmeetnetItem {
time: t_2,
value: 2.4,
},
LuchtmeetnetItem::new(t_m2, 4.0),
LuchtmeetnetItem::new(t_m1, 5.0),
LuchtmeetnetItem::new(t_0, 1.1),
LuchtmeetnetItem::new(t_1, 2.9),
LuchtmeetnetItem::new(t_2, 2.4),
]);
// A normal merge.
@ -213,34 +190,13 @@ mod tests {
assert_eq!(
paqi,
Vec::from([
Item {
time: t_0,
value: 1.1
},
Item {
time: t_1,
value: 3.0
},
Item {
time: t_2,
value: 2.4
},
Item::new(t_0, 1.1),
Item::new(t_1, 3.0),
Item::new(t_2, 2.4),
])
);
assert_eq!(
max_pollen,
Some(BuienradarSample {
time: t_1,
score: 3
})
);
assert_eq!(
max_aqi,
Some(LuchtmeetnetItem {
time: t_1,
value: 2.9
})
);
assert_eq!(max_pollen, Some(BuienradarSample::new(t_1, 3)));
assert_eq!(max_aqi, Some(LuchtmeetnetItem::new(t_1, 2.9)));
// The pollen samples are shifted, i.e. one hour in the future.
let shifted_pollen_samples = pollen_samples[2..]
@ -254,33 +210,9 @@ mod tests {
let merged = super::merge(shifted_pollen_samples, aqi_items.clone());
assert!(merged.is_some());
let (paqi, max_pollen, max_aqi) = merged.unwrap();
assert_eq!(
paqi,
Vec::from([
Item {
time: t_1,
value: 2.9
},
Item {
time: t_2,
value: 3.0
}
])
);
assert_eq!(
max_pollen,
Some(BuienradarSample {
time: t_2,
score: 3
})
);
assert_eq!(
max_aqi,
Some(LuchtmeetnetItem {
time: t_1,
value: 2.9
})
);
assert_eq!(paqi, Vec::from([Item::new(t_1, 2.9), Item::new(t_2, 3.0),]));
assert_eq!(max_pollen, Some(BuienradarSample::new(t_2, 3)));
assert_eq!(max_aqi, Some(LuchtmeetnetItem::new(t_1, 2.9)));
// The AQI items are shifted, i.e. one hour in the future.
let shifted_aqi_items = aqi_items[2..]
@ -294,33 +226,9 @@ mod tests {
let merged = super::merge(pollen_samples.clone(), shifted_aqi_items);
assert!(merged.is_some());
let (paqi, max_pollen, max_aqi) = merged.unwrap();
assert_eq!(
paqi,
Vec::from([
Item {
time: t_1,
value: 3.0
},
Item {
time: t_2,
value: 2.9
}
])
);
assert_eq!(
max_pollen,
Some(BuienradarSample {
time: t_1,
score: 3
})
);
assert_eq!(
max_aqi,
Some(LuchtmeetnetItem {
time: t_2,
value: 2.9
})
);
assert_eq!(paqi, Vec::from([Item::new(t_1, 3.0), Item::new(t_2, 2.9),]));
assert_eq!(max_pollen, Some(BuienradarSample::new(t_1, 3)));
assert_eq!(max_aqi, Some(LuchtmeetnetItem::new(t_2, 2.9)));
// Merging fails because the samples/items are too far apart.
let shifted_aqi_items = aqi_items

7
src/providers/luchtmeetnet.rs
View File

@ -40,6 +40,13 @@ pub(crate) struct Item {
pub(crate) value: f32,
}
impl Item {
#[cfg(test)]
pub(crate) fn new(time: DateTime<Utc>, value: f32) -> Self {
Self { time, value }
}
}
/// Retrieves the Luchtmeetnet forecasted items for the provided position and metric.
///
/// It supports the following metrics: