summaryrefslogtreecommitdiffstats
path: root/src/utils
diff options
context:
space:
mode:
authorNora <nora.widdecke@tu-bs.de>2019-01-22 19:53:39 +0100
committerNora <nora.widdecke@tu-bs.de>2019-01-22 19:53:39 +0100
commite7cbf6c69c1edbf97418e72a0f0ba8f1fea32b45 (patch)
tree38db4f38b5bb888ddd3fd44c387e762261970f92 /src/utils
parent2b7d90e2600db1b0db115d59707fd57c58dbab6d (diff)
misc: define make_new_uid differently for tests
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/misc.rs21
1 files changed, 8 insertions, 13 deletions
diff --git a/src/utils/misc.rs b/src/utils/misc.rs
index 0f34fc7..accf731 100644
--- a/src/utils/misc.rs
+++ b/src/utils/misc.rs
@@ -24,28 +24,23 @@ pub fn get_bucket_for_date(date: Date<Local>) -> String {
date.format("%G-W%V").to_string()
}
+#[cfg(not(test))]
pub fn make_new_uid() -> String {
use uuid::Uuid;
- if cfg!(test) {
- "11111111-2222-3333-4444-444444444444@khaleesi".to_string()
- } else {
- let suffix = "@khaleesi";
- format!("{}{}", Uuid::new_v4().to_hyphenated_ref(), suffix)
- }
+ let suffix = "@khaleesi";
+ format!("{}{}", Uuid::new_v4().to_hyphenated_ref(), suffix)
+}
+
+#[cfg(test)]
+pub fn make_new_uid() -> String {
+ "11111111-2222-3333-4444-444444444444@khaleesi".to_string()
}
#[cfg(test)]
mod tests {
use super::*;
- //#[test]
- //fn make_new_uid_test() {
- //let mut uid = make_new_uid();
- //assert_eq!(45, uid.len());
- //assert_eq!("@khaleesi".to_string(), uid.split_off(36));
- //}
-
#[test]
fn format_duration_test() {
let millis: u64 = 12345678;