summaryrefslogtreecommitdiff
path: root/Rx/v2/test
diff options
context:
space:
mode:
authorGrigoriy Chudnov <g.chudnov@gmail.com>2016-12-29 16:42:22 +0300
committerKirk Shoop <kirk.shoop@microsoft.com>2016-12-29 10:11:40 -0800
commit588e3ac01c655e224f095c264b6fe90c09381005 (patch)
tree2e4d7a57931fdc998583d29f4430ed944bbba3c6 /Rx/v2/test
parentc62234770349a638e0296ca0ceca137b4147af06 (diff)
downloadRxCpp-588e3ac01c655e224f095c264b6fe90c09381005.tar.gz
decouple take from observable
Diffstat (limited to 'Rx/v2/test')
-rw-r--r--Rx/v2/test/operators/buffer.cpp1
-rw-r--r--Rx/v2/test/operators/concat_map.cpp1
-rw-r--r--Rx/v2/test/operators/flat_map.cpp1
-rw-r--r--Rx/v2/test/operators/group_by.cpp1
-rw-r--r--Rx/v2/test/operators/observe_on.cpp1
-rw-r--r--Rx/v2/test/operators/scan.cpp1
-rw-r--r--Rx/v2/test/operators/take.cpp5
-rw-r--r--Rx/v2/test/subscriptions/subscription.cpp1
8 files changed, 10 insertions, 2 deletions
diff --git a/Rx/v2/test/operators/buffer.cpp b/Rx/v2/test/operators/buffer.cpp
index 61e76e5..0038e4f 100644
--- a/Rx/v2/test/operators/buffer.cpp
+++ b/Rx/v2/test/operators/buffer.cpp
@@ -1,4 +1,5 @@
#include "../test.h"
+#include <rxcpp/operators/rx-take.hpp>
SCENARIO("buffer count partial window", "[buffer][operators]"){
GIVEN("1 hot observable of ints."){
diff --git a/Rx/v2/test/operators/concat_map.cpp b/Rx/v2/test/operators/concat_map.cpp
index 2e891dc..8bf242a 100644
--- a/Rx/v2/test/operators/concat_map.cpp
+++ b/Rx/v2/test/operators/concat_map.cpp
@@ -2,6 +2,7 @@
#include <rxcpp/operators/rx-reduce.hpp>
#include <rxcpp/operators/rx-filter.hpp>
#include <rxcpp/operators/rx-map.hpp>
+#include <rxcpp/operators/rx-take.hpp>
static const int static_tripletCount = 100;
diff --git a/Rx/v2/test/operators/flat_map.cpp b/Rx/v2/test/operators/flat_map.cpp
index e90b3ea..724df65 100644
--- a/Rx/v2/test/operators/flat_map.cpp
+++ b/Rx/v2/test/operators/flat_map.cpp
@@ -2,6 +2,7 @@
#include <rxcpp/operators/rx-reduce.hpp>
#include <rxcpp/operators/rx-filter.hpp>
#include <rxcpp/operators/rx-map.hpp>
+#include <rxcpp/operators/rx-take.hpp>
static const int static_tripletCount = 100;
diff --git a/Rx/v2/test/operators/group_by.cpp b/Rx/v2/test/operators/group_by.cpp
index 8363de7..44cae59 100644
--- a/Rx/v2/test/operators/group_by.cpp
+++ b/Rx/v2/test/operators/group_by.cpp
@@ -2,6 +2,7 @@
#include <rxcpp/operators/rx-group_by.hpp>
#include <rxcpp/operators/rx-reduce.hpp>
#include <rxcpp/operators/rx-map.hpp>
+#include <rxcpp/operators/rx-take.hpp>
#include <locale>
diff --git a/Rx/v2/test/operators/observe_on.cpp b/Rx/v2/test/operators/observe_on.cpp
index b3190c1..5d56448 100644
--- a/Rx/v2/test/operators/observe_on.cpp
+++ b/Rx/v2/test/operators/observe_on.cpp
@@ -1,4 +1,5 @@
#include "../test.h"
+#include <rxcpp/operators/rx-take.hpp>
const int static_onnextcalls = 100000;
diff --git a/Rx/v2/test/operators/scan.cpp b/Rx/v2/test/operators/scan.cpp
index 430d971..9ea8eec 100644
--- a/Rx/v2/test/operators/scan.cpp
+++ b/Rx/v2/test/operators/scan.cpp
@@ -1,5 +1,6 @@
#include "../test.h"
#include <rxcpp/operators/rx-map.hpp>
+#include <rxcpp/operators/rx-take.hpp>
SCENARIO("scan: issue 41", "[scan][operators][issue][hide]"){
GIVEN("map of scan of interval"){
diff --git a/Rx/v2/test/operators/take.cpp b/Rx/v2/test/operators/take.cpp
index 4d5e9e1..414acf2 100644
--- a/Rx/v2/test/operators/take.cpp
+++ b/Rx/v2/test/operators/take.cpp
@@ -1,4 +1,5 @@
#include "../test.h"
+#include <rxcpp/operators/rx-take.hpp>
SCENARIO("take 2", "[take][operators]"){
GIVEN("a source"){
@@ -20,9 +21,9 @@ SCENARIO("take 2", "[take][operators]"){
auto res = w.start(
[xs]() {
return xs
- .take(2)
+ | rxo::take(2)
// forget type to workaround lambda deduction bug on msvc 2013
- .as_dynamic();
+ | rxo::as_dynamic();
}
);
diff --git a/Rx/v2/test/subscriptions/subscription.cpp b/Rx/v2/test/subscriptions/subscription.cpp
index 9ae26dc..37c9a43 100644
--- a/Rx/v2/test/subscriptions/subscription.cpp
+++ b/Rx/v2/test/subscriptions/subscription.cpp
@@ -1,6 +1,7 @@
#include "../test.h"
#include "rxcpp/operators/rx-combine_latest.hpp"
#include "rxcpp/operators/rx-map.hpp"
+#include "rxcpp/operators/rx-take.hpp"
SCENARIO("observe subscription", "[hide]"){
GIVEN("observable of ints"){