From 6698c00f78633eac22c569bd16c47a1f3464b4c3 Mon Sep 17 00:00:00 2001 From: Namekuji Date: Sat, 27 May 2023 06:52:15 -0400 Subject: [PATCH] rename test modules --- .../native-utils/crates/database/src/lib.rs | 4 +- .../crates/model/src/schema/antenna.rs | 8 +- .../crates/model/src/schema/app.rs | 6 +- .../native-utils/crates/model/tests/common.rs | 12 +- .../crates/model/tests/repository/antenna.rs | 106 +++++++++--------- .../native-utils/crates/util/src/id.rs | 4 +- .../native-utils/crates/util/src/random.rs | 4 +- packages/backend/native-utils/package.json | 4 +- 8 files changed, 77 insertions(+), 71 deletions(-) diff --git a/packages/backend/native-utils/crates/database/src/lib.rs b/packages/backend/native-utils/crates/database/src/lib.rs index 28c0a6ed45..6907a12816 100644 --- a/packages/backend/native-utils/crates/database/src/lib.rs +++ b/packages/backend/native-utils/crates/database/src/lib.rs @@ -17,12 +17,12 @@ pub fn get_database() -> Result<&'static DatabaseConnection, Error> { } #[cfg(test)] -mod tests { +mod unit_test { use super::get_database; use crate::error::Error; #[test] - fn unit_lib_error_uninitialized() { + fn error_uninitialized() { assert_eq!(get_database().unwrap_err(), Error::Uninitialized); } } diff --git a/packages/backend/native-utils/crates/model/src/schema/antenna.rs b/packages/backend/native-utils/crates/model/src/schema/antenna.rs index 3f4c40ccb7..d5f19a96f7 100644 --- a/packages/backend/native-utils/crates/model/src/schema/antenna.rs +++ b/packages/backend/native-utils/crates/model/src/schema/antenna.rs @@ -60,7 +60,7 @@ pub static VALIDATOR: Lazy = Lazy::new(|| Antenna::validator()); // ---- #[cfg(test)] -mod tests { +mod unit_test { use serde_json::json; use crate::{entity::sea_orm_active_enums::AntennaSrcEnum, schema::antenna::AntennaSrc}; @@ -68,13 +68,13 @@ mod tests { use super::VALIDATOR; #[test] - fn unit_schema_src_from_active_enum() { + fn src_from_active_enum() { let src = AntennaSrc::try_from(AntennaSrcEnum::All).unwrap(); assert_eq!(src, AntennaSrc::All); } #[test] - fn unit_schema_antenna_valid() { + fn antenna_valid() { let instance = json!({ "id": "9f4x0bkx1u", "createdAt": "2023-05-24T06:56:14.323Z", @@ -98,7 +98,7 @@ mod tests { } #[test] - fn unit_schema_antenna_invalid() { + fn antenna_invalid() { let instance = json!({ // "id" is required "id": null, diff --git a/packages/backend/native-utils/crates/model/src/schema/app.rs b/packages/backend/native-utils/crates/model/src/schema/app.rs index 0b18ebedac..b45cad6d66 100644 --- a/packages/backend/native-utils/crates/model/src/schema/app.rs +++ b/packages/backend/native-utils/crates/model/src/schema/app.rs @@ -94,14 +94,14 @@ impl Schema for App {} pub static VALIDATOR: Lazy = Lazy::new(|| App::validator()); #[cfg(test)] -mod tests { +mod unit_test { #[test] - fn unit_schema_app_valid() { + fn valid() { todo!(); } #[test] - fn unit_shcmea_app_invalid() { + fn invalid() { todo!(); } } diff --git a/packages/backend/native-utils/crates/model/tests/common.rs b/packages/backend/native-utils/crates/model/tests/common.rs index 9fd8815d3b..38c6160711 100644 --- a/packages/backend/native-utils/crates/model/tests/common.rs +++ b/packages/backend/native-utils/crates/model/tests/common.rs @@ -81,8 +81,12 @@ async fn setup_model(db: &DatabaseConnection) { .expect("Unable to setup predefined models"); } -#[tokio::test] -async fn inte_common_prepare_and_cleanup() { - prepare().await; - cleanup().await; +mod it_test { + use super::{cleanup, prepare}; + + #[tokio::test] + async fn can_prepare_and_cleanup() { + prepare().await; + cleanup().await; + } } diff --git a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs index 42fd3b4bd0..7f3aac74d0 100644 --- a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs +++ b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs @@ -1,60 +1,62 @@ -use model::{ - entity::{antenna, user}, - repository::Repository, - schema, -}; -use sea_orm::{ColumnTrait, EntityTrait, QueryFilter}; +mod it_test { + use model::{ + entity::{antenna, user}, + repository::Repository, + schema, + }; + use sea_orm::{ColumnTrait, EntityTrait, QueryFilter}; -use crate::{cleanup, prepare}; + use crate::{cleanup, prepare}; -#[tokio::test] -async fn inte_repository_antenna_can_pack() { - prepare().await; + #[tokio::test] + async fn can_pack() { + prepare().await; - let db = database::get_database().unwrap(); + let db = database::get_database().unwrap(); - let alice_antenna = user::Entity::find() - .filter(user::Column::Username.eq("alice")) - .find_also_related(antenna::Entity) - .one(db) - .await - .unwrap() - .expect("alice not found") - .1 - .expect("alice's antenna not found"); + let alice_antenna = user::Entity::find() + .filter(user::Column::Username.eq("alice")) + .find_also_related(antenna::Entity) + .one(db) + .await + .unwrap() + .expect("alice not found") + .1 + .expect("alice's antenna not found"); - let packed = alice_antenna - .to_owned() - .pack() - .await - .expect("Unable to pack"); + let packed = alice_antenna + .to_owned() + .pack() + .await + .expect("Unable to pack"); - assert_eq!( - packed, - schema::antenna::Antenna { - id: alice_antenna.id, - created_at: alice_antenna.created_at.into(), - name: "Test Antenna".to_string(), - keywords: vec![ - vec!["foo".to_string(), "bar".to_string()], - vec!["foobar".to_string()] - ], - exclude_keywords: vec![ - vec!["abc".to_string()], - vec!["def".to_string(), "ghi".to_string()] - ], - src: schema::antenna::AntennaSrc::All, - user_list_id: None, - user_group_id: None, - users: vec![], - instances: vec![], - case_sensitive: true, - notify: true, - with_replies: false, - with_file: false, - has_unread_note: false, - } - ); + assert_eq!( + packed, + schema::antenna::Antenna { + id: alice_antenna.id, + created_at: alice_antenna.created_at.into(), + name: "Test Antenna".to_string(), + keywords: vec![ + vec!["foo".to_string(), "bar".to_string()], + vec!["foobar".to_string()] + ], + exclude_keywords: vec![ + vec!["abc".to_string()], + vec!["def".to_string(), "ghi".to_string()] + ], + src: schema::antenna::AntennaSrc::All, + user_list_id: None, + user_group_id: None, + users: vec![], + instances: vec![], + case_sensitive: true, + notify: true, + with_replies: false, + with_file: false, + has_unread_note: false, + } + ); - cleanup().await; + cleanup().await; + } } diff --git a/packages/backend/native-utils/crates/util/src/id.rs b/packages/backend/native-utils/crates/util/src/id.rs index 94f20a8479..2831ef79dd 100644 --- a/packages/backend/native-utils/crates/util/src/id.rs +++ b/packages/backend/native-utils/crates/util/src/id.rs @@ -21,13 +21,13 @@ pub fn create_id() -> Result { } #[cfg(test)] -mod tests { +mod unit_test { use std::thread; use crate::id; #[test] - fn unit_id_can_generate() { + fn can_generate_unique_ids() { assert_eq!(id::create_id(), Err(id::ErrorUninitialized)); id::init_id(12); assert_eq!(id::create_id().unwrap().len(), 12); diff --git a/packages/backend/native-utils/crates/util/src/random.rs b/packages/backend/native-utils/crates/util/src/random.rs index c197298c77..1c4a20d50f 100644 --- a/packages/backend/native-utils/crates/util/src/random.rs +++ b/packages/backend/native-utils/crates/util/src/random.rs @@ -9,13 +9,13 @@ pub fn gen_string(length: u16) -> String { } #[cfg(test)] -mod tests { +mod unit_test { use std::thread; use super::gen_string; #[test] - fn unit_random_can_generate_string() { + fn can_generate_unique_strings() { assert_eq!(gen_string(16).len(), 16); assert_ne!(gen_string(16), gen_string(16)); let s1 = thread::spawn(|| gen_string(16)); diff --git a/packages/backend/native-utils/package.json b/packages/backend/native-utils/package.json index c82826d69b..60f14260dd 100644 --- a/packages/backend/native-utils/package.json +++ b/packages/backend/native-utils/package.json @@ -40,7 +40,7 @@ "test": "ava", "universal": "napi universal", "version": "napi version", - "cargo:unit": "cargo test --workspace unit", - "cargo:integration": "cargo test --workspace inte -- --test-threads=1" + "cargo:unit": "cargo test --workspace unit_test", + "cargo:integration": "cargo test --workspace it_test -- --test-threads=1" } }