move test to tests.rs

Author: metame

server/src/files.rs

@@ -14,10 +14,10 @@ pub enum FileStore {
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct S3Config {
-    bucket: String,
-    path: String,
-    endpoint: Option<String>,
-    region: Option<String>,
+    pub bucket: String,
+    pub path: String,
+    pub endpoint: Option<String>,
+    pub region: Option<String>,
 }
 
 #[derive(Clone, Debug, PartialEq)]
@@ -172,63 +172,3 @@ pub async fn get_s3_signed_url(
 
     Ok(uri)
 }
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    use crate::config::{self, Opts};
-
-    #[actix_rt::test]
-    async fn file_store_tests() {
-        let unique_string = atomic_lib::utils::random_string(10);
-        use clap::Parser;
-        let mut opts = Opts::parse_from([
-            "atomic-server",
-            "--initialize",
-            "--data-dir",
-            &format!("./.temp/{}/db", unique_string),
-            "--config-dir",
-            &format!("./.temp/{}/config", unique_string),
-        ]);
-
-        let mut config = config::build_config(opts.clone())
-            .map_err(|e| format!("Initialization failed: {}", e))
-            .expect("failed init config");
-
-        let fs_store = FileStore::init_fs_from_config(&config);
-        if let FileStore::FS(fs_config) = &fs_store {
-            assert!(fs_config.path.to_str().unwrap().contains("uploads"));
-        } else {
-            panic!("fs FileStore not initiated");
-        }
-        let store = FileStore::init_from_config(&config, fs_store.clone());
-        assert_eq!(fs_store, store);
-        assert_eq!("fs:", fs_store.prefix());
-        assert_eq!("fs%3A", fs_store.encoded());
-
-        assert!(fs_store.get_fs_file_path("my-great-file").unwrap().to_str().unwrap().contains("uploads/my-great-file"));
-        assert!(fs_store.get_fs_file_path("fs:my-great-file").unwrap().to_str().unwrap().contains("uploads/my-great-file"));
-
-        // FileStore::S3 init
-        opts.s3_bucket = Some("test-bucket".to_string());
-        opts.s3_path = Some("uploads".to_string());
-        config.opts = opts;
-        let appstate = crate::appstate::init(config.clone()).expect("failed init appstate");
-
-        let s3_store = FileStore::init_from_config(&config, fs_store.clone());
-        if let FileStore::S3(s3_config) = &s3_store {
-            assert_eq!(s3_config.bucket, "test-bucket");
-            assert_eq!(s3_config.path, "uploads");
-        } else {
-            panic!("s3 FileStore not initiated");
-        }
-
-        assert_eq!("s3:", s3_store.prefix());
-        assert_eq!("s3%3A", s3_store.encoded());
-
-        assert_eq!(&fs_store, FileStore::get_subject_file_store(&appstate, "my-great-file"));
-        assert_eq!(&fs_store, FileStore::get_subject_file_store(&appstate, "fs:my-great-file"));
-        assert_eq!(&s3_store, FileStore::get_subject_file_store(&appstate, "s3:my-great-file"));
-    }
-}

server/src/handlers/upload.rs

@@ -9,11 +9,7 @@ use atomic_lib::{
 use futures::TryStreamExt;
 use serde::Deserialize;
 
-use crate::{
-    appstate::AppState,
-    errors::AtomicServerResult,
-    helpers::get_client_agent,
-};
+use crate::{appstate::AppState, errors::AtomicServerResult, helpers::get_client_agent};
 
 #[derive(Deserialize, Debug)]
 pub struct UploadQuery {

server/src/tests.rs

@@ -2,7 +2,7 @@
 //! Most of the more rigorous testing is done in the end-to-end tests:
 //! https://github.com/atomicdata-dev/atomic-data-browser/tree/main/data-browser/tests
 
-use crate::{appstate::AppState, config::Opts};
+use crate::{appstate::AppState, config::Opts, files::FileStore};
 
 use super::*;
 use actix_web::{
@@ -163,3 +163,75 @@ fn get_body(resp: ServiceResponse) -> String {
     let bytes = boxbody.try_into_bytes().unwrap();
     String::from_utf8(bytes.as_ref().into()).unwrap()
 }
+
+#[actix_rt::test]
+async fn file_store_tests() {
+    let unique_string = atomic_lib::utils::random_string(10);
+    use clap::Parser;
+    let mut opts = Opts::parse_from([
+        "atomic-server",
+        "--initialize",
+        "--data-dir",
+        &format!("./.temp/{}/db", unique_string),
+        "--config-dir",
+        &format!("./.temp/{}/config", unique_string),
+    ]);
+
+    let mut config = config::build_config(opts.clone())
+        .map_err(|e| format!("Initialization failed: {}", e))
+        .expect("failed init config");
+
+    let fs_store = FileStore::init_fs_from_config(&config);
+    if let FileStore::FS(fs_config) = &fs_store {
+        assert!(fs_config.path.to_str().unwrap().contains("uploads"));
+    } else {
+        panic!("fs FileStore not initiated");
+    }
+    let store = FileStore::init_from_config(&config, fs_store.clone());
+    assert_eq!(fs_store, store);
+    assert_eq!("fs:", fs_store.prefix());
+    assert_eq!("fs%3A", fs_store.encoded());
+
+    assert!(fs_store
+        .get_fs_file_path("my-great-file")
+        .unwrap()
+        .to_str()
+        .unwrap()
+        .contains("uploads/my-great-file"));
+    assert!(fs_store
+        .get_fs_file_path("fs:my-great-file")
+        .unwrap()
+        .to_str()
+        .unwrap()
+        .contains("uploads/my-great-file"));
+
+    // FileStore::S3 init
+    opts.s3_bucket = Some("test-bucket".to_string());
+    opts.s3_path = Some("uploads".to_string());
+    config.opts = opts;
+    let appstate = crate::appstate::init(config.clone()).expect("failed init appstate");
+
+    let s3_store = FileStore::init_from_config(&config, fs_store.clone());
+    if let FileStore::S3(s3_config) = &s3_store {
+        assert_eq!(s3_config.bucket, "test-bucket");
+        assert_eq!(s3_config.path, "uploads");
+    } else {
+        panic!("s3 FileStore not initiated");
+    }
+
+    assert_eq!("s3:", s3_store.prefix());
+    assert_eq!("s3%3A", s3_store.encoded());
+
+    assert_eq!(
+        &fs_store,
+        FileStore::get_subject_file_store(&appstate, "my-great-file")
+    );
+    assert_eq!(
+        &fs_store,
+        FileStore::get_subject_file_store(&appstate, "fs:my-great-file")
+    );
+    assert_eq!(
+        &s3_store,
+        FileStore::get_subject_file_store(&appstate, "s3:my-great-file")
+    );
+}