Built new error module to hold document name.
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1s
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1s
This commit is contained in:
@@ -33,8 +33,8 @@ impl Addition {
|
||||
}
|
||||
|
||||
impl MessageAction for Addition {
|
||||
fn doc_name(&self) -> NameType {
|
||||
self.doc_name.clone()
|
||||
fn doc_name(&self) -> &NameType {
|
||||
&self.doc_name
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,8 +46,9 @@ mod additions {
|
||||
#[test]
|
||||
fn is_default_addition_empty() {
|
||||
let doc_name = Name::english(Uuid::new_v4().to_string().as_str());
|
||||
let expected_name: NameType = doc_name.clone().into();
|
||||
let add = Addition::new(doc_name.clone());
|
||||
assert_eq!(add.doc_name(), doc_name.into());
|
||||
assert_eq!(add.doc_name(), &expected_name);
|
||||
assert_eq!(add.iter().count(), 0);
|
||||
}
|
||||
|
||||
|
||||
@@ -28,12 +28,12 @@ pub enum MsgAction {
|
||||
}
|
||||
|
||||
impl MessageAction for MsgAction {
|
||||
fn doc_name(&self) -> NameType {
|
||||
fn doc_name(&self) -> &NameType {
|
||||
match self {
|
||||
Self::Addition(data) => data.doc_name(),
|
||||
Self::Query(data) => data.doc_name(),
|
||||
Self::Create(data) => data.doc_name(),
|
||||
_ => NameType::None,
|
||||
_ => &NameType::None,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -144,10 +144,11 @@ mod msgactions {
|
||||
#[test]
|
||||
fn turn_query_into_action() {
|
||||
let name = Name::english(Uuid::new_v4().to_string().as_str());
|
||||
let expected_name: NameType = name.clone().into();
|
||||
let value = Query::new(name.clone());
|
||||
let result: MsgAction = value.into();
|
||||
match result {
|
||||
MsgAction::Query(data) => assert_eq!(data.doc_name(), name.into()),
|
||||
MsgAction::Query(data) => assert_eq!(data.doc_name(), &expected_name),
|
||||
_ => unreachable!("Got {:?}: dhould have been query", result),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,8 +52,8 @@ impl Query {
|
||||
}
|
||||
|
||||
impl MessageAction for Query {
|
||||
fn doc_name(&self) -> NameType {
|
||||
self.doc_name.clone()
|
||||
fn doc_name(&self) -> &NameType {
|
||||
&self.doc_name
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,14 +69,13 @@ mod queries {
|
||||
#[test]
|
||||
fn is_default_query_empty() {
|
||||
let name = Name::english(Uuid::new_v4().to_string().as_str());
|
||||
let expected_name: NameType = name.clone().into();
|
||||
let qry = Query::new(name.clone());
|
||||
let result = qry.doc_name();
|
||||
assert_eq!(
|
||||
result,
|
||||
name.clone().into(),
|
||||
result, &expected_name,
|
||||
"got {:?} should be {:?}",
|
||||
result,
|
||||
name
|
||||
result, name
|
||||
);
|
||||
assert_eq!(qry.iter().count(), 0, "query should be empty");
|
||||
}
|
||||
@@ -85,7 +84,7 @@ mod queries {
|
||||
fn does_internal_queries_return_none() {
|
||||
let qry = Query::internal();
|
||||
let result = qry.doc_name();
|
||||
assert_eq!(result, NameType::None, "got {:?} should be none", result);
|
||||
assert_eq!(result, &NameType::None, "got {:?} should be none", result);
|
||||
assert_eq!(qry.iter().count(), 0, "query should be empty");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user