Skip to content

Commit

Permalink
move validated_options tests to correct file
Browse files Browse the repository at this point in the history
  • Loading branch information
kartva committed Aug 21, 2024
1 parent 1e1f4d1 commit 87baccd
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 56 deletions.
57 changes: 1 addition & 56 deletions components/experimental/src/duration/format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -619,10 +619,7 @@ mod tests {
use writeable::assert_writeable_parts_eq;

use super::*;
use crate::duration::{
formatter::ValidatedDurationFormatterOptions,
validated_options::DurationFormatterOptionsError, DurationSign,
};
use crate::duration::{formatter::ValidatedDurationFormatterOptions, DurationSign};

#[test]
fn test_digital_formatter() {
Expand Down Expand Up @@ -728,56 +725,4 @@ mod tests {
]
);
}

#[test]
fn test_invalid_style_after_two_digit() {
let options = DurationFormatterOptions {
hour: Some(HourStyle::TwoDigit),
minute: Some(MinuteStyle::Long),
..Default::default()
};

assert_eq!(
ValidatedDurationFormatterOptions::validate(options),
Err(DurationFormatterOptionsError::PreviousNumeric)
);

let options = DurationFormatterOptions {
hour: Some(HourStyle::TwoDigit),
..options
};

assert_eq!(
ValidatedDurationFormatterOptions::validate(options),
Err(DurationFormatterOptionsError::PreviousNumeric)
);
}

#[test]
fn test_display_always_fractional_style() {
let options = DurationFormatterOptions {
millisecond: Some(MilliSecondStyle::Numeric),
millisecond_visibility: Some(FieldDisplay::Always),
..Default::default()
};

assert_eq!(
ValidatedDurationFormatterOptions::validate(options),
Err(DurationFormatterOptionsError::DisplayAlwaysFractional)
);
}

#[test]
fn test_previous_fractional() {
let options = DurationFormatterOptions {
millisecond: Some(MilliSecondStyle::Numeric),
nanosecond: Some(NanoSecondStyle::Long),
..Default::default()
};

assert_eq!(
ValidatedDurationFormatterOptions::validate(options),
Err(DurationFormatterOptionsError::PreviousFractional)
);
}
}
57 changes: 57 additions & 0 deletions components/experimental/src/duration/validated_options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -416,3 +416,60 @@ impl Unit {
}
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_invalid_style_after_two_digit() {
let options = DurationFormatterOptions {
hour: Some(HourStyle::TwoDigit),
minute: Some(MinuteStyle::Long),
..Default::default()
};

assert_eq!(
ValidatedDurationFormatterOptions::validate(options),
Err(DurationFormatterOptionsError::PreviousNumeric)
);

let options = DurationFormatterOptions {
hour: Some(HourStyle::TwoDigit),
..options
};

assert_eq!(
ValidatedDurationFormatterOptions::validate(options),
Err(DurationFormatterOptionsError::PreviousNumeric)
);
}

#[test]
fn test_display_always_fractional_style() {
let options = DurationFormatterOptions {
millisecond: Some(MilliSecondStyle::Numeric),
millisecond_visibility: Some(FieldDisplay::Always),
..Default::default()
};

assert_eq!(
ValidatedDurationFormatterOptions::validate(options),
Err(DurationFormatterOptionsError::DisplayAlwaysFractional)
);
}

#[test]
fn test_previous_fractional() {
let options = DurationFormatterOptions {
millisecond: Some(MilliSecondStyle::Numeric),
nanosecond: Some(NanoSecondStyle::Long),
..Default::default()
};

assert_eq!(
ValidatedDurationFormatterOptions::validate(options),
Err(DurationFormatterOptionsError::PreviousFractional)
);
}
}

0 comments on commit 87baccd

Please sign in to comment.