Skip to content

Commit b172d51

Browse files
tyranrontyranron
committed
Get rid of deprecated chrono functions in juniper tests
1 parent f1ecde2 commit b172d51

File tree

1 file changed

+56
-48
lines changed

1 file changed

+56
-48
lines changed

‎juniper/src/integrations/chrono.rs

Lines changed: 56 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,8 @@ mod date_test {
337337
#[test]
338338
fn parses_correct_input() {
339339
for (raw, expected) in [
340-
("1996-12-19", Date::from_ymd(1996, 12, 19)),
341-
("1564-01-30", Date::from_ymd(1564, 01, 30)),
340+
("1996-12-19", Date::from_ymd_opt(1996, 12, 19)),
341+
("1564-01-30", Date::from_ymd_opt(1564, 01, 30)),
342342
] {
343343
let input: InputValue = graphql_input_value!((raw));
344344
let parsed = Date::from_input_value(&input);
@@ -348,7 +348,7 @@ mod date_test {
348348
"failed to parse `{raw}`: {:?}",
349349
parsed.unwrap_err(),
350350
);
351-
assert_eq!(parsed.unwrap(), expected, "input: {raw}");
351+
assert_eq!(parsed.unwrap(), expected.unwrap(), "input: {raw}");
352352
}
353353
}
354354

@@ -379,18 +379,19 @@ mod date_test {
379379
fn formats_correctly() {
380380
for (val, expected) in [
381381
(
382-
Date::from_ymd(1996, 12, 19),
382+
Date::from_ymd_opt(1996, 12, 19),
383383
graphql_input_value!("1996-12-19"),
384384
),
385385
(
386-
Date::from_ymd(1564, 01, 30),
386+
Date::from_ymd_opt(1564, 01, 30),
387387
graphql_input_value!("1564-01-30"),
388388
),
389389
(
390-
Date::from_ymd(2020, 01, 01),
390+
Date::from_ymd_opt(2020, 01, 01),
391391
graphql_input_value!("2020-01-01"),
392392
),
393393
] {
394+
let val = val.unwrap();
394395
let actual: InputValue = val.to_input_value();
395396

396397
assert_eq!(actual, expected, "on value: {val}");
@@ -407,12 +408,15 @@ mod local_time_test {
407408
#[test]
408409
fn parses_correct_input() {
409410
for (raw, expected) in [
410-
("14:23:43", LocalTime::from_hms(14, 23, 43)),
411-
("14:00:00", LocalTime::from_hms(14, 00, 00)),
412-
("14:00", LocalTime::from_hms(14, 00, 00)),
413-
("14:32", LocalTime::from_hms(14, 32, 00)),
414-
("14:00:00.000", LocalTime::from_hms(14, 00, 00)),
415-
("14:23:43.345", LocalTime::from_hms_milli(14, 23, 43, 345)),
411+
("14:23:43", LocalTime::from_hms_opt(14, 23, 43)),
412+
("14:00:00", LocalTime::from_hms_opt(14, 00, 00)),
413+
("14:00", LocalTime::from_hms_opt(14, 00, 00)),
414+
("14:32", LocalTime::from_hms_opt(14, 32, 00)),
415+
("14:00:00.000", LocalTime::from_hms_opt(14, 00, 00)),
416+
(
417+
"14:23:43.345",
418+
LocalTime::from_hms_milli_opt(14, 23, 43, 345),
419+
),
416420
] {
417421
let input: InputValue = graphql_input_value!((raw));
418422
let parsed = LocalTime::from_input_value(&input);
@@ -422,7 +426,7 @@ mod local_time_test {
422426
"failed to parse `{raw}`: {:?}",
423427
parsed.unwrap_err(),
424428
);
425-
assert_eq!(parsed.unwrap(), expected, "input: {raw}");
429+
assert_eq!(parsed.unwrap(), expected.unwrap(), "input: {raw}");
426430
}
427431
}
428432

@@ -457,22 +461,23 @@ mod local_time_test {
457461
fn formats_correctly() {
458462
for (val, expected) in [
459463
(
460-
LocalTime::from_hms_micro(1, 2, 3, 4005),
464+
LocalTime::from_hms_micro_opt(1, 2, 3, 4005),
461465
graphql_input_value!("01:02:03.004"),
462466
),
463467
(
464-
LocalTime::from_hms(0, 0, 0),
468+
LocalTime::from_hms_opt(0, 0, 0),
465469
graphql_input_value!("00:00:00"),
466470
),
467471
(
468-
LocalTime::from_hms(12, 0, 0),
472+
LocalTime::from_hms_opt(12, 0, 0),
469473
graphql_input_value!("12:00:00"),
470474
),
471475
(
472-
LocalTime::from_hms(1, 2, 3),
476+
LocalTime::from_hms_opt(1, 2, 3),
473477
graphql_input_value!("01:02:03"),
474478
),
475479
] {
480+
let val = val.unwrap();
476481
let actual: InputValue = val.to_input_value();
477482

478483
assert_eq!(actual, expected, "on value: {val}");
@@ -494,15 +499,15 @@ mod local_date_time_test {
494499
(
495500
"1996-12-19 14:23:43",
496501
LocalDateTime::new(
497-
NaiveDate::from_ymd(1996, 12, 19),
498-
NaiveTime::from_hms(14, 23, 43),
502+
NaiveDate::from_ymd_opt(1996, 12, 19).unwrap(),
503+
NaiveTime::from_hms_opt(14, 23, 43).unwrap(),
499504
),
500505
),
501506
(
502507
"1564-01-30 14:00:00",
503508
LocalDateTime::new(
504-
NaiveDate::from_ymd(1564, 1, 30),
505-
NaiveTime::from_hms(14, 00, 00),
509+
NaiveDate::from_ymd_opt(1564, 1, 30).unwrap(),
510+
NaiveTime::from_hms_opt(14, 00, 00).unwrap(),
506511
),
507512
),
508513
] {
@@ -552,15 +557,15 @@ mod local_date_time_test {
552557
for (val, expected) in [
553558
(
554559
LocalDateTime::new(
555-
NaiveDate::from_ymd(1996, 12, 19),
556-
NaiveTime::from_hms(0, 0, 0),
560+
NaiveDate::from_ymd_opt(1996, 12, 19).unwrap(),
561+
NaiveTime::from_hms_opt(0, 0, 0).unwrap(),
557562
),
558563
graphql_input_value!("1996-12-19 00:00:00"),
559564
),
560565
(
561566
LocalDateTime::new(
562-
NaiveDate::from_ymd(1564, 1, 30),
563-
NaiveTime::from_hms(14, 0, 0),
567+
NaiveDate::from_ymd_opt(1564, 1, 30).unwrap(),
568+
NaiveTime::from_hms_opt(14, 0, 0).unwrap(),
564569
),
565570
graphql_input_value!("1564-01-30 14:00:00"),
566571
),
@@ -590,40 +595,40 @@ mod date_time_test {
590595
"2014-11-28T21:00:09+09:00",
591596
DateTime::<FixedOffset>::from_utc(
592597
NaiveDateTime::new(
593-
NaiveDate::from_ymd(2014, 11, 28),
594-
NaiveTime::from_hms(12, 0, 9),
598+
NaiveDate::from_ymd_opt(2014, 11, 28).unwrap(),
599+
NaiveTime::from_hms_opt(12, 0, 9).unwrap(),
595600
),
596-
FixedOffset::east(9 * 3600),
601+
FixedOffset::east_opt(9 * 3600).unwrap(),
597602
),
598603
),
599604
(
600605
"2014-11-28T21:00:09Z",
601606
DateTime::<FixedOffset>::from_utc(
602607
NaiveDateTime::new(
603-
NaiveDate::from_ymd(2014, 11, 28),
604-
NaiveTime::from_hms(21, 0, 9),
608+
NaiveDate::from_ymd_opt(2014, 11, 28).unwrap(),
609+
NaiveTime::from_hms_opt(21, 0, 9).unwrap(),
605610
),
606-
FixedOffset::east(0),
611+
FixedOffset::east_opt(0).unwrap(),
607612
),
608613
),
609614
(
610615
"2014-11-28T21:00:09+00:00",
611616
DateTime::<FixedOffset>::from_utc(
612617
NaiveDateTime::new(
613-
NaiveDate::from_ymd(2014, 11, 28),
614-
NaiveTime::from_hms(21, 0, 9),
618+
NaiveDate::from_ymd_opt(2014, 11, 28).unwrap(),
619+
NaiveTime::from_hms_opt(21, 0, 9).unwrap(),
615620
),
616-
FixedOffset::east(0),
621+
FixedOffset::east_opt(0).unwrap(),
617622
),
618623
),
619624
(
620625
"2014-11-28T21:00:09.05+09:00",
621626
DateTime::<FixedOffset>::from_utc(
622627
NaiveDateTime::new(
623-
NaiveDate::from_ymd(2014, 11, 28),
624-
NaiveTime::from_hms_milli(12, 0, 9, 50),
628+
NaiveDate::from_ymd_opt(2014, 11, 28).unwrap(),
629+
NaiveTime::from_hms_milli_opt(12, 0, 9, 50).unwrap(),
625630
),
626-
FixedOffset::east(0),
631+
FixedOffset::east_opt(0).unwrap(),
627632
),
628633
),
629634
] {
@@ -679,20 +684,20 @@ mod date_time_test {
679684
(
680685
DateTime::<FixedOffset>::from_utc(
681686
NaiveDateTime::new(
682-
NaiveDate::from_ymd(1996, 12, 19),
683-
NaiveTime::from_hms(0, 0, 0),
687+
NaiveDate::from_ymd_opt(1996, 12, 19).unwrap(),
688+
NaiveTime::from_hms_opt(0, 0, 0).unwrap(),
684689
),
685-
FixedOffset::east(0),
690+
FixedOffset::east_opt(0).unwrap(),
686691
),
687692
graphql_input_value!("1996-12-19T00:00:00Z"),
688693
),
689694
(
690695
DateTime::<FixedOffset>::from_utc(
691696
NaiveDateTime::new(
692-
NaiveDate::from_ymd(1564, 1, 30),
693-
NaiveTime::from_hms_milli(5, 0, 0, 123),
697+
NaiveDate::from_ymd_opt(1564, 1, 30).unwrap(),
698+
NaiveTime::from_hms_milli_opt(5, 0, 0, 123).unwrap(),
694699
),
695-
FixedOffset::east(9 * 3600),
700+
FixedOffset::east_opt(9 * 3600).unwrap(),
696701
),
697702
graphql_input_value!("1564-01-30T05:00:00.123Z"),
698703
),
@@ -760,22 +765,25 @@ mod integration_test {
760765
#[graphql_object]
761766
impl Root {
762767
fn date() -> Date {
763-
Date::from_ymd(2015, 3, 14)
768+
Date::from_ymd_opt(2015, 3, 14).unwrap()
764769
}
765770

766771
fn local_time() -> LocalTime {
767-
LocalTime::from_hms(16, 7, 8)
772+
LocalTime::from_hms_opt(16, 7, 8).unwrap()
768773
}
769774

770775
fn local_date_time() -> LocalDateTime {
771-
LocalDateTime::new(Date::from_ymd(2016, 7, 8), LocalTime::from_hms(9, 10, 11))
776+
LocalDateTime::new(
777+
Date::from_ymd_opt(2016, 7, 8).unwrap(),
778+
LocalTime::from_hms_opt(9, 10, 11).unwrap(),
779+
)
772780
}
773781

774782
fn date_time() -> DateTime<chrono::Utc> {
775783
DateTime::from_utc(
776784
LocalDateTime::new(
777-
Date::from_ymd(1996, 12, 20),
778-
LocalTime::from_hms(0, 39, 57),
785+
Date::from_ymd_opt(1996, 12, 20).unwrap(),
786+
LocalTime::from_hms_opt(0, 39, 57).unwrap(),
779787
),
780788
chrono::Utc,
781789
)

0 commit comments

Comments
 (0)