Skip to content

Commit 60283ab

Browse files
pitdickerpitdicker
committed
Don't create strange leap seconds in tests
1 parent 03a12c7 commit 60283ab

File tree

4 files changed

+43
-43
lines changed

4 files changed

+43
-43
lines changed

‎src/naive/datetime/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1460,11 +1460,11 @@ impl Timelike for NaiveDateTime {
14601460
/// ```
14611461
/// use chrono::{NaiveDate, NaiveDateTime, Timelike};
14621462
///
1463-
/// let dt: NaiveDateTime = NaiveDate::from_ymd_opt(2015, 9, 8).unwrap().and_hms_milli_opt(12, 34, 56, 789).unwrap();
1463+
/// let dt: NaiveDateTime = NaiveDate::from_ymd_opt(2015, 9, 8).unwrap().and_hms_milli_opt(12, 34, 59, 789).unwrap();
14641464
/// assert_eq!(dt.with_nanosecond(333_333_333),
1465-
/// Some(NaiveDate::from_ymd_opt(2015, 9, 8).unwrap().and_hms_nano_opt(12, 34, 56, 333_333_333).unwrap()));
1465+
/// Some(NaiveDate::from_ymd_opt(2015, 9, 8).unwrap().and_hms_nano_opt(12, 34, 59, 333_333_333).unwrap()));
14661466
/// assert_eq!(dt.with_nanosecond(1_333_333_333), // leap second
1467-
/// Some(NaiveDate::from_ymd_opt(2015, 9, 8).unwrap().and_hms_nano_opt(12, 34, 56, 1_333_333_333).unwrap()));
1467+
/// Some(NaiveDate::from_ymd_opt(2015, 9, 8).unwrap().and_hms_nano_opt(12, 34, 59, 1_333_333_333).unwrap()));
14681468
/// assert_eq!(dt.with_nanosecond(2_000_000_000), None);
14691469
/// ```
14701470
#[inline]

‎src/naive/time/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1022,9 +1022,9 @@ impl Timelike for NaiveTime {
10221022
///
10231023
/// ```
10241024
/// # use chrono::{NaiveTime, Timelike};
1025-
/// # let dt = NaiveTime::from_hms_nano_opt(23, 56, 4, 12_345_678).unwrap();
1026-
/// assert_eq!(dt.with_nanosecond(1_333_333_333),
1027-
/// Some(NaiveTime::from_hms_nano_opt(23, 56, 4, 1_333_333_333).unwrap()));
1025+
/// let dt = NaiveTime::from_hms_nano_opt(23, 56, 4, 12_345_678).unwrap();
1026+
/// let strange_leap_second = dt.with_nanosecond(1_333_333_333).unwrap();
1027+
/// assert_eq!(strange_leap_second.nanosecond(), 1_333_333_333);
10281028
/// ```
10291029
#[inline]
10301030
fn with_nanosecond(&self, nano: u32) -> Option<NaiveTime> {

‎src/naive/time/tests.rs

+31-31
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ fn test_time_from_hms_milli() {
1313
Some(NaiveTime::from_hms_nano_opt(3, 5, 7, 777_000_000).unwrap())
1414
);
1515
assert_eq!(
16-
NaiveTime::from_hms_milli_opt(3, 5, 7, 1_999),
17-
Some(NaiveTime::from_hms_nano_opt(3, 5, 7, 1_999_000_000).unwrap())
16+
NaiveTime::from_hms_milli_opt(3, 5, 59, 1_999),
17+
Some(NaiveTime::from_hms_nano_opt(3, 5, 59, 1_999_000_000).unwrap())
1818
);
19-
assert_eq!(NaiveTime::from_hms_milli_opt(3, 5, 7, 2_000), None);
20-
assert_eq!(NaiveTime::from_hms_milli_opt(3, 5, 7, 5_000), None); // overflow check
21-
assert_eq!(NaiveTime::from_hms_milli_opt(3, 5, 7, u32::MAX), None);
19+
assert_eq!(NaiveTime::from_hms_milli_opt(3, 5, 59, 2_000), None);
20+
assert_eq!(NaiveTime::from_hms_milli_opt(3, 5, 59, 5_000), None); // overflow check
21+
assert_eq!(NaiveTime::from_hms_milli_opt(3, 5, 59, u32::MAX), None);
2222
}
2323

2424
#[test]
@@ -36,12 +36,12 @@ fn test_time_from_hms_micro() {
3636
Some(NaiveTime::from_hms_nano_opt(3, 5, 7, 777_777_000).unwrap())
3737
);
3838
assert_eq!(
39-
NaiveTime::from_hms_micro_opt(3, 5, 7, 1_999_999),
40-
Some(NaiveTime::from_hms_nano_opt(3, 5, 7, 1_999_999_000).unwrap())
39+
NaiveTime::from_hms_micro_opt(3, 5, 59, 1_999_999),
40+
Some(NaiveTime::from_hms_nano_opt(3, 5, 59, 1_999_999_000).unwrap())
4141
);
42-
assert_eq!(NaiveTime::from_hms_micro_opt(3, 5, 7, 2_000_000), None);
43-
assert_eq!(NaiveTime::from_hms_micro_opt(3, 5, 7, 5_000_000), None); // overflow check
44-
assert_eq!(NaiveTime::from_hms_micro_opt(3, 5, 7, u32::MAX), None);
42+
assert_eq!(NaiveTime::from_hms_micro_opt(3, 5, 59, 2_000_000), None);
43+
assert_eq!(NaiveTime::from_hms_micro_opt(3, 5, 59, 5_000_000), None); // overflow check
44+
assert_eq!(NaiveTime::from_hms_micro_opt(3, 5, 59, u32::MAX), None);
4545
}
4646

4747
#[test]
@@ -94,19 +94,19 @@ fn test_time_add() {
9494

9595
let hmsm = |h, m, s, ms| NaiveTime::from_hms_milli_opt(h, m, s, ms).unwrap();
9696

97-
check!(hmsm(3, 5, 7, 900), OldDuration::zero(), hmsm(3, 5, 7, 900));
98-
check!(hmsm(3, 5, 7, 900), OldDuration::milliseconds(100), hmsm(3, 5, 8, 0));
99-
check!(hmsm(3, 5, 7, 1_300), OldDuration::milliseconds(-1800), hmsm(3, 5, 6, 500));
100-
check!(hmsm(3, 5, 7, 1_300), OldDuration::milliseconds(-800), hmsm(3, 5, 7, 500));
101-
check!(hmsm(3, 5, 7, 1_300), OldDuration::milliseconds(-100), hmsm(3, 5, 7, 1_200));
102-
check!(hmsm(3, 5, 7, 1_300), OldDuration::milliseconds(100), hmsm(3, 5, 7, 1_400));
103-
check!(hmsm(3, 5, 7, 1_300), OldDuration::milliseconds(800), hmsm(3, 5, 8, 100));
104-
check!(hmsm(3, 5, 7, 1_300), OldDuration::milliseconds(1800), hmsm(3, 5, 9, 100));
105-
check!(hmsm(3, 5, 7, 900), OldDuration::seconds(86399), hmsm(3, 5, 6, 900)); // overwrap
106-
check!(hmsm(3, 5, 7, 900), OldDuration::seconds(-86399), hmsm(3, 5, 8, 900));
107-
check!(hmsm(3, 5, 7, 900), OldDuration::days(12345), hmsm(3, 5, 7, 900));
108-
check!(hmsm(3, 5, 7, 1_300), OldDuration::days(1), hmsm(3, 5, 7, 300));
109-
check!(hmsm(3, 5, 7, 1_300), OldDuration::days(-1), hmsm(3, 5, 8, 300));
97+
check!(hmsm(3, 5, 59, 900), OldDuration::zero(), hmsm(3, 5, 59, 900));
98+
check!(hmsm(3, 5, 59, 900), OldDuration::milliseconds(100), hmsm(3, 6, 0, 0));
99+
check!(hmsm(3, 5, 59, 1_300), OldDuration::milliseconds(-1800), hmsm(3, 5, 58, 500));
100+
check!(hmsm(3, 5, 59, 1_300), OldDuration::milliseconds(-800), hmsm(3, 5, 59, 500));
101+
check!(hmsm(3, 5, 59, 1_300), OldDuration::milliseconds(-100), hmsm(3, 5, 59, 1_200));
102+
check!(hmsm(3, 5, 59, 1_300), OldDuration::milliseconds(100), hmsm(3, 5, 59, 1_400));
103+
check!(hmsm(3, 5, 59, 1_300), OldDuration::milliseconds(800), hmsm(3, 6, 0, 100));
104+
check!(hmsm(3, 5, 59, 1_300), OldDuration::milliseconds(1800), hmsm(3, 6, 1, 100));
105+
check!(hmsm(3, 5, 59, 900), OldDuration::seconds(86399), hmsm(3, 5, 58, 900)); // overwrap
106+
check!(hmsm(3, 5, 59, 900), OldDuration::seconds(-86399), hmsm(3, 6, 0, 900));
107+
check!(hmsm(3, 5, 59, 900), OldDuration::days(12345), hmsm(3, 5, 59, 900));
108+
check!(hmsm(3, 5, 59, 1_300), OldDuration::days(1), hmsm(3, 5, 59, 300));
109+
check!(hmsm(3, 5, 59, 1_300), OldDuration::days(-1), hmsm(3, 6, 0, 300));
110110

111111
// regression tests for #37
112112
check!(hmsm(0, 0, 0, 0), OldDuration::milliseconds(-990), hmsm(23, 59, 59, 10));
@@ -132,12 +132,12 @@ fn test_time_overflowing_add() {
132132

133133
// overflowing_add_signed with leap seconds may be counter-intuitive
134134
assert_eq!(
135-
hmsm(3, 4, 5, 1_678).overflowing_add_signed(OldDuration::days(1)),
136-
(hmsm(3, 4, 5, 678), 86_400)
135+
hmsm(3, 4, 59, 1_678).overflowing_add_signed(OldDuration::days(1)),
136+
(hmsm(3, 4, 59, 678), 86_400)
137137
);
138138
assert_eq!(
139-
hmsm(3, 4, 5, 1_678).overflowing_add_signed(OldDuration::days(-1)),
140-
(hmsm(3, 4, 6, 678), -86_400)
139+
hmsm(3, 4, 59, 1_678).overflowing_add_signed(OldDuration::days(-1)),
140+
(hmsm(3, 5, 0, 678), -86_400)
141141
);
142142
}
143143

@@ -184,14 +184,14 @@ fn test_time_sub() {
184184

185185
// treats the leap second as if it coincides with the prior non-leap second,
186186
// as required by `time1 - time2 = duration` and `time2 - time1 = -duration` equivalence.
187-
check!(hmsm(3, 5, 7, 200), hmsm(3, 5, 6, 1_800), OldDuration::milliseconds(400));
188-
check!(hmsm(3, 5, 7, 1_200), hmsm(3, 5, 6, 1_800), OldDuration::milliseconds(1400));
189-
check!(hmsm(3, 5, 7, 1_200), hmsm(3, 5, 6, 800), OldDuration::milliseconds(1400));
187+
check!(hmsm(3, 6, 0, 200), hmsm(3, 5, 59, 1_800), OldDuration::milliseconds(400));
188+
//check!(hmsm(3, 5, 7, 1_200), hmsm(3, 5, 6, 1_800), OldDuration::milliseconds(1400));
189+
//check!(hmsm(3, 5, 7, 1_200), hmsm(3, 5, 6, 800), OldDuration::milliseconds(1400));
190190

191191
// additional equality: `time1 + duration = time2` is equivalent to
192192
// `time2 - time1 = duration` IF AND ONLY IF `time2` represents a non-leap second.
193193
assert_eq!(hmsm(3, 5, 6, 800) + OldDuration::milliseconds(400), hmsm(3, 5, 7, 200));
194-
assert_eq!(hmsm(3, 5, 6, 1_800) + OldDuration::milliseconds(400), hmsm(3, 5, 7, 200));
194+
//assert_eq!(hmsm(3, 5, 6, 1_800) + OldDuration::milliseconds(400), hmsm(3, 5, 7, 200));
195195
}
196196

197197
#[test]

‎src/round.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -760,16 +760,16 @@ mod tests {
760760

761761
#[test]
762762
fn issue1010() {
763-
let dt = NaiveDateTime::from_timestamp_opt(-4227854320, 1678774288).unwrap();
764-
let span = Duration::microseconds(-7019067213869040);
763+
let dt = NaiveDateTime::from_timestamp_opt(-4_227_854_320, 678_774_288).unwrap();
764+
let span = Duration::microseconds(-7_019_067_213_869_040);
765765
assert_eq!(dt.duration_trunc(span), Err(RoundingError::DurationExceedsLimit));
766766

767-
let dt = NaiveDateTime::from_timestamp_opt(320041586, 1920103021).unwrap();
768-
let span = Duration::nanoseconds(-8923838508697114584);
767+
let dt = NaiveDateTime::from_timestamp_opt(320_041_586, 920_103_021).unwrap();
768+
let span = Duration::nanoseconds(-8_923_838_508_697_114_584);
769769
assert_eq!(dt.duration_round(span), Err(RoundingError::DurationExceedsLimit));
770770

771-
let dt = NaiveDateTime::from_timestamp_opt(-2621440, 0).unwrap();
772-
let span = Duration::nanoseconds(-9223372036854771421);
771+
let dt = NaiveDateTime::from_timestamp_opt(-2_621_440, 0).unwrap();
772+
let span = Duration::nanoseconds(-9_223_372_036_854_771_421);
773773
assert_eq!(dt.duration_round(span), Err(RoundingError::DurationExceedsLimit));
774774
}
775775
}

0 commit comments

Comments
 (0)