mirror of
https://github.com/lennart-k/rustical.git
synced 2025-12-14 16:32:29 +00:00
store: Fix test_calendar
This commit is contained in:
23
Cargo.lock
generated
23
Cargo.lock
generated
@@ -519,6 +519,8 @@ dependencies = [
|
|||||||
"http 1.2.0",
|
"http 1.2.0",
|
||||||
"http-body",
|
"http-body",
|
||||||
"http-body-util",
|
"http-body-util",
|
||||||
|
"hyper",
|
||||||
|
"hyper-util",
|
||||||
"itoa",
|
"itoa",
|
||||||
"matchit",
|
"matchit",
|
||||||
"memchr",
|
"memchr",
|
||||||
@@ -527,10 +529,15 @@ dependencies = [
|
|||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
"rustversion",
|
"rustversion",
|
||||||
"serde",
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"serde_path_to_error",
|
||||||
|
"serde_urlencoded",
|
||||||
"sync_wrapper",
|
"sync_wrapper",
|
||||||
|
"tokio",
|
||||||
"tower 0.5.2",
|
"tower 0.5.2",
|
||||||
"tower-layer",
|
"tower-layer",
|
||||||
"tower-service",
|
"tower-service",
|
||||||
|
"tracing",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -551,6 +558,7 @@ dependencies = [
|
|||||||
"sync_wrapper",
|
"sync_wrapper",
|
||||||
"tower-layer",
|
"tower-layer",
|
||||||
"tower-service",
|
"tower-service",
|
||||||
|
"tracing",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2589,6 +2597,7 @@ dependencies = [
|
|||||||
"anyhow",
|
"anyhow",
|
||||||
"argon2",
|
"argon2",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
|
"axum",
|
||||||
"clap",
|
"clap",
|
||||||
"opentelemetry",
|
"opentelemetry",
|
||||||
"opentelemetry-otlp",
|
"opentelemetry-otlp",
|
||||||
@@ -2722,10 +2731,12 @@ dependencies = [
|
|||||||
"regex",
|
"regex",
|
||||||
"rstest",
|
"rstest",
|
||||||
"rstest_reuse",
|
"rstest_reuse",
|
||||||
|
"rustical_store_sqlite",
|
||||||
"rustical_xml",
|
"rustical_xml",
|
||||||
"serde",
|
"serde",
|
||||||
"sha2",
|
"sha2",
|
||||||
"thiserror 2.0.9",
|
"thiserror 2.0.9",
|
||||||
|
"tokio",
|
||||||
"tracing",
|
"tracing",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -2828,6 +2839,16 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "serde_path_to_error"
|
||||||
|
version = "0.1.16"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
|
||||||
|
dependencies = [
|
||||||
|
"itoa",
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_spanned"
|
name = "serde_spanned"
|
||||||
version = "0.6.8"
|
version = "0.6.8"
|
||||||
@@ -3529,8 +3550,10 @@ dependencies = [
|
|||||||
"futures-util",
|
"futures-util",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
"sync_wrapper",
|
"sync_wrapper",
|
||||||
|
"tokio",
|
||||||
"tower-layer",
|
"tower-layer",
|
||||||
"tower-service",
|
"tower-service",
|
||||||
|
"tracing",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|||||||
@@ -97,6 +97,7 @@ quote = "1.0"
|
|||||||
proc-macro2 = "1.0"
|
proc-macro2 = "1.0"
|
||||||
heck = "0.5"
|
heck = "0.5"
|
||||||
darling = "0.20"
|
darling = "0.20"
|
||||||
|
axum = { version = "0.7", features = ["http2"] }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
rustical_store = { workspace = true }
|
rustical_store = { workspace = true }
|
||||||
@@ -132,3 +133,4 @@ rpassword.workspace = true
|
|||||||
argon2.workspace = true
|
argon2.workspace = true
|
||||||
pbkdf2.workspace = true
|
pbkdf2.workspace = true
|
||||||
password-hash.workspace = true
|
password-hash.workspace = true
|
||||||
|
axum.workspace = true
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ impl XmlSerialize for Resourcetype {
|
|||||||
) -> std::io::Result<()> {
|
) -> std::io::Result<()> {
|
||||||
let tag_str = tag.map(String::from_utf8_lossy);
|
let tag_str = tag.map(String::from_utf8_lossy);
|
||||||
if let Some(tag) = &tag_str {
|
if let Some(tag) = &tag_str {
|
||||||
writer.write_event(Event::Start(BytesStart::new(tag.to_owned())))?;
|
writer.write_event(Event::Start(BytesStart::new(tag.clone())))?;
|
||||||
}
|
}
|
||||||
|
|
||||||
for &ty in self.0 {
|
for &ty in self.0 {
|
||||||
@@ -26,7 +26,7 @@ impl XmlSerialize for Resourcetype {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if let Some(tag) = &tag_str {
|
if let Some(tag) = &tag_str {
|
||||||
writer.write_event(Event::End(BytesEnd::new(tag.to_owned())))?;
|
writer.write_event(Event::End(BytesEnd::new(tag.clone())))?;
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,3 +29,5 @@ rustical_xml.workspace = true
|
|||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
rstest = { workspace = true }
|
rstest = { workspace = true }
|
||||||
rstest_reuse = { workspace = true }
|
rstest_reuse = { workspace = true }
|
||||||
|
rustical_store_sqlite.workspace = true
|
||||||
|
tokio.workspace = true
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use rstest::rstest;
|
use rstest::rstest;
|
||||||
use rstest_reuse::{self, apply, template};
|
use rstest_reuse::{self, apply, template};
|
||||||
use rustical_store::sqlite_store::create_test_store;
|
use rustical_store::{CalendarObject, CalendarStore};
|
||||||
use rustical_store::{model::CalendarObject, CalendarStore};
|
use rustical_store_sqlite::create_test_store;
|
||||||
|
|
||||||
const TIMEZONE: &str = include_str!("examples/timezone.ics");
|
const TIMEZONE: &str = include_str!("examples/timezone.ics");
|
||||||
const EVENT: &str = include_str!("examples/event.ics");
|
const EVENT: &str = include_str!("examples/event.ics");
|
||||||
@@ -24,9 +24,9 @@ async fn test_init<CS: CalendarStore>(_store: CS) {
|
|||||||
|
|
||||||
#[apply(cal_store)]
|
#[apply(cal_store)]
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_create_event<CS: CalendarStore>(mut store: CS) {
|
async fn test_create_event<CS: CalendarStore>(store: CS) {
|
||||||
store
|
store
|
||||||
.insert_calendar(rustical_store::model::Calendar {
|
.insert_calendar(rustical_store::Calendar {
|
||||||
id: "test".to_owned(),
|
id: "test".to_owned(),
|
||||||
displayname: Some("Test Calendar".to_owned()),
|
displayname: Some("Test Calendar".to_owned()),
|
||||||
principal: "testuser".to_owned(),
|
principal: "testuser".to_owned(),
|
||||||
@@ -38,7 +38,7 @@ async fn test_create_event<CS: CalendarStore>(mut store: CS) {
|
|||||||
|
|
||||||
let object = CalendarObject::from_ics("asd".to_owned(), EVENT.to_owned()).unwrap();
|
let object = CalendarObject::from_ics("asd".to_owned(), EVENT.to_owned()).unwrap();
|
||||||
store
|
store
|
||||||
.put_object("testuser".to_owned(), "test".to_owned(), object)
|
.put_object("testuser".to_owned(), "test".to_owned(), object, true)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user