From 5d6c4852b1c2c1e7fc85dfee219487cd496f56b5 Mon Sep 17 00:00:00 2001 From: Benjamin Kampmann Date: Tue, 12 Apr 2022 19:37:43 +0200 Subject: [PATCH] fix media content test --- .../src/store/integration_tests.rs | 26 +++++++++---------- .../matrix-sdk-indexeddb/src/state_store.rs | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/crates/matrix-sdk-base/src/store/integration_tests.rs b/crates/matrix-sdk-base/src/store/integration_tests.rs index 8e414fb18..f0cc51366 100644 --- a/crates/matrix-sdk-base/src/store/integration_tests.rs +++ b/crates/matrix-sdk-base/src/store/integration_tests.rs @@ -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] diff --git a/crates/matrix-sdk-indexeddb/src/state_store.rs b/crates/matrix-sdk-indexeddb/src/state_store.rs index 09cd6980e..07664c2e4 100644 --- a/crates/matrix-sdk-indexeddb/src/state_store.rs +++ b/crates/matrix-sdk-indexeddb/src/state_store.rs @@ -946,7 +946,7 @@ impl IndexeddbStore { } async fn add_media_content(&self, request: &MediaRequest, data: Vec) -> 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)?;