aboutsummaryrefslogtreecommitdiffstats
path: root/components/hyper_serde/tests
diff options
context:
space:
mode:
authorTaym Haddadi <haddadi.taym@gmail.com>2024-01-17 15:18:20 +0100
committerGitHub <noreply@github.com>2024-01-17 14:18:20 +0000
commit580062228bb083ccdc2144a43491bc4f916c57ad (patch)
treeb2588905149c5f9c925f763c3d70b1e55271bc04 /components/hyper_serde/tests
parentd86e713a9cb5be2555d63bd477d47d440fa8c832 (diff)
downloadservo-580062228bb083ccdc2144a43491bc4f916c57ad.tar.gz
servo-580062228bb083ccdc2144a43491bc4f916c57ad.zip
Replace time with std::time in components/net (#31079)
* Replace time with std::time in components/net Signed-off-by: Bentaimia Haddadi <haddadi.taym@gmail.com> * Fix cookie::test_sort_order test Signed-off-by: Bentaimia Haddadi <haddadi.taym@gmail.com> --------- Signed-off-by: Bentaimia Haddadi <haddadi.taym@gmail.com>
Diffstat (limited to 'components/hyper_serde/tests')
-rw-r--r--components/hyper_serde/tests/supported.rs5
-rw-r--r--components/hyper_serde/tests/tokens.rs17
2 files changed, 13 insertions, 9 deletions
diff --git a/components/hyper_serde/tests/supported.rs b/components/hyper_serde/tests/supported.rs
index 54480903c7e..4eddd69adef 100644
--- a/components/hyper_serde/tests/supported.rs
+++ b/components/hyper_serde/tests/supported.rs
@@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
+use std::time::SystemTime;
+
use cookie::Cookie;
use headers::ContentType;
use http::header::HeaderMap;
@@ -15,7 +17,6 @@ use hyper::{Method, StatusCode, Uri};
use hyper_serde::{De, Ser, Serde};
use mime::Mime;
use serde::{Deserialize, Serialize};
-use time::Tm;
fn is_supported<T>()
where
@@ -33,6 +34,6 @@ fn supported() {
is_supported::<Method>();
is_supported::<Mime>();
is_supported::<StatusCode>();
- is_supported::<Tm>();
+ is_supported::<SystemTime>();
is_supported::<Uri>();
}
diff --git a/components/hyper_serde/tests/tokens.rs b/components/hyper_serde/tests/tokens.rs
index d7ad09f4e9c..2ba79ce3bb6 100644
--- a/components/hyper_serde/tests/tokens.rs
+++ b/components/hyper_serde/tests/tokens.rs
@@ -15,7 +15,6 @@ use http::StatusCode;
use hyper::{Method, Uri};
use hyper_serde::{De, Ser};
use serde_test::{assert_de_tokens, assert_ser_tokens, Token};
-use time::Duration;
#[test]
fn test_content_type() {
@@ -32,7 +31,7 @@ fn test_cookie() {
// string with a bunch of indices in it which apparently is different from the exact same
// cookie but parsed as a bunch of strings.
let cookie: Cookie = Cookie::build("Hello", "World!")
- .max_age(Duration::seconds(42))
+ .max_age(time::Duration::seconds(42))
.domain("servo.org")
.path("/")
.secure(true)
@@ -112,14 +111,18 @@ fn test_raw_status() {
}
#[test]
-fn test_tm() {
- use time::strptime;
+fn test_system_time_serialization() {
+ use std::time::SystemTime;
- let time = strptime("2017-02-22T12:03:31Z", "%Y-%m-%dT%H:%M:%SZ").unwrap();
- let tokens = &[Token::Str("2017-02-22T12:03:31Z")];
+ use chrono::{NaiveDateTime, TimeZone, Utc};
+
+ let time = SystemTime::from(Utc.from_utc_datetime(
+ &NaiveDateTime::parse_from_str("2023-01-15T12:53:31Z", "%Y-%m-%dT%H:%M:%SZ").unwrap(),
+ ));
+ let tokens = &[Token::Str("2023-01-15T12:53:31Z")];
- assert_ser_tokens(&Ser::new(&time), tokens);
assert_de_tokens(&De::new(time), tokens);
+ assert_ser_tokens(&Ser::new(&time), tokens);
}
#[test]