Skip to content

Forward selector exception in on_error_resume_next + expose test utils #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexInLog merged 4 commits into from
Apr 10, 2024
Merged

Forward selector exception in on_error_resume_next + expose test utils #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47001fe
Forward selector exception in on_error_resume_next + expose some test…
CorentinBT Apr 9, 2024
1003d5e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 9, 2024
588bb8f
Remove disposable changes for now
CorentinBT Apr 10, 2024
3ff5a8a
Revert a bit
AlexInLog Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/tests/utils/mock_observer.hpp → src/rpp/rpp/observers/mock_observer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

#pragma once

#include <rpp/observers/observer.hpp>
#include <rpp/disposables/fwd.hpp>

#include "rpp/disposables/fwd.hpp"
#include <rpp/observers/observer.hpp>

#include <vector>

Expand Down
15 changes: 14 additions & 1 deletion src/rpp/rpp/operators/on_error_resume_next.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,20 @@ namespace rpp::operators::details
void on_error(const std::exception_ptr& err) const
{
disposable.dispose();
selector(err).subscribe(std::move(observer));

std::optional<std::invoke_result_t<Selector, std::exception_ptr>> selector_obs;
try
{
selector_obs.emplace(selector(err));
}
catch (...)
{
observer.on_error(std::current_exception());
}
if (selector_obs.has_value())
{
std::move(selector_obs).value().subscribe(std::move(observer));
}
}

void on_completed() const
Expand Down
2 changes: 1 addition & 1 deletion src/rpp/rpp/operators/switch_on_next.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,4 @@ namespace rpp::operators
{
return details::switch_on_next_t{};
}
} // namespace rpp::operators
} // namespace rpp::operators
0 src/tests/utils/test_scheduler.hpp → src/rpp/rpp/schedulers/test_scheduler.hpp
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion src/rpp/rpp/sources.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
#include <rpp/sources/error.hpp>
#include <rpp/sources/from.hpp>
#include <rpp/sources/interval.hpp>
#include <rpp/sources/never.hpp>
#include <rpp/sources/never.hpp>
#include <rpp/sources/timer.hpp>
2 changes: 1 addition & 1 deletion src/tests/rpp/test_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
#include <snitch/snitch.hpp>

#include <rpp/observables/dynamic_observable.hpp>
#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/buffer.hpp>
#include <rpp/operators/merge.hpp>
#include <rpp/sources/error.hpp>
#include <rpp/sources/just.hpp>

#include "disposable_observable.hpp"
#include "mock_observer.hpp"

TEST_CASE("buffer bundles items")
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/rpp/test_combine_latest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include <snitch/snitch.hpp>

#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/as_blocking.hpp>
#include <rpp/operators/combine_latest.hpp>
#include <rpp/schedulers/current_thread.hpp>
Expand All @@ -21,7 +22,6 @@
#include <rpp/subjects/publish_subject.hpp>

#include "disposable_observable.hpp"
#include "mock_observer.hpp"
#include "snitch_logging.hpp"

TEST_CASE("combine_latest bundles items")
Expand Down
2 changes: 1 addition & 1 deletion src/tests/rpp/test_concat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <rpp/disposables/composite_disposable.hpp>
#include <rpp/disposables/disposable_wrapper.hpp>
#include <rpp/observables/dynamic_observable.hpp>
#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/concat.hpp>
#include <rpp/schedulers/immediate.hpp>
#include <rpp/sources/concat.hpp>
Expand All @@ -24,7 +25,6 @@

#include "copy_count_tracker.hpp"
#include "disposable_observable.hpp"
#include "mock_observer.hpp"
#include "snitch_logging.hpp"

#include <memory>
Expand Down
3 changes: 1 addition & 2 deletions src/tests/rpp/test_connectable_observable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@
#include <snitch/snitch.hpp>

#include <rpp/observables/connectable_observable.hpp>
#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/map.hpp>
#include <rpp/operators/multicast.hpp>
#include <rpp/sources/just.hpp>
#include <rpp/subjects/publish_subject.hpp>

