Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 09:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make tests pass again

Browse Source
This commit is contained in:
jikstra
2020-01-20 18:24:23 +01:00
parent 3bddcc1c5f
commit bedfb74a09
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/chatlist.rs
View File

@@ -438,7 +438,7 @@ impl ChatlistItem {
/// ///
/// This is somewhat experimental, even more so than the rest of /// This is somewhat experimental, even more so than the rest of
/// deltachat, and the data returned is still subject to change. /// deltachat, and the data returned is still subject to change.
pub fn load_from_db(context: &Context, chat_id: u32) -> Result<ChatlistItem> { pub fn load_from_db(context: &Context, chat_id: ChatId) -> Result<ChatlistItem> {
let chat = Chat::load_from_db(context, chat_id).unwrap(); let chat = Chat::load_from_db(context, chat_id).unwrap();
let draft = match get_draft(context, chat_id)? { let draft = match get_draft(context, chat_id)? {
@@ -454,7 +454,7 @@ impl ChatlistItem {
//let message_summary = MessageSummary::new( //let message_summary = MessageSummary::new(
Ok(ChatlistItem { Ok(ChatlistItem {
id: chat.id, id: chat.id.to_u32(),
type_: chat.typ as u32, type_: chat.typ as u32,
name: chat.name.clone(), name: chat.name.clone(),
archived: chat.archived, archived: chat.archived,
@@ -493,9 +493,9 @@ mod tests {
assert_eq!(chats.get_chat_id(2), chat_id1); assert_eq!(chats.get_chat_id(2), chat_id1);
assert_eq!(chats.to_json(), format!("[[{},{}],[{},{}],[{},{}]]", assert_eq!(chats.to_json(), format!("[[{},{}],[{},{}],[{},{}]]",
chats.get_chat_id(0), chats.get_msg_id(0).map(|msg_id| msg_id.to_u32()).unwrap_or(0), chats.get_chat_id(0).to_u32(), chats.get_msg_id(0).map(|msg_id| msg_id.to_u32()).unwrap_or(0),
chats.get_chat_id(1), chats.get_msg_id(1).map(|msg_id| msg_id.to_u32()).unwrap_or(0), chats.get_chat_id(1).to_u32(), chats.get_msg_id(1).map(|msg_id| msg_id.to_u32()).unwrap_or(0),
chats.get_chat_id(2), chats.get_msg_id(2).map(|msg_id| msg_id.to_u32()).unwrap_or(0))); chats.get_chat_id(2).to_u32(), chats.get_msg_id(2).map(|msg_id| msg_id.to_u32()).unwrap_or(0)));
// drafts are sorted to the top // drafts are sorted to the top
let mut msg = Message::new(Viewtype::Text); let mut msg = Message::new(Viewtype::Text);
@@ -505,16 +505,16 @@ mod tests {
assert_eq!(chats.get_chat_id(0), chat_id2); assert_eq!(chats.get_chat_id(0), chat_id2);
assert_eq!(chats.to_json(), format!("[[{},{}],[{},{}],[{},{}]]", assert_eq!(chats.to_json(), format!("[[{},{}],[{},{}],[{},{}]]",
chats.get_chat_id(0), chats.get_msg_id(0).map(|msg_id| msg_id.to_u32()).unwrap_or(0), chats.get_chat_id(0).to_u32(), chats.get_msg_id(0).map(|msg_id| msg_id.to_u32()).unwrap_or(0),
chats.get_chat_id(1), chats.get_msg_id(1).map(|msg_id| msg_id.to_u32()).unwrap_or(0), chats.get_chat_id(1).to_u32(), chats.get_msg_id(1).map(|msg_id| msg_id.to_u32()).unwrap_or(0),
chats.get_chat_id(2), chats.get_msg_id(2).map(|msg_id| msg_id.to_u32()).unwrap_or(0))); chats.get_chat_id(2).to_u32(), chats.get_msg_id(2).map(|msg_id| msg_id.to_u32()).unwrap_or(0)));
// check chatlist query and archive functionality // check chatlist query and archive functionality
let chats = Chatlist::try_load(&t.ctx, 0, Some("b"), None).unwrap(); let chats = Chatlist::try_load(&t.ctx, 0, Some("b"), None).unwrap();
assert_eq!(chats.len(), 1); assert_eq!(chats.len(), 1);
assert_eq!(chats.to_json(), format!("[[{},{}]]", assert_eq!(chats.to_json(), format!("[[{},{}]]",
chats.get_chat_id(0), chats.get_msg_id(0).map(|msg_id| msg_id.to_u32()).unwrap_or(0))); chats.get_chat_id(0).to_u32(), chats.get_msg_id(0).map(|msg_id| msg_id.to_u32()).unwrap_or(0)));
let chats = Chatlist::try_load(&t.ctx, DC_GCL_ARCHIVED_ONLY, None, None).unwrap(); let chats = Chatlist::try_load(&t.ctx, DC_GCL_ARCHIVED_ONLY, None, None).unwrap();
assert_eq!(chats.len(), 0); assert_eq!(chats.len(), 0);
@@ -526,7 +526,7 @@ mod tests {
assert_eq!(chats.len(), 1); assert_eq!(chats.len(), 1);
assert_eq!(chats.to_json(), format!("[[{},{}]]", assert_eq!(chats.to_json(), format!("[[{},{}]]",
chats.get_chat_id(0), chats.get_msg_id(0).map(|msg_id| msg_id.to_u32()).unwrap_or(0))); chats.get_chat_id(0).to_u32(), chats.get_msg_id(0).map(|msg_id| msg_id.to_u32()).unwrap_or(0)));
} }

2
src/message.rs
View File

@@ -607,7 +607,7 @@ impl Message {
} }
} }
#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql, Serialize, Deserialize)] #[derive(Debug, Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive, ToSql, FromSql, Serialize, Deserialize)]
#[repr(i32)] #[repr(i32)]
pub enum MessageState { pub enum MessageState {
Undefined = 0, Undefined = 0,