Skip to content

fix: use cfg-if for conditional feature in unit test #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DanielleHuisman merged 1 commit into from
Jan 5, 2026
Merged

fix: use cfg-if for conditional feature in unit test #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/fortifier/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ utoipa = { workspace = true, optional = true }
uuid = { workspace = true, optional = true }

[dev-dependencies]
cfg-if = "1.0.4"
pretty_assertions.workspace = true
rust_decimal = { workspace = true, features = ["macros"] }
serde_json.workspace = true
Expand Down
129 changes: 69 additions & 60 deletions packages/fortifier/tests/serde.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#![cfg(feature = "serde")]

use cfg_if::cfg_if;
use fortifier::{
EmailAddressError, LengthError, LengthErrorCode, RegexError, UrlError, ValidationErrors,
};
Expand All @@ -18,66 +19,74 @@ enum TestError {
}

fn setup() -> (ValidationErrors<TestError>, Value) {
(
ValidationErrors::from_iter([
TestError::EmailAddress(EmailAddressError::from(
email_address::Error::MissingSeparator,
)),
TestError::Length(LengthError::Equal {
equal: 1,
value: 2,
code: LengthErrorCode,
#[cfg(feature = "message")]
message: "length 2 is not equal to required length 1".to_owned(),
}),
TestError::Regex(RegexError::default()),
TestError::Url(UrlError::from(ParseError::EmptyHost)),
]),
#[cfg(not(feature = "message"))]
json!([
{
"code": "emailAddress",
"subcode": "missingSeparator",
},
{
"code": "length",
"subcode": "equal",
"equal": 1,
"value": 2,
},
{
"code": "regex",
},
{
"code": "url",
"subcode": "emptyHost",
}
]),
#[cfg(feature = "message")]
json!([
{
"code": "emailAddress",
"subcode": "missingSeparator",
"message": "",
},
{
"code": "length",
"subcode": "equal",
"equal": 1,
"value": 2,
"message": "length 2 is not equal to required length 1",
},
{
"code": "regex",
"message": "value does not match regular expression",
},
{
"code": "url",
"subcode": "emptyHost",
"message": "empty host",
}
]),
)
let errors = ValidationErrors::from_iter([
TestError::EmailAddress(EmailAddressError::from(
email_address::Error::MissingSeparator,
)),
TestError::Length(LengthError::Equal {
equal: 1,
value: 2,
code: LengthErrorCode,
#[cfg(feature = "message")]
message: "length 2 is not equal to required length 1".to_owned(),
}),
TestError::Regex(RegexError::default()),
TestError::Url(UrlError::from(ParseError::EmptyHost)),
]);

cfg_if! {
if #[cfg(feature = "message")] {
(
errors,
json!([
{
"code": "emailAddress",
"subcode": "missingSeparator",
"message": "",
},
{
"code": "length",
"subcode": "equal",
"equal": 1,
"value": 2,
"message": "length 2 is not equal to required length 1",
},
{
"code": "regex",
"message": "value does not match regular expression",
},
{
"code": "url",
"subcode": "emptyHost",
"message": "empty host",
}
]),
)
} else {
(
errors,
json!([
{
"code": "emailAddress",
"subcode": "missingSeparator",
},
{
"code": "length",
"subcode": "equal",
"equal": 1,
"value": 2,
},
{
"code": "regex",
},
{
"code": "url",
"subcode": "emptyHost",
}
]),
)
}
}
}

#[test]
Expand Down
Loading