Sync tests build a server note from wire::sample_note
pull's note() and push's server_note each wrote out all nineteen fields of a wire::Note. wire::sample_note(id, revision) is that note; push's version changes only the body and attachments, by struct update. DRY pass #2, batch 2, F9 (#5372). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+1
-21
@@ -513,27 +513,7 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn note(id: &str, revision: i64) -> wire::Note {
|
fn note(id: &str, revision: i64) -> wire::Note {
|
||||||
wire::Note {
|
wire::sample_note(id, revision)
|
||||||
id: id.to_string(),
|
|
||||||
body: "Body".into(),
|
|
||||||
position: 0,
|
|
||||||
pinned: false,
|
|
||||||
archived: false,
|
|
||||||
trashed: false,
|
|
||||||
deleted_at: None,
|
|
||||||
remind_at: None,
|
|
||||||
recurrence: None,
|
|
||||||
created_at: Some("2026-07-26T00:00:00.000Z".into()),
|
|
||||||
updated_at: Some("2026-07-26T00:00:00.000Z".into()),
|
|
||||||
sync_revision: revision,
|
|
||||||
purged_at: None,
|
|
||||||
labels: vec![],
|
|
||||||
attachments: vec![],
|
|
||||||
previews: vec![],
|
|
||||||
permission: None,
|
|
||||||
shared: false,
|
|
||||||
shared_by: None,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn attachment(id: &str) -> wire::Attachment {
|
fn attachment(id: &str) -> wire::Attachment {
|
||||||
|
|||||||
+1
-17
@@ -1059,25 +1059,9 @@ mod tests {
|
|||||||
use crate::sync::{pull, wire};
|
use crate::sync::{pull, wire};
|
||||||
let conn = db();
|
let conn = db();
|
||||||
let server_note = |revision: i64, attachments: Vec<wire::Attachment>| wire::Note {
|
let server_note = |revision: i64, attachments: Vec<wire::Attachment>| wire::Note {
|
||||||
id: "n1".into(),
|
|
||||||
body: "a note".into(),
|
body: "a note".into(),
|
||||||
position: 0,
|
|
||||||
pinned: false,
|
|
||||||
archived: false,
|
|
||||||
trashed: false,
|
|
||||||
deleted_at: None,
|
|
||||||
remind_at: None,
|
|
||||||
recurrence: None,
|
|
||||||
created_at: Some("2026-07-26T00:00:00.000Z".into()),
|
|
||||||
updated_at: Some("2026-07-26T00:00:00.000Z".into()),
|
|
||||||
sync_revision: revision,
|
|
||||||
purged_at: None,
|
|
||||||
labels: vec![],
|
|
||||||
attachments,
|
attachments,
|
||||||
previews: vec![],
|
..wire::sample_note("n1", revision)
|
||||||
permission: None,
|
|
||||||
shared: false,
|
|
||||||
shared_by: None,
|
|
||||||
};
|
};
|
||||||
let page = |note: wire::Note, cursor: i64| wire::ChangesPage {
|
let page = |note: wire::Note, cursor: i64| wire::ChangesPage {
|
||||||
notes: vec![note],
|
notes: vec![note],
|
||||||
|
|||||||
@@ -165,3 +165,30 @@ fn default_color() -> String {
|
|||||||
fn default_mime() -> String {
|
fn default_mime() -> String {
|
||||||
OPAQUE_MIME.to_string()
|
OPAQUE_MIME.to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A plain note, this account's own and live, as a server sends it. For tests in
|
||||||
|
/// pull and push, which each wrote the whole literal out.
|
||||||
|
#[cfg(test)]
|
||||||
|
pub(crate) fn sample_note(id: &str, revision: i64) -> Note {
|
||||||
|
Note {
|
||||||
|
id: id.to_string(),
|
||||||
|
body: "Body".into(),
|
||||||
|
position: 0,
|
||||||
|
pinned: false,
|
||||||
|
archived: false,
|
||||||
|
trashed: false,
|
||||||
|
deleted_at: None,
|
||||||
|
remind_at: None,
|
||||||
|
recurrence: None,
|
||||||
|
created_at: Some("2026-07-26T00:00:00.000Z".into()),
|
||||||
|
updated_at: Some("2026-07-26T00:00:00.000Z".into()),
|
||||||
|
sync_revision: revision,
|
||||||
|
purged_at: None,
|
||||||
|
labels: vec![],
|
||||||
|
attachments: vec![],
|
||||||
|
previews: vec![],
|
||||||
|
permission: None,
|
||||||
|
shared: false,
|
||||||
|
shared_by: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user