mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-18 05:30:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix media content test

Browse Source
This commit is contained in:
Benjamin Kampmann
2022-04-12 19:37:43 +02:00
parent 64e0356756
commit 5d6c4852b1
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
crates/matrix-sdk-base/src/store/integration_tests.rs
View File

@@ -468,24 +468,24 @@ macro_rules! statestore_integration_tests {
}),
};
assert!(store.get_media_content(&request_file).await.unwrap().is_none());
assert!(store.get_media_content(&request_thumbnail).await.unwrap().is_none());
assert!(store.get_media_content(&request_file).await.unwrap().is_none(), "unexpectd media found");
assert!(store.get_media_content(&request_thumbnail).await.unwrap().is_none(), "media not found");
store.add_media_content(&request_file, content.clone()).await.unwrap();
assert!(store.get_media_content(&request_file).await.unwrap().is_some());
store.add_media_content(&request_file, content.clone()).await.expect("adding media failed");
assert!(store.get_media_content(&request_file).await.unwrap().is_some(), "media not found though added");
store.remove_media_content(&request_file).await.unwrap();
assert!(store.get_media_content(&request_file).await.unwrap().is_none());
store.remove_media_content(&request_file).await.expect("removing media failed");
assert!(store.get_media_content(&request_file).await.unwrap().is_none(), "media still there after removing");
store.add_media_content(&request_file, content.clone()).await.unwrap();
assert!(store.get_media_content(&request_file).await.unwrap().is_some());
store.add_media_content(&request_file, content.clone()).await.expect("adding media again failed");
assert!(store.get_media_content(&request_file).await.unwrap().is_some(), "media not found after adding again");
store.add_media_content(&request_thumbnail, content.clone()).await.unwrap();
assert!(store.get_media_content(&request_thumbnail).await.unwrap().is_some());
store.add_media_content(&request_thumbnail, content.clone()).await.expect("adding thumbnail failed");
assert!(store.get_media_content(&request_thumbnail).await.unwrap().is_some(), "thumbnail not found");
store.remove_media_content_for_uri(uri).await.unwrap();
assert!(store.get_media_content(&request_file).await.unwrap().is_none());
assert!(store.get_media_content(&request_thumbnail).await.unwrap().is_none());
store.remove_media_content_for_uri(uri).await.expect("removing all media for uri failed");
assert!(store.get_media_content(&request_file).await.unwrap().is_none(), "media wasn't removed");
assert!(store.get_media_content(&request_thumbnail).await.unwrap().is_none(), "thumbnail wasn't removed");
}
#[async_test]

2
crates/matrix-sdk-indexeddb/src/state_store.rs
View File

@@ -946,7 +946,7 @@ impl IndexeddbStore {
}
async fn add_media_content(&self, request: &MediaRequest, data: Vec<u8>) -> Result<()> {
let key = self.encode_key(KEYS::MEDIA, request.format.unique_key());
let key = self.encode_key(KEYS::MEDIA, (request.source.unique_key(), request.format.unique_key()));
let tx =
self.inner.transaction_on_one_with_mode(KEYS::MEDIA, IdbTransactionMode::Readwrite)?;