#include "mock_observer.hpp"

TEST_CASE("connectable observable")
{
auto mock = mock_observer_strategy<int>{};
Expand Down
4 changes: 2 additions & 2 deletions src/tests/rpp/test_debounce.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

#include <snitch/snitch.hpp>

#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/debounce.hpp>
#include <rpp/schedulers/test_scheduler.hpp>
#include <rpp/subjects/publish_subject.hpp>

#include "disposable_observable.hpp"
#include "mock_observer.hpp"
#include "test_scheduler.hpp"


TEST_CASE("debounce emit only items where timeout reached")
Expand Down
3 changes: 1 addition & 2 deletions src/tests/rpp/test_defer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@

#include <snitch/snitch.hpp>

#include <rpp/observers/mock_observer.hpp>
#include <rpp/sources/create.hpp>
#include <rpp/sources/defer.hpp>
#include <rpp/sources/empty.hpp>
#include <rpp/sources/error.hpp>
#include <rpp/sources/from.hpp>
#include <rpp/sources/never.hpp>

#include "mock_observer.hpp"

TEST_CASE("defer on different sources")
{
auto mock = mock_observer_strategy<int>{};
Expand Down
4 changes: 2 additions & 2 deletions src/tests/rpp/test_delay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@

#include <snitch/snitch.hpp>

#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/as_blocking.hpp>
#include <rpp/operators/delay.hpp>
#include <rpp/operators/observe_on.hpp>
#include <rpp/schedulers/test_scheduler.hpp>
#include <rpp/sources/empty.hpp>
#include <rpp/sources/error.hpp>
#include <rpp/sources/just.hpp>
#include <rpp/subjects/publish_subject.hpp>

#include "disposable_observable.hpp"
#include "mock_observer.hpp"
#include "snitch_logging.hpp"
#include "test_scheduler.hpp"

namespace
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/rpp/test_distinct.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@

#include <snitch/snitch.hpp>

#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/distinct.hpp>
#include <rpp/sources/empty.hpp>
#include <rpp/sources/error.hpp>
#include <rpp/sources/just.hpp>

#include "copy_count_tracker.hpp"
#include "disposable_observable.hpp"
#include "mock_observer.hpp"

TEMPLATE_TEST_CASE("distinct filters out repeated values and emit only items that have not already been emitted", "", rpp::memory_model::use_stack, rpp::memory_model::use_shared)
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/rpp/test_distinct_until_changed.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@

#include <snitch/snitch.hpp>

#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/distinct_until_changed.hpp>
#include <rpp/sources/empty.hpp>
#include <rpp/sources/error.hpp>
#include <rpp/sources/just.hpp>

#include "copy_count_tracker.hpp"
#include "disposable_observable.hpp"
#include "mock_observer.hpp"


TEMPLATE_TEST_CASE("distinct_until_changed filters out consecutive duplicates and send first value from duplicates", "", rpp::memory_model::use_stack, rpp::memory_model::use_shared)
Expand Down
2 changes: 1 addition & 1 deletion src/tests/rpp/test_filter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

#include <snitch/snitch.hpp>

#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/filter.hpp>
#include <rpp/sources/just.hpp>

#include "copy_count_tracker.hpp"
#include "disposable_observable.hpp"
#include "mock_observer.hpp"

#include <stdexcept>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion src/tests/rpp/test_finally.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

#include <snitch/snitch.hpp>

#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/finally.hpp>
#include <rpp/sources/create.hpp>

#include "disposable_observable.hpp"
#include "mock_observer.hpp"

TEST_CASE("finally executes only at the end")
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/rpp/test_first.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include <snitch/snitch.hpp>

#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/first.hpp>
#include <rpp/sources/empty.hpp>
#include <rpp/sources/error.hpp>
Expand All @@ -18,7 +19,6 @@

#include "copy_count_tracker.hpp"
#include "disposable_observable.hpp"
#include "mock_observer.hpp"


TEST_CASE("first only emits once")
Expand Down
2 changes: 1 addition & 1 deletion src/tests/rpp/test_flat_map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <snitch/snitch_macros_check.hpp>

#include <rpp/observables/dynamic_observable.hpp>
#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/flat_map.hpp>
#include <rpp/schedulers/immediate.hpp>
#include <rpp/sources/create.hpp>
Expand All @@ -22,7 +23,6 @@

#include "copy_count_tracker.hpp"
#include "disposable_observable.hpp"
#include "mock_observer.hpp"

#include <stdexcept>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion src/tests/rpp/test_from.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

#include <snitch/snitch.hpp>

#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/take.hpp>
#include <rpp/sources/from.hpp>

#include "copy_count_tracker.hpp"
#include "mock_observer.hpp"
#include "rpp/memory_model.hpp"
#include "rpp/observers/fwd.hpp"
#include "rpp/schedulers/current_thread.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/tests/rpp/test_group_by.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <snitch/snitch.hpp>

#include <rpp/observables/dynamic_observable.hpp>
#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/delay.hpp>
#include <rpp/operators/group_by.hpp>
#include <rpp/operators/take.hpp>
Expand All @@ -19,7 +20,6 @@
#include <rpp/sources/just.hpp>

#include "disposable_observable.hpp"
#include "mock_observer.hpp"
#include "rpp/disposables/composite_disposable.hpp"
#include "rpp/disposables/fwd.hpp"

Expand Down
4 changes: 2 additions & 2 deletions src/tests/rpp/test_interval.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@

#include <snitch/snitch.hpp>

#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/as_blocking.hpp>
#include <rpp/operators/subscribe.hpp>
#include <rpp/operators/take.hpp>
#include <rpp/schedulers/current_thread.hpp>
#include <rpp/schedulers/immediate.hpp>
#include <rpp/schedulers/new_thread.hpp>
#include <rpp/schedulers/test_scheduler.hpp>
#include <rpp/sources/interval.hpp>

#include "mock_observer.hpp"
#include "snitch_logging.hpp"
#include "test_scheduler.hpp"

#include <chrono>

Expand Down
2 changes: 1 addition & 1 deletion src/tests/rpp/test_last.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include <snitch/snitch.hpp>

#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/last.hpp>
#include <rpp/sources/empty.hpp>
#include <rpp/sources/error.hpp>
Expand All @@ -18,7 +19,6 @@

#include "copy_count_tracker.hpp"
#include "disposable_observable.hpp"
#include "mock_observer.hpp"


TEST_CASE("last only emits once")
Expand Down
2 changes: 1 addition & 1 deletion src/tests/rpp/test_map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

#include <snitch/snitch.hpp>

#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/map.hpp>
#include <rpp/sources/just.hpp>

#include "copy_count_tracker.hpp"
#include "disposable_observable.hpp"
#include "mock_observer.hpp"

#include <stdexcept>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion src/tests/rpp/test_merge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <snitch/snitch_macros_check.hpp>

#include <rpp/observables/dynamic_observable.hpp>
#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/as_blocking.hpp>
#include <rpp/operators/merge.hpp>
#include <rpp/schedulers/immediate.hpp>
Expand All @@ -23,7 +24,6 @@

#include "copy_count_tracker.hpp"
#include "disposable_observable.hpp"
#include "mock_observer.hpp"

#include <stdexcept>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion src/tests/rpp/test_observables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
#include <snitch/snitch.hpp>

#include <rpp/observables.hpp>
#include <rpp/observers/mock_observer.hpp>
#include <rpp/operators/as_blocking.hpp>
#include <rpp/sources/create.hpp>
#include <rpp/sources/empty.hpp>
#include <rpp/sources/error.hpp>
#include <rpp/sources/never.hpp>

#include "mock_observer.hpp"
#include "rpp/disposables/fwd.hpp"
#include "rpp/operators/fwd.hpp"
#include "rpp/operators/subscribe.hpp"
Expand Down
Loading