coverage (#46)
Reviewed-on: #46 Co-authored-by: Dandaedre <max.beffroi@gmail.com> Co-committed-by: Dandaedre <max.beffroi@gmail.com>
This commit is contained in:
parent
0e3a7fb3ad
commit
773c5dd2ff
|
|
@ -4,6 +4,7 @@
|
|||
debug/
|
||||
target/
|
||||
test/
|
||||
bobito/
|
||||
|
||||
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
|
||||
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="122" height="18" role="img" aria-label="test-coverage: 75%"><title>test-coverage: 75%</title><linearGradient id="bms-10c887a79af584fb" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-color="#000" stop-opacity=".3"/><stop offset="1" stop-color="#000" stop-opacity=".5"/></linearGradient><clipPath id="bmr-10c887a79af584fb"><rect width="122" height="18" rx="4" fill="#fff"/></clipPath><g clip-path="url(#bmr-10c887a79af584fb)"><rect width="87" height="18" fill="#555"/><rect x="87" width="35" height="18" fill="#e05d44"/><rect width="122" height="18" fill="url(#bms-10c887a79af584fb)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="445" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="770">test-coverage</text><text x="445" y="130" transform="scale(.1)" fill="#fff" textLength="770">test-coverage</text><text aria-hidden="true" x="1035" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">75%</text><text x="1035" y="130" transform="scale(.1)" fill="#fff" textLength="250">75%</text></g></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="122" height="18" role="img" aria-label="test-coverage: 88%"><title>test-coverage: 88%</title><linearGradient id="bms-7f01f1ef66d48313" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-color="#000" stop-opacity=".3"/><stop offset="1" stop-color="#000" stop-opacity=".5"/></linearGradient><clipPath id="bmr-7f01f1ef66d48313"><rect width="122" height="18" rx="4" fill="#fff"/></clipPath><g clip-path="url(#bmr-7f01f1ef66d48313)"><rect width="87" height="18" fill="#555"/><rect x="87" width="35" height="18" fill="#fe7d37"/><rect width="122" height="18" fill="url(#bms-7f01f1ef66d48313)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="445" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="770">test-coverage</text><text x="445" y="130" transform="scale(.1)" fill="#fff" textLength="770">test-coverage</text><text aria-hidden="true" x="1035" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">88%</text><text x="1035" y="130" transform="scale(.1)" fill="#fff" textLength="250">88%</text></g></svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
|
@ -104,11 +104,11 @@ pub enum IdleError {
|
|||
#[error("An error occured while trying to parse a Discord command")]
|
||||
DiscordContainerParse,
|
||||
/// Indicate a backup write couldn't be done, usually means the file descriptor is busy or permission are incorrect
|
||||
#[error("An error occured while trying to write file {0}")]
|
||||
BackupWriteError(std::io::Error),
|
||||
#[error("An error occured while trying to write file {0} {1}")]
|
||||
BackupWriteError(String, std::io::Error),
|
||||
/// Indicate a backup read couldn't be done, usually means the file descriptor is busy or permission are incorrect
|
||||
#[error("An error occured while trying to read file {0}")]
|
||||
BackupReadError(std::io::Error),
|
||||
#[error("An error occured while trying to read file {0} {1}")]
|
||||
BackupReadError(String, std::io::Error),
|
||||
/// Indicate a value couldn't be serialized
|
||||
#[error("An error occured while trying to serialize data {0}")]
|
||||
SerdeError(serde_json::Error),
|
||||
|
|
|
|||
16
src/ids.rs
16
src/ids.rs
|
|
@ -36,6 +36,8 @@ pub fn generate_id() -> String {
|
|||
pub fn generate_unique_id(holder: &EventHolder) -> String {
|
||||
let id = generate_id();
|
||||
match holder.contains_event(&id) {
|
||||
// Testing this collision is not possible
|
||||
#[cfg(not(tarpaulin_include))]
|
||||
true => generate_unique_id(holder),
|
||||
false => id,
|
||||
}
|
||||
|
|
@ -43,11 +45,23 @@ pub fn generate_unique_id(holder: &EventHolder) -> String {
|
|||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use super::generate_id;
|
||||
use crate::votes::{add_pending_event, EventHolder, EventPending};
|
||||
|
||||
use super::{generate_id, generate_unique_id};
|
||||
|
||||
#[test]
|
||||
fn test_id_generation() {
|
||||
let id = generate_id();
|
||||
assert!(!id.is_empty())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_id_unique() {
|
||||
let holder = EventHolder::default();
|
||||
|
||||
add_pending_event(EventPending::default(), &holder).unwrap();
|
||||
|
||||
let id = generate_unique_id(&holder);
|
||||
assert!(!id.is_empty());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
11
src/io.rs
11
src/io.rs
|
|
@ -422,5 +422,16 @@ mod tests {
|
|||
find_role_from_str(Some("ffxivpogfish"), arguments.to_vec()),
|
||||
Some("ffxiv_progfish".to_string())
|
||||
);
|
||||
assert!(find_role_from_str(None, arguments.to_vec()).is_none());
|
||||
assert!(find_role_from_str(Some("Bob"), Vec::new()).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn create_container() {
|
||||
VoteContainer::new(
|
||||
"IO".to_string(),
|
||||
"desc".to_string(),
|
||||
VoteTypeIdentifier::WeeklyVote,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,25 +26,26 @@ where
|
|||
macro_rules! load_from_reader {
|
||||
($r_type:ident, $path:expr) => {
|
||||
Arc::new(std::sync::Mutex::new(load_from_reader::<$r_type, File>(
|
||||
File::open($path).map_err(IdleError::BackupReadError)?,
|
||||
File::open($path).map_err(|e| IdleError::BackupReadError($path.to_owned(), e))?,
|
||||
)))
|
||||
};
|
||||
}
|
||||
|
||||
// Testing a bad serialisation is pointless
|
||||
#[cfg(not(tarpaulin_include))]
|
||||
/// Tries to save the list to disk and return an error on failure
|
||||
pub(crate) fn save_to_writer<Data, Writer>(data: Data, mut writer: Writer) -> Result<(), IdleError>
|
||||
where
|
||||
Data: Serialize,
|
||||
Writer: Write + Sized,
|
||||
Writer: Write + Sized + std::fmt::Debug,
|
||||
{
|
||||
// let mut f = File::create(wrtr).map_err(IdleError::BackupError)?;
|
||||
writer
|
||||
.write(
|
||||
serde_json::to_string_pretty(&data)
|
||||
.map_err(IdleError::SerdeError)?
|
||||
.as_bytes(),
|
||||
)
|
||||
.map_err(IdleError::BackupWriteError)?;
|
||||
.map_err(|e| IdleError::BackupWriteError(format!("{:?}", writer), e))?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
|
@ -60,7 +61,7 @@ macro_rules! save_to_writer {
|
|||
($value:expr, $r_type:ident, $path:expr) => {
|
||||
save_to_writer::<&$r_type, File>(
|
||||
&$value.lock().unwrap(),
|
||||
File::create($path).map_err(IdleError::BackupWriteError)?,
|
||||
File::create($path).map_err(|e| IdleError::BackupWriteError($path.to_string(), e))?,
|
||||
)?;
|
||||
};
|
||||
}
|
||||
|
|
@ -92,7 +93,6 @@ mod tests {
|
|||
let event_og = Arc::new(Mutex::new(ListPendingEvents::default()));
|
||||
{
|
||||
let mut e = event_og.lock().unwrap();
|
||||
println!(" Here {:?}", event_og);
|
||||
for _ in 0..10 {
|
||||
e.add_pending_event(EventPending::default())?;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,10 @@
|
|||
//!
|
||||
use crate::votes::traits::BorrowInner;
|
||||
use chrono::NaiveDate;
|
||||
use std::{fs::File, sync::Arc};
|
||||
use std::{
|
||||
fs::{create_dir, File},
|
||||
sync::Arc,
|
||||
};
|
||||
|
||||
use super::{
|
||||
events::{EventOngoing, EventPending},
|
||||
|
|
@ -221,33 +224,49 @@ macro_rules! inner {
|
|||
}
|
||||
|
||||
impl EventHolder {
|
||||
pub fn try_load_from_disk() -> Result<Self, IdleError> {
|
||||
pub fn try_load_from_disk(save_path: Option<&str>) -> Result<Self, IdleError> {
|
||||
let save_path = save_path.unwrap_or("data");
|
||||
Ok(Self {
|
||||
pending_events: load_from_reader!(ListPendingEvents, "data/pending_events.json"),
|
||||
ongoing_events: load_from_reader!(ListOngoingEvents, "data/ongoin_events.json"),
|
||||
closed_events: load_from_reader!(ListClosedEvents, "data/closed_events.json"),
|
||||
old_date: load_from_reader!(NaiveDate, "data/old_date.json"),
|
||||
pending_events: load_from_reader!(
|
||||
ListPendingEvents,
|
||||
save_path.to_owned() + "/pending_events.json"
|
||||
),
|
||||
ongoing_events: load_from_reader!(
|
||||
ListOngoingEvents,
|
||||
save_path.to_owned() + "/ongoing_events.json"
|
||||
),
|
||||
closed_events: load_from_reader!(
|
||||
ListClosedEvents,
|
||||
save_path.to_owned() + "/closed_events.json"
|
||||
),
|
||||
old_date: load_from_reader!(NaiveDate, save_path.to_owned() + "/old_date.json"),
|
||||
..Default::default()
|
||||
})
|
||||
}
|
||||
|
||||
pub fn try_save_to_disk(holder: EventHolder) -> Result<(), IdleError> {
|
||||
pub fn try_save_to_disk(&self, save_path: Option<&str>) -> Result<(), IdleError> {
|
||||
let save_path = save_path.unwrap_or("data");
|
||||
let _ = create_dir(save_path);
|
||||
save_to_writer!(
|
||||
holder.pending_events,
|
||||
self.pending_events,
|
||||
ListPendingEvents,
|
||||
"data/pending_events.json"
|
||||
save_path.to_owned() + "/pending_events.json"
|
||||
);
|
||||
save_to_writer!(
|
||||
holder.ongoing_events,
|
||||
self.ongoing_events,
|
||||
ListOngoingEvents,
|
||||
"data/ongoing_events.json"
|
||||
save_path.to_owned() + "/ongoing_events.json"
|
||||
);
|
||||
save_to_writer!(
|
||||
holder.closed_events,
|
||||
self.closed_events,
|
||||
ListClosedEvents,
|
||||
"data/closed_events.json"
|
||||
save_path.to_owned() + "/closed_events.json"
|
||||
);
|
||||
save_to_writer!(
|
||||
&self.old_date,
|
||||
NaiveDate,
|
||||
save_path.to_owned() + "/old_date.json"
|
||||
);
|
||||
save_to_writer!(&holder.old_date, NaiveDate, "data/old_date.json");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
|
@ -256,8 +275,8 @@ impl EventHolder {
|
|||
/// This is a low level plumbing tool, mostly used to check for collisions
|
||||
pub(crate) fn contains_event(&self, id: &String) -> bool {
|
||||
inner!(self.pending_events).contains_key(id)
|
||||
|| inner!(self.pending_events).contains_key(id)
|
||||
|| inner!(self.pending_events).contains_key(id)
|
||||
|| inner!(self.ongoing_events).contains_key(id)
|
||||
|| inner!(self.closed_events).contains_key(id)
|
||||
}
|
||||
|
||||
/// Try to find an even by it's id, returns a TypedEvent to keep track of the location of the event
|
||||
|
|
@ -281,3 +300,49 @@ impl EventHolder {
|
|||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use crate::votes::{holders::TypedEvent, EventPending};
|
||||
|
||||
use super::{add_pending_event, close_ongoing_event, make_into_ongoing_event, EventHolder};
|
||||
|
||||
#[test]
|
||||
fn test_save_load() {
|
||||
let hld = EventHolder::default();
|
||||
|
||||
let (a, b, c) = (
|
||||
add_pending_event(EventPending::default(), &hld).unwrap(),
|
||||
add_pending_event(EventPending::default(), &hld).unwrap(),
|
||||
add_pending_event(EventPending::default(), &hld).unwrap(),
|
||||
);
|
||||
|
||||
make_into_ongoing_event(&b, &hld).unwrap();
|
||||
make_into_ongoing_event(&c, &hld).unwrap();
|
||||
|
||||
close_ongoing_event(&c, &hld).unwrap();
|
||||
assert!(hld.contains_event(&a));
|
||||
assert!(hld.contains_event(&b));
|
||||
assert!(hld.contains_event(&c));
|
||||
|
||||
hld.try_save_to_disk(Some("bobito")).unwrap();
|
||||
|
||||
let hld2 = EventHolder::try_load_from_disk(Some("bobito")).unwrap();
|
||||
|
||||
assert!(hld2.contains_event(&a));
|
||||
assert!(hld2.contains_event(&b));
|
||||
assert!(hld2.contains_event(&c));
|
||||
let (a2, b2, c2) = (
|
||||
hld.find_event(&a).unwrap(),
|
||||
hld.find_event(&b).unwrap(),
|
||||
hld.find_event(&c).unwrap(),
|
||||
);
|
||||
// match (a2, b2, c2) {
|
||||
// TypedEvent::Ongoing(),TypedEvent::Pending(),TypedEvent::Closed() => (),
|
||||
// _ =>
|
||||
// }
|
||||
assert!(matches!(a2, TypedEvent::Pending(_)));
|
||||
assert!(matches!(b2, TypedEvent::Ongoing(_)));
|
||||
assert!(matches!(c2, TypedEvent::Closed(_)));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,22 +42,101 @@ impl BorrowInner<EventPending> for ListPendingEvents {
|
|||
/// Doing so will allow blanket implementations great for generic dictionnary handling
|
||||
pub(crate) trait BorrowMutInner<R> {
|
||||
/// Borrow the inner ongoing events
|
||||
fn borrow_inner(&self) -> &HashMap<String, R>;
|
||||
fn borrow_mut_inner(&mut self) -> &mut HashMap<String, R>;
|
||||
}
|
||||
|
||||
/// Blanket inner dictionnary implementation
|
||||
///
|
||||
/// This trait is meant to allow for inner dictionnary manipulation
|
||||
pub(crate) trait EventManipulation<R> {
|
||||
/// get the inner value
|
||||
fn get_attr(&self, s: &str) -> Option<&R>;
|
||||
/// Get a key in the inner hashmap
|
||||
fn get_key(&self, s: &str) -> Option<&R>;
|
||||
// /// Insert a key in the inner hashmap
|
||||
// fn insert(&self, s: &str);
|
||||
}
|
||||
|
||||
impl<T, R> EventManipulation<R> for T
|
||||
where
|
||||
T: BorrowInner<R>,
|
||||
{
|
||||
fn get_attr(&self, s: &str) -> Option<&R> {
|
||||
fn get_key(&self, s: &str) -> Option<&R> {
|
||||
self.borrow_inner().get(s)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::votes::events::ParsedVote;
|
||||
|
||||
use super::*;
|
||||
|
||||
#[derive(Default)]
|
||||
struct TestI {
|
||||
inner: HashMap<String, usize>,
|
||||
}
|
||||
|
||||
impl BorrowInner<usize> for TestI {
|
||||
fn borrow_inner(&self) -> &HashMap<String, usize> {
|
||||
&self.inner
|
||||
}
|
||||
}
|
||||
impl BorrowMutInner<usize> for TestI {
|
||||
fn borrow_mut_inner(&mut self) -> &mut HashMap<String, usize> {
|
||||
&mut self.inner
|
||||
}
|
||||
}
|
||||
impl BorrowMutInner<EventPending> for ListPendingEvents {
|
||||
fn borrow_mut_inner(&mut self) -> &mut HashMap<String, EventPending> {
|
||||
&mut self.pending_events
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_borrow_impl() {
|
||||
let mut i = TestI::default();
|
||||
assert!(i.borrow_inner().is_empty());
|
||||
i.borrow_mut_inner().insert("Bob".to_owned(), 3);
|
||||
assert!(i.borrow_inner().contains_key("Bob"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_blanket_implementation() {
|
||||
let mut i = TestI::default();
|
||||
assert!(i.get_key("blanket").is_none());
|
||||
i.borrow_mut_inner().insert("blanket".to_owned(), 42);
|
||||
assert!(i.get_key("blanket").is_some());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_manual_implementation() {
|
||||
let (mut e, mut v, mut w) = (
|
||||
ListClosedEvents::default(),
|
||||
ListOngoingEvents::default(),
|
||||
ListPendingEvents::default(),
|
||||
);
|
||||
let pv = ParsedVote::default();
|
||||
|
||||
assert!(e.get_key("blanket1").is_none());
|
||||
e.add_event(
|
||||
"blanket1".to_owned(),
|
||||
EventClosed {
|
||||
parsed_vote: pv.clone(),
|
||||
},
|
||||
)
|
||||
.unwrap();
|
||||
assert!(e.get_key("blanket1").is_some());
|
||||
assert!(v.get_key("blanket2").is_none());
|
||||
v.add_event(
|
||||
&"blanket2".to_owned(),
|
||||
EventOngoing {
|
||||
parsed_vote: pv.clone(),
|
||||
},
|
||||
)
|
||||
.unwrap();
|
||||
assert!(v.get_key("blanket2").is_some());
|
||||
assert!(w.get_key("blanket3").is_none());
|
||||
w.borrow_mut_inner()
|
||||
.insert("blanket3".to_owned(), EventPending::default());
|
||||
assert!(w.get_key("blanket3").is_some());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue