Skip to content

Commit

Permalink
fix: tests
Browse files Browse the repository at this point in the history
Signed-off-by: Lachezar Lechev <[email protected]>
  • Loading branch information
elpiel committed Jun 11, 2024
1 parent 61b8a1a commit cc6ca85
Show file tree
Hide file tree
Showing 18 changed files with 61 additions and 18 deletions.
1 change: 1 addition & 0 deletions src/types/calendar/calendar_bucket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use super::CalendarItem;
/// - Calendar items for previous (up to ~1 month) and future (up to ~2 months) episodes
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
#[cfg_attr(test, derive(Derivative))]
#[cfg_attr(test, derivative(Default))]
#[serde(rename_all = "camelCase")]
pub struct CalendarBucket {
pub uid: UID,
Expand Down
4 changes: 3 additions & 1 deletion src/unit_tests/catalog_with_filters/load_action.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ use crate::runtime::{EnvFutureExt, Runtime, RuntimeAction, RuntimeEvent, TryEnvF
use crate::types::addon::{ExtraValue, ResourcePath, ResourceRequest, ResourceResponse};
use crate::types::events::DismissedEventsBucket;
use crate::types::library::LibraryBucket;
use crate::types::notifications::NotificationsBucket;
use crate::types::profile::Profile;
use crate::types::resource::MetaItemPreview;
use crate::types::search_history::SearchHistoryBucket;
use crate::types::streams::StreamsBucket;
use crate::types::{calendar::CalendarBucket, notifications::NotificationsBucket};
use crate::unit_tests::{
default_fetch_handler, Request, TestEnv, EVENTS, FETCH_HANDLER, REQUESTS, STATES,
};
Expand Down Expand Up @@ -51,6 +51,7 @@ fn default_catalog() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
);
Expand Down Expand Up @@ -152,6 +153,7 @@ fn search_catalog() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
);
Expand Down
4 changes: 3 additions & 1 deletion src/unit_tests/ctx/add_to_library.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ use crate::runtime::{Env, EnvFutureExt, Runtime, RuntimeAction, TryEnvFuture};
use crate::types::api::{APIResult, SuccessResponse};
use crate::types::events::DismissedEventsBucket;
use crate::types::library::{LibraryBucket, LibraryItem, LibraryItemState};
use crate::types::notifications::NotificationsBucket;
use crate::types::profile::{Auth, AuthKey, GDPRConsent, Profile, User};
use crate::types::resource::{MetaItemBehaviorHints, MetaItemPreview, PosterShape};
use crate::types::search_history::SearchHistoryBucket;
use crate::types::streams::StreamsBucket;
use crate::types::True;
use crate::types::{calendar::CalendarBucket, notifications::NotificationsBucket};
use crate::unit_tests::{
default_fetch_handler, Request, TestEnv, FETCH_HANDLER, NOW, REQUESTS, STORAGE,
};
Expand Down Expand Up @@ -107,6 +107,7 @@ fn actionctx_addtolibrary() {
},
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down Expand Up @@ -244,6 +245,7 @@ fn actionctx_addtolibrary_already_added() {
},
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down
6 changes: 5 additions & 1 deletion src/unit_tests/ctx/authenticate.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::types::events::DismissedEventsBucket;
use crate::types::notifications::NotificationsBucket;
use crate::types::search_history::SearchHistoryBucket;
use crate::types::streams::StreamsBucket;
use crate::types::{calendar::CalendarBucket, notifications::NotificationsBucket};
use crate::{
constants::{LIBRARY_RECENT_STORAGE_KEY, LIBRARY_STORAGE_KEY, PROFILE_STORAGE_KEY},
models::ctx::Ctx,
Expand Down Expand Up @@ -108,6 +108,7 @@ fn actionctx_authenticate_login() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
);
Expand Down Expand Up @@ -249,6 +250,7 @@ fn actionctx_authenticate_login_with_token() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
);
Expand Down Expand Up @@ -389,6 +391,7 @@ fn actionctx_authenticate_facebook() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
);
Expand Down Expand Up @@ -529,6 +532,7 @@ fn actionctx_authenticate_register() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
);
Expand Down
6 changes: 5 additions & 1 deletion src/unit_tests/ctx/install_addon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ use crate::types::addon::{Descriptor, Manifest};
use crate::types::api::{APIResult, SuccessResponse};
use crate::types::events::DismissedEventsBucket;
use crate::types::library::LibraryBucket;
use crate::types::notifications::NotificationsBucket;
use crate::types::profile::{Auth, AuthKey, GDPRConsent, Profile, User};
use crate::types::search_history::SearchHistoryBucket;
use crate::types::streams::StreamsBucket;
use crate::types::True;
use crate::types::{calendar::CalendarBucket, notifications::NotificationsBucket};
use crate::unit_tests::{
default_fetch_handler, Request, TestEnv, FETCH_HANDLER, REQUESTS, STORAGE,
};
Expand Down Expand Up @@ -57,6 +57,7 @@ fn actionctx_installaddon_install() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down Expand Up @@ -162,6 +163,7 @@ fn actionctx_installaddon_install_with_user() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down Expand Up @@ -285,6 +287,7 @@ fn actionctx_installaddon_update() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down Expand Up @@ -362,6 +365,7 @@ fn actionctx_installaddon_already_installed() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down
3 changes: 2 additions & 1 deletion src/unit_tests/ctx/logout.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ use crate::runtime::{Env, EnvFutureExt, Runtime, RuntimeAction, TryEnvFuture};
use crate::types::api::{APIResult, SuccessResponse};
use crate::types::events::DismissedEventsBucket;
use crate::types::library::LibraryBucket;
use crate::types::notifications::NotificationsBucket;
use crate::types::profile::{Auth, AuthKey, GDPRConsent, Profile, User};
use crate::types::search_history::SearchHistoryBucket;
use crate::types::streams::StreamsBucket;
use crate::types::True;
use crate::types::{calendar::CalendarBucket, notifications::NotificationsBucket};
use crate::unit_tests::{
default_fetch_handler, Request, TestEnv, FETCH_HANDLER, REQUESTS, STORAGE,
};
Expand Down Expand Up @@ -88,6 +88,7 @@ fn actionctx_logout() {
library,
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down
4 changes: 4 additions & 0 deletions src/unit_tests/ctx/notifications/update_notifications.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ use crate::{
Descriptor, Manifest, ManifestCatalog, ManifestExtra, ResourcePath, ResourceRequest,
ResourceResponse,
},
calendar::CalendarBucket,
events::DismissedEventsBucket,
library::{LibraryBucket, LibraryItem, LibraryItemState},
notifications::{NotificationItem, NotificationsBucket},
Expand Down Expand Up @@ -240,6 +241,7 @@ fn test_pull_notifications_and_play_in_player() {
),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down Expand Up @@ -389,6 +391,7 @@ fn test_pull_notifications_test_cases() {
LibraryBucket::new(None, test.library_items),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, test.notification_items),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down Expand Up @@ -500,6 +503,7 @@ fn test_dismiss_notification() {
},
],
),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down
4 changes: 3 additions & 1 deletion src/unit_tests/ctx/pull_addons_from_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ use crate::types::addon::{Descriptor, Manifest};
use crate::types::api::{APIResult, CollectionResponse};
use crate::types::events::DismissedEventsBucket;
use crate::types::library::LibraryBucket;
use crate::types::notifications::NotificationsBucket;
use crate::types::profile::{Auth, AuthKey, GDPRConsent, Profile, User};
use crate::types::search_history::SearchHistoryBucket;
use crate::types::streams::StreamsBucket;
use crate::types::{calendar::CalendarBucket, notifications::NotificationsBucket};
use crate::unit_tests::{
default_fetch_handler, Request, TestEnv, FETCH_HANDLER, REQUESTS, STORAGE,
};
Expand Down Expand Up @@ -45,6 +45,7 @@ fn actionctx_pulladdonsfromapi() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down Expand Up @@ -153,6 +154,7 @@ fn actionctx_pulladdonsfromapi_with_user() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down
4 changes: 3 additions & 1 deletion src/unit_tests/ctx/push_addons_to_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ use crate::types::addon::{Descriptor, Manifest};
use crate::types::api::{APIResult, SuccessResponse};
use crate::types::events::DismissedEventsBucket;
use crate::types::library::LibraryBucket;
use crate::types::notifications::NotificationsBucket;
use crate::types::profile::{Auth, AuthKey, GDPRConsent, Profile, User};
use crate::types::search_history::SearchHistoryBucket;
use crate::types::streams::StreamsBucket;
use crate::types::True;
use crate::types::{calendar::CalendarBucket, notifications::NotificationsBucket};
use crate::unit_tests::{default_fetch_handler, Request, TestEnv, FETCH_HANDLER, REQUESTS};
use futures::future;
use semver::Version;
Expand Down Expand Up @@ -53,6 +53,7 @@ fn actionctx_pushaddonstoapi() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down Expand Up @@ -143,6 +144,7 @@ fn actionctx_pushaddonstoapi_with_user() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down
4 changes: 3 additions & 1 deletion src/unit_tests/ctx/remove_from_library.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ use crate::runtime::{Env, EnvFutureExt, Runtime, RuntimeAction, TryEnvFuture};
use crate::types::api::{APIResult, SuccessResponse};
use crate::types::events::DismissedEventsBucket;
use crate::types::library::{LibraryBucket, LibraryItem};
use crate::types::notifications::NotificationsBucket;
use crate::types::profile::{Auth, AuthKey, GDPRConsent, Profile, User};
use crate::types::search_history::SearchHistoryBucket;
use crate::types::streams::StreamsBucket;
use crate::types::True;
use crate::types::{calendar::CalendarBucket, notifications::NotificationsBucket};
use crate::unit_tests::{
default_fetch_handler, Request, TestEnv, FETCH_HANDLER, NOW, REQUESTS, STORAGE,
};
Expand Down Expand Up @@ -102,6 +102,7 @@ fn actionctx_removefromlibrary() {
},
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down Expand Up @@ -190,6 +191,7 @@ fn actionctx_removefromlibrary_not_added() {
},
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down
4 changes: 3 additions & 1 deletion src/unit_tests/ctx/rewind_library_item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ use crate::runtime::{Env, EnvFutureExt, Runtime, RuntimeAction, TryEnvFuture};
use crate::types::api::{APIResult, SuccessResponse};
use crate::types::events::DismissedEventsBucket;
use crate::types::library::{LibraryBucket, LibraryItem, LibraryItemState};
use crate::types::notifications::NotificationsBucket;
use crate::types::profile::{Auth, AuthKey, GDPRConsent, Profile, User};
use crate::types::search_history::SearchHistoryBucket;
use crate::types::streams::StreamsBucket;
use crate::types::True;
use crate::types::{calendar::CalendarBucket, notifications::NotificationsBucket};
use crate::unit_tests::{
default_fetch_handler, Request, TestEnv, FETCH_HANDLER, NOW, REQUESTS, STORAGE,
};
Expand Down Expand Up @@ -110,6 +110,7 @@ fn actionctx_rewindlibraryitem() {
},
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down Expand Up @@ -201,6 +202,7 @@ fn actionctx_rewindlibraryitem_not_added() {
},
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down
5 changes: 4 additions & 1 deletion src/unit_tests/ctx/sync_library_with_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ use crate::runtime::{Env, EnvFutureExt, Runtime, RuntimeAction, TryEnvFuture};
use crate::types::api::{APIResult, LibraryItemModified, LibraryItemsResponse, SuccessResponse};
use crate::types::events::DismissedEventsBucket;
use crate::types::library::{LibraryBucket, LibraryItem};
use crate::types::notifications::NotificationsBucket;
use crate::types::profile::{Auth, AuthKey, GDPRConsent, Profile, User};
use crate::types::search_history::SearchHistoryBucket;
use crate::types::streams::StreamsBucket;
use crate::types::True;
use crate::types::{calendar::CalendarBucket, notifications::NotificationsBucket};
use crate::unit_tests::{
default_fetch_handler, Request, TestEnv, FETCH_HANDLER, REQUESTS, STORAGE,
};
Expand All @@ -34,6 +34,7 @@ fn actionctx_synclibrarywithapi() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
);
Expand Down Expand Up @@ -291,6 +292,7 @@ fn actionctx_synclibrarywithapi_with_user() {
},
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down Expand Up @@ -428,6 +430,7 @@ fn actionctx_synclibrarywithapi_with_user_empty_library() {
LibraryBucket::default(),
StreamsBucket::default(),
NotificationsBucket::new::<TestEnv>(None, vec![]),
CalendarBucket::new::<TestEnv>(None, vec![]),
SearchHistoryBucket::default(),
DismissedEventsBucket::default(),
),
Expand Down
Loading

0 comments on commit cc6ca85

Please sign in to comment.