summaryrefslogtreecommitdiff
path: root/Rx/v2/test
diff options
context:
space:
mode:
authorGrigoriy Chudnov <g.chudnov@gmail.com>2017-01-10 00:22:08 +0300
committerKirk Shoop <kirk.shoop@microsoft.com>2017-01-09 15:37:14 -0800
commit37ab993f9f364f22f361a228bac988d6c798f3d2 (patch)
tree9ab385dd1a43e44dad8e343ff94ca8a28a3f770d /Rx/v2/test
parent48aa4773a6ee85aee3849f49c15fde65047822d1 (diff)
downloadRxCpp-37ab993f9f364f22f361a228bac988d6c798f3d2.tar.gz
exposed to_time_point on the test scheduler
Diffstat (limited to 'Rx/v2/test')
-rw-r--r--Rx/v2/test/operators/skip_until.cpp4
-rw-r--r--Rx/v2/test/operators/take_until.cpp4
2 files changed, 2 insertions, 6 deletions
diff --git a/Rx/v2/test/operators/skip_until.cpp b/Rx/v2/test/operators/skip_until.cpp
index 3d5f408..9bd49aa 100644
--- a/Rx/v2/test/operators/skip_until.cpp
+++ b/Rx/v2/test/operators/skip_until.cpp
@@ -561,8 +561,6 @@ SCENARIO("skip_until, never never", "[skip_until][skip][operators]"){
SCENARIO("skip_until time point, some data next", "[skip_until][skip][operators]"){
GIVEN("2 sources"){
- using clock_type = rxsc::detail::test_type::clock_type;
-
auto sc = rxsc::make_test();
auto so = rx::synchronize_in_one_worker(sc);
auto w = sc.create_worker();
@@ -577,7 +575,7 @@ SCENARIO("skip_until time point, some data next", "[skip_until][skip][operators]
on.completed(250)
});
- clock_type::time_point t(std::chrono::milliseconds(225));
+ auto t = sc.to_time_point(225);
WHEN("invoked with a time point"){
diff --git a/Rx/v2/test/operators/take_until.cpp b/Rx/v2/test/operators/take_until.cpp
index e7f63ce..93c5962 100644
--- a/Rx/v2/test/operators/take_until.cpp
+++ b/Rx/v2/test/operators/take_until.cpp
@@ -745,8 +745,6 @@ SCENARIO("take_until, error some", "[take_until][take][operators]"){
SCENARIO("take_until trigger on time point", "[take_until][take][operators]"){
GIVEN("a source and a time point"){
- using clock_type = rxsc::detail::test_type::clock_type;
-
auto sc = rxsc::make_test();
auto so = rx::synchronize_in_one_worker(sc);
auto w = sc.create_worker();
@@ -761,7 +759,7 @@ SCENARIO("take_until trigger on time point", "[take_until][take][operators]"){
on.completed(250)
});
- clock_type::time_point t(std::chrono::milliseconds(225));
+ auto t = sc.to_time_point(225);
WHEN("invoked with a time point"){