Commit d58fe683 authored by Kirk Shoop's avatar Kirk Shoop Committed by Facebook Github Bot

migrate to gtest

Summary:
migrated tests
fixed some bugs introduced while tests were disabled

Reviewed By: yfeldblum

Differential Revision: D10515231

fbshipit-source-id: 34cddb6588c4da9cd05256111bf9626b013dd4fa
parent 20d6c1df
......@@ -84,8 +84,8 @@ class any_constrained_single_sender {
return ::folly::pushmi::top(*static_cast<Wrapped*>((void*)src.buffer_));
}
static any_constrained_executor<E, CV> executor(data& src) {
return any_constrained_executor<E, CV>{
executor(*static_cast<Wrapped*>((void*)src.buffer_))};
return any_constrained_executor<E, CV>{::folly::pushmi::executor(
*static_cast<Wrapped*>((void*)src.buffer_))};
}
static void submit(data& src, CV cv, any_receiver<E, VN...> out) {
::folly::pushmi::submit(
......
......@@ -166,7 +166,7 @@ struct entangled {
entangled& operator=(entangled&&) = delete;
explicit entangled(T t)
: t(std::move(t)), dual(nullptr), stateMachine(kUnlocked) {}
: stateMachine(kUnlocked), t(std::move(t)), dual(nullptr) {}
entangled(entangled&& other)
: stateMachine((other.lockBoth(), kLocked)),
t(std::move(other.t)),
......
......@@ -34,16 +34,27 @@ struct for_each_fn {
using properties =
property_set_insert_t<properties_t<Out>, property_set<is_flow<>>>;
std::function<void(std::ptrdiff_t)> pull;
template <class V>
void value(V&& v) {
set_value(static_cast<Out&>(*this), (V &&) v);
template <class... VN>
void value(VN&&... vn) {
::folly::pushmi::set_value(static_cast<Out&>(*this), (VN &&) vn...);
pull(1);
}
template <class E>
void error(E&& e) {
// break circular reference
pull = nullptr;
::folly::pushmi::set_error(static_cast<Out&>(*this), (E &&) e);
}
void done() {
// break circular reference
pull = nullptr;
::folly::pushmi::set_done(static_cast<Out&>(*this));
}
PUSHMI_TEMPLATE(class Up)
(requires Receiver<Up>)
(requires Receiver<Up> && ReceiveValue<Up, std::ptrdiff_t>)
void starting(Up up) {
pull = [up = std::move(up)](std::ptrdiff_t requested) mutable {
set_value(up, requested);
::folly::pushmi::set_value(up, requested);
};
pull(1);
}
......@@ -62,23 +73,8 @@ struct for_each_fn {
property_set_index_t<properties_t<In>, is_single<>>>>()(
std::move(args_))};
using Out = decltype(out);
submit(
in,
::folly::pushmi::detail::receiver_from_fn<In>()(
Pull<In, Out>{std::move(out)}));
return in;
}
PUSHMI_TEMPLATE(class In)
(requires Sender<In>&& Constrained<In>&& Flow<In>&& Many<In>)
In operator()(In in) {
auto out{::folly::pushmi::detail::receiver_from_fn<subset<
is_sender<>,
property_set_index_t<properties_t<In>, is_single<>>>>()(
std::move(args_))};
using Out = decltype(out);
submit(
::folly::pushmi::submit(
in,
::folly::pushmi::top(in),
::folly::pushmi::detail::receiver_from_fn<In>()(
Pull<In, Out>{std::move(out)}));
return in;
......@@ -88,7 +84,7 @@ struct for_each_fn {
public:
template <class... AN>
auto operator()(AN&&... an) const {
return for_each_fn::fn<AN...>{{(AN &&) an...}};
return for_each_fn::fn<AN...>{std::tuple<AN...>{(AN &&) an...}};
}
};
......
......@@ -102,7 +102,8 @@ struct flow_from_up {
return;
}
// submit work to exec
submit(p->exec, make_receiver([p = p, requested](auto) {
::folly::pushmi::submit(
p->exec, make_receiver([p = p, requested](auto) {
auto remaining = requested;
// this loop is structured to work when there is
// re-entrancy out.value in the loop may call up.value.
......@@ -122,12 +123,14 @@ struct flow_from_up {
template <class E>
void error(E) noexcept {
p->stop.store(true);
submit(p->exec, make_receiver([p = p](auto) { set_done(p->out); }));
::folly::pushmi::submit(
p->exec, make_receiver([p = p](auto) { set_done(p->out); }));
}
void done() {
p->stop.store(true);
submit(p->exec, make_receiver([p = p](auto) { set_done(p->out); }));
::folly::pushmi::submit(
p->exec, make_receiver([p = p](auto) { set_done(p->out); }));
}
};
......@@ -147,7 +150,8 @@ PUSHMI_INLINE_VAR constexpr struct flow_from_fn {
auto p = std::make_shared<Producer>(
begin_, end_, std::move(out), exec_, false);
submit(exec_, make_receiver([p](auto) {
::folly::pushmi::submit(
exec_, make_receiver([p](auto) {
// pass reference for cancellation.
set_starting(p->out, make_receiver(flow_from_up<Producer>{p}));
}));
......
......@@ -58,7 +58,7 @@ struct submit_fn {
In operator()(In in) {
auto out{
::folly::pushmi::detail::receiver_from_fn<In>{}(std::move(args_))};
submit(in, std::move(out));
::folly::pushmi::submit(in, std::move(out));
return in;
}
};
......@@ -81,7 +81,7 @@ struct submit_at_fn {
In operator()(In in) {
auto out{
::folly::pushmi::detail::receiver_from_fn<In>()(std::move(args_))};
submit(in, std::move(at_), std::move(out));
::folly::pushmi::submit(in, std::move(at_), std::move(out));
return in;
}
};
......@@ -90,7 +90,8 @@ struct submit_at_fn {
PUSHMI_TEMPLATE(class TP, class... AN)
(requires Regular<TP>)
auto operator()(TP at, AN... an) const {
return submit_at_fn::fn<TP, AN...>{std::move(at), {(AN &&) an...}};
return submit_at_fn::fn<TP, AN...>{std::move(at),
std::tuple<AN...>{(AN &&) an...}};
}
};
......@@ -109,7 +110,7 @@ struct submit_after_fn {
auto out{
::folly::pushmi::detail::receiver_from_fn<In>()(std::move(args_))};
auto at = ::folly::pushmi::now(in) + std::move(after_);
submit(in, std::move(at), std::move(out));
::folly::pushmi::submit(in, std::move(at), std::move(out));
return in;
}
};
......@@ -118,7 +119,8 @@ struct submit_after_fn {
PUSHMI_TEMPLATE(class D, class... AN)
(requires Regular<D>)
auto operator()(D after, AN... an) const {
return submit_after_fn::fn<D, AN...>{std::move(after), {(AN &&) an...}};
return submit_after_fn::fn<D, AN...>{std::move(after),
std::tuple<AN...>{(AN &&) an...}};
}
};
......@@ -159,7 +161,7 @@ struct blocking_submit_fn {
using properties = properties_t<Exec>;
auto executor() {
return make(state_, executor(ex_));
return make(state_, ::folly::pushmi::executor(ex_));
}
PUSHMI_TEMPLATE(class... ZN)
......@@ -172,14 +174,16 @@ struct blocking_submit_fn {
(requires Receiver<Out>&& Constrained<Exec>)
void submit(CV cv, Out out) {
++state_->nested;
submit(ex_, cv, nested_receiver_impl<Out>{state_, std::move(out)});
::folly::pushmi::submit(
ex_, cv, nested_receiver_impl<Out>{state_, std::move(out)});
}
PUSHMI_TEMPLATE(class Out)
(requires Receiver<Out> && not Constrained<Exec>)
void submit(Out out) {
++state_->nested;
submit(ex_, nested_receiver_impl<Out>{state_, std::move(out)});
::folly::pushmi::submit(
ex_, nested_receiver_impl<Out>{state_, std::move(out)});
}
};
template <class Out>
......@@ -293,7 +297,7 @@ struct blocking_submit_fn {
PUSHMI_TEMPLATE(class Out)
(requires Receiver<Out>&& SenderTo<In, Out>)
void operator()(In& in, Out out) const {
submit(in, std::move(out));
::folly::pushmi::submit(in, std::move(out));
}
};
// TODO - only move, move-only types..
......
......@@ -203,7 +203,8 @@ class strand_executor {
queue_->items_.push(any_receiver<E, any_executor_ref<E>>{std::move(out)});
if (queue_->remaining_ == 0) {
// noone is minding the shop, send a worker
submit(queue_->ex_, strand_queue_receiver<E, Executor>{queue_});
::folly::pushmi::submit(
queue_->ex_, strand_queue_receiver<E, Executor>{queue_});
}
}
};
......
......@@ -25,6 +25,11 @@
using namespace folly::pushmi::aliases;
#include <folly/portability/GMock.h>
#include <folly/portability/GTest.h>
using namespace testing;
using namespace std::literals;
#if __cpp_deduction_guides >= 201703
......@@ -562,3 +567,5 @@ void flow_many_sender_test() {
mi::Executor<mi::executor_t<decltype(in0)>>,
"sender has invalid executor");
}
TEST(CompileTest, Test) {}
This diff is collapsed.
......@@ -29,140 +29,169 @@ using namespace std::literals;
#include <folly/experimental/pushmi/o/tap.h>
#include <folly/experimental/pushmi/o/transform.h>
#include <folly/experimental/pushmi/trampoline.h>
#include <folly/experimental/pushmi/new_thread.h>
#include <folly/experimental/pushmi/trampoline.h>
using namespace folly::pushmi::aliases;
#if 0
SCENARIO( "empty can be used with tap and submit", "[empty][sender]" ) {
#include <folly/portability/GMock.h>
#include <folly/portability/GTest.h>
GIVEN( "An empty sender" ) {
using namespace testing;
TEST(EmptyNoArgSingleSender, TapAndSubmit) {
auto e = op::empty();
using E = decltype(e);
REQUIRE( v::SenderTo<E, v::any_receiver<>, v::is_single<>> );
EXPECT_THAT((v::SenderTo<E, v::any_receiver<>, v::is_single<>>), Eq(true))
<< "expected empty to return a single sender that can take an any_receiver";
WHEN( "tap and submit are applied" ) {
int signals = 0;
e |
op::tap(
[&](){ signals += 100; },
[&](auto e) noexcept { signals += 1000; },
[&](){ signals += 10; }) |
[&]() { signals += 100; },
[&](auto) noexcept { signals += 1000; },
[&]() { signals += 10; }) |
op::submit(
[&](){ signals += 100; },
[&](auto e) noexcept { signals += 1000; },
[&](){ signals += 10; });
[&]() { signals += 100; },
[&](auto) noexcept { signals += 1000; },
[&]() { signals += 10; });
THEN( "the done signal is recorded twice" ) {
REQUIRE( signals == 20 );
}
EXPECT_THAT(signals, Eq(20))
<< "expected the done signal to be recorded twice";
WHEN( "future_from is applied" ) {
REQUIRE_THROWS_AS(v::future_from(e).get(), std::future_error);
EXPECT_THROW(v::future_from(e).get(), std::future_error)
<< "expected future_error when future_from is applied";
THEN( "future_from(e) returns std::future<void>" ) {
REQUIRE( std::is_same<std::future<void>, decltype(v::future_from(e))>::value );
}
}
}
}
EXPECT_THAT(
(std::is_same<std::future<void>, decltype(v::future_from(e))>::value),
Eq(true))
<< "expected future_from(e) to return std::future<void>";
}
GIVEN( "An empty int single_sender" ) {
TEST(EmptyIntSingleSender, TapAndSubmit) {
auto e = op::empty<int>();
using E = decltype(e);
REQUIRE( v::SenderTo<E, v::any_receiver<std::exception_ptr, int>, v::is_single<>> );
WHEN( "tap and submit are applied" ) {
EXPECT_THAT(
(v::SenderTo<
E,
v::any_receiver<std::exception_ptr, int>,
v::is_single<>>),
Eq(true))
<< "expected empty to return a single sender that can take an any_receiver<int>";
int signals = 0;
e |
op::tap(
[&](auto v){ signals += 100; },
[&](auto e) noexcept { signals += 1000; },
[&](){ signals += 10; }) |
[&](auto) { signals += 100; },
[&](auto) noexcept { signals += 1000; },
[&]() { signals += 10; }) |
op::submit(
[&](auto v){ signals += 100; },
[&](auto e) noexcept { signals += 1000; },
[&](){ signals += 10; });
THEN( "the done signal is recorded twice" ) {
REQUIRE( signals == 20 );
}
}
}
}
[&](auto) { signals += 100; },
[&](auto) noexcept { signals += 1000; },
[&]() { signals += 10; });
EXPECT_THAT(signals, Eq(20))
<< "expected the done signal to be recorded twice";
SCENARIO( "just() can be used with transform and submit", "[just][sender]" ) {
EXPECT_THROW(v::future_from<int>(e).get(), std::future_error)
<< "expected future_error when future_from is applied";
GIVEN( "A just int single_sender" ) {
EXPECT_THAT(
(std::is_same<std::future<int>, decltype(v::future_from<int>(e))>::value),
Eq(true))
<< "expected future_from(e) to return std::future<void>";
}
TEST(JustIntSingleSender, TransformAndSubmit) {
auto j = op::just(20);
using J = decltype(j);
REQUIRE( v::SenderTo<J, v::any_receiver<std::exception_ptr, int>, v::is_single<>> );
EXPECT_THAT(
(v::SenderTo<
J,
v::any_receiver<std::exception_ptr, int>,
v::is_single<>>),
Eq(true))
<< "expected empty to return a single sender that can take an any_receiver<int>";
WHEN( "transform and submit are applied" ) {
int signals = 0;
int value = 0;
j |
op::transform(
[&](int v){ signals += 10000; return v + 1; },
[&](auto v){ std:abort(); return v; }) |
op::transform(
[&](int v){ signals += 10000; return v * 2; }) |
[&](int v) {
signals += 10000;
return v + 1;
},
[&](auto v) {
std::abort();
return v;
}) |
op::transform([&](int v) {
signals += 10000;
return v * 2;
}) |
op::submit(
[&](auto v){ value = v; signals += 100; },
[&](auto e) noexcept { signals += 1000; },
[&](){ signals += 10; });
[&](auto v) {
value = v;
signals += 100;
},
[&](auto) noexcept { signals += 1000; },
[&]() { signals += 10; });
EXPECT_THAT(signals, Eq(20110))
<< "expected that the transform signal is recorded twice and that the value and done signals once each";
THEN( "the transform signal is recorded twice, the value and done signals once and the result is correct" ) {
REQUIRE( signals == 20110 );
REQUIRE( value == 42 );
}
}
EXPECT_THAT(value, Eq(42)) << "expected a different result";
WHEN( "future_from<int> is applied" ) {
auto twenty = v::future_from<int>(j).get();
THEN( "the value signal is recorded once and the result is correct" ) {
REQUIRE( twenty == 20 );
REQUIRE( std::is_same<std::future<int>, decltype(v::future_from<int>(j))>::value );
}
}
}
}
EXPECT_THAT(twenty, Eq(20))
<< "expected a different result from future_from(e).get()";
SCENARIO( "from() can be used with transform and submit", "[from][sender]" ) {
EXPECT_THAT(
(std::is_same<std::future<int>, decltype(v::future_from<int>(j))>::value),
Eq(true))
<< "expected future_from(e) to return std::future<int>";
}
GIVEN( "A from int many_sender" ) {
int arr[] = {0, 9, 99};
TEST(FromIntManySender, TransformAndSubmit) {
std::array<int, 3> arr{0, 9, 99};
auto m = op::from(arr);
using M = decltype(m);
REQUIRE( v::SenderTo<M, v::any_receiver<std::exception_ptr, int>, v::is_many<>> );
EXPECT_THAT(
(v::SenderTo<M, v::any_receiver<std::exception_ptr, int>, v::is_many<>>),
Eq(true))
<< "expected empty to return a many sender that can take an any_receiver<int>";
WHEN( "transform and submit are applied" ) {
int signals = 0;
int value = 0;
m |
op::transform(
[&](int v){ signals += 10000; return v + 1; },
[&](auto v){ std:abort(); return v; }) |
op::transform(
[&](int v){ signals += 10000; return v * 2; }) |
[&](int v) {
signals += 10000;
return v + 1;
},
[&](auto v) {
std::abort();
return v;
}) |
op::transform([&](int v) {
signals += 10000;
return v * 2;
}) |
op::submit(
[&](auto v){ value += v; signals += 100; },
[&](auto e) noexcept { signals += 1000; },
[&](){ signals += 10; });
[&](auto v) {
value += v;
signals += 100;
},
[&](auto) noexcept { signals += 1000; },
[&]() { signals += 10; });
THEN( "the transform signal is recorded twice, the value signal once and the result is correct" ) {
REQUIRE( signals == 60310 );
REQUIRE( value == 222 );
}
}
EXPECT_THAT(signals, Eq(60310))
<< "expected that the transform signal is recorded six times and that the value signal three times and done signal once";
}
EXPECT_THAT(value, Eq(222)) << "expected a different result";
}
#endif
......@@ -21,23 +21,28 @@ using namespace std::literals;
#include <folly/experimental/pushmi/flow_single_sender.h>
#include <folly/experimental/pushmi/o/empty.h>
#include <folly/experimental/pushmi/o/extension_operators.h>
#include <folly/experimental/pushmi/o/just.h>
#include <folly/experimental/pushmi/o/on.h>
#include <folly/experimental/pushmi/o/transform.h>
#include <folly/experimental/pushmi/o/submit.h>
#include <folly/experimental/pushmi/o/tap.h>
#include <folly/experimental/pushmi/o/transform.h>
#include <folly/experimental/pushmi/o/via.h>
#include <folly/experimental/pushmi/o/submit.h>
#include <folly/experimental/pushmi/o/extension_operators.h>
#include <folly/experimental/pushmi/inline.h>
#include <folly/experimental/pushmi/trampoline.h>
using namespace folly::pushmi::aliases;
#if 0
#include <folly/Conv.h>
#include <folly/portability/GMock.h>
#include <folly/portability/GTest.h>
using namespace testing;
struct countdownsingle {
countdownsingle(int& c)
: counter(&c) {}
explicit countdownsingle(int& c) : counter(&c) {}
int* counter;
......@@ -49,38 +54,32 @@ struct countdownsingle {
}
};
SCENARIO( "trampoline executor", "[trampoline][sender]" ) {
using TR = decltype(mi::trampoline());
GIVEN( "A trampoline single_sender" ) {
auto tr = v::trampoline();
using TR = decltype(tr);
class TrampolineExecutor : public Test {
protected:
TR tr_{mi::trampoline()};
};
WHEN( "submit" ) {
TEST_F(TrampolineExecutor, TransformAndSubmit) {
auto signals = 0;
tr |
op::transform([](auto){ return 42; }) |
tr_ | op::transform([](auto) { return 42; }) |
op::submit(
[&](auto){
signals += 100; },
[&](auto e) noexcept { signals += 1000; },
[&](){ signals += 10; });
[&](auto) { signals += 100; },
[&](auto) noexcept { signals += 1000; },
[&]() { signals += 10; });
THEN( "the value and done signals are each recorded once" ) {
REQUIRE( signals == 110 );
}
}
EXPECT_THAT(signals, Eq(110))
<< "expected that the value and done signals are each recorded once";
}
WHEN( "blocking get" ) {
auto v = tr |
op::transform([](auto){ return 42; }) |
op::get<int>;
TEST_F(TrampolineExecutor, BlockingGet) {
auto v = tr_ | op::transform([](auto) { return 42; }) | op::get<int>;
THEN( "the result is" ) {
REQUIRE( v == 42 );
}
}
EXPECT_THAT(v, Eq(42)) << "expected that the result would be different";
}
WHEN( "virtual derecursion is triggered" ) {
TEST_F(TrampolineExecutor, VirtualDerecursion) {
int counter = 100'000;
std::function<void(::folly::pushmi::any_executor_ref<> exec)> recurse;
recurse = [&](::folly::pushmi::any_executor_ref<> tr) {
......@@ -88,23 +87,22 @@ SCENARIO( "trampoline executor", "[trampoline][sender]" ) {
return;
tr | op::submit(recurse);
};
tr | op::submit([&](auto exec) { recurse(exec); });
tr_ | op::submit([&](auto exec) { recurse(exec); });
THEN( "all nested submissions complete" ) {
REQUIRE( counter == 0 );
}
}
EXPECT_THAT(counter, Eq(0))
<< "expected that all nested submissions complete";
}
WHEN( "static derecursion is triggered" ) {
TEST_F(TrampolineExecutor, StaticDerecursion) {
int counter = 100'000;
countdownsingle single{counter};
tr | op::submit(single);
THEN( "all nested submissions complete" ) {
REQUIRE( counter == 0 );
}
}
tr_ | op::submit(single);
EXPECT_THAT(counter, Eq(0))
<< "expected that all nested submissions complete";
}
WHEN( "used with on" ) {
TEST_F(TrampolineExecutor, UsedWithOn) {
std::vector<std::string> values;
auto sender = ::folly::pushmi::make_single_sender([](auto out) {
::folly::pushmi::set_value(out, 2.0);
......@@ -114,18 +112,23 @@ SCENARIO( "trampoline executor", "[trampoline][sender]" ) {
::folly::pushmi::set_value(out, std::numeric_limits<int8_t>::min());
::folly::pushmi::set_value(out, std::numeric_limits<int8_t>::max());
});
auto inlineon = sender | op::on([&](){return mi::inline_executor();});
inlineon |
op::submit(v::on_value([&](auto v) { values.push_back(std::to_string(v)); }));
THEN( "only the first item was pushed" ) {
REQUIRE(values == std::vector<std::string>{"2.000000"});
}
THEN( "executor was not changed by on" ) {
REQUIRE(std::is_same<mi::executor_t<decltype(sender)>, mi::executor_t<decltype(inlineon)>>::value);
}
}
auto inlineon = sender | op::on([&]() { return mi::inline_executor(); });
inlineon | op::submit(v::on_value([&](auto v) {
values.push_back(folly::to<std::string>(v));
}));
EXPECT_THAT(values, ElementsAre(folly::to<std::string>(2.0)))
<< "expected that only the first item was pushed";
EXPECT_THAT(
(std::is_same<
mi::executor_t<decltype(sender)>,
mi::executor_t<decltype(inlineon)>>::value),
Eq(true))
<< "expected that executor was not changed by on";
}
WHEN( "used with via" ) {
TEST_F(TrampolineExecutor, UsedWithVia) {
std::vector<std::string> values;
auto sender = ::folly::pushmi::make_single_sender([](auto out) {
::folly::pushmi::set_value(out, 2.0);
......@@ -135,16 +138,18 @@ SCENARIO( "trampoline executor", "[trampoline][sender]" ) {
::folly::pushmi::set_value(out, std::numeric_limits<int8_t>::min());
::folly::pushmi::set_value(out, std::numeric_limits<int8_t>::max());
});
auto inlinevia = sender | op::via([&](){return mi::inline_executor();});
inlinevia |
op::submit(v::on_value([&](auto v) { values.push_back(std::to_string(v)); }));
THEN( "only the first item was pushed" ) {
REQUIRE(values == std::vector<std::string>{"2.000000"});
}
THEN( "executor was changed by via" ) {
REQUIRE(!std::is_same<mi::executor_t<decltype(sender)>, mi::executor_t<decltype(inlinevia)>>::value);
}
}
}
auto inlinevia = sender | op::via([&]() { return mi::inline_executor(); });
inlinevia | op::submit(v::on_value([&](auto v) {
values.push_back(folly::to<std::string>(v));
}));
EXPECT_THAT(values, ElementsAre(folly::to<std::string>(2.0)))
<< "expected that only the first item was pushed";
EXPECT_THAT(
(!std::is_same<
mi::executor_t<decltype(sender)>,
mi::executor_t<decltype(inlinevia)>>::value),
Eq(true))
<< "expected that executor was changed by via";
}
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment