diff options
author | Valeriy Kopylov <valery.kopylov@akvelon.com> | 2014-06-25 17:41:38 +0400 |
---|---|---|
committer | Valeriy Kopylov <valery.kopylov@akvelon.com> | 2014-06-25 17:41:38 +0400 |
commit | 61dc7e637140c6d9697099cdf062e4b084167036 (patch) | |
tree | eae89ccc8c7ff5a2b9c23038a91a5ffb3582c9ef /Rx/v2/test/operators | |
parent | 07704df69b93414b638aa5433d6418df5c69e157 (diff) | |
download | RxCpp-61dc7e637140c6d9697099cdf062e4b084167036.tar.gz |
Convert tabs to spaces
Diffstat (limited to 'Rx/v2/test/operators')
-rw-r--r-- | Rx/v2/test/operators/buffer.cpp | 6 | ||||
-rw-r--r-- | Rx/v2/test/operators/combine_latest.cpp | 10 | ||||
-rw-r--r-- | Rx/v2/test/operators/concat.cpp | 40 | ||||
-rw-r--r-- | Rx/v2/test/operators/concat_map.cpp | 10 | ||||
-rw-r--r-- | Rx/v2/test/operators/filter.cpp | 8 | ||||
-rw-r--r-- | Rx/v2/test/operators/merge.cpp | 32 | ||||
-rw-r--r-- | Rx/v2/test/operators/take.cpp | 12 |
7 files changed, 59 insertions, 59 deletions
diff --git a/Rx/v2/test/operators/buffer.cpp b/Rx/v2/test/operators/buffer.cpp index 2153f8d..c98a6e1 100644 --- a/Rx/v2/test/operators/buffer.cpp +++ b/Rx/v2/test/operators/buffer.cpp @@ -20,7 +20,7 @@ SCENARIO("buffer count skip less", "[buffer][operators]"){ on.on_next(230, 4), on.on_next(240, 5), on.on_completed(250) - }); + }); WHEN("group each int with the next 2 ints"){ @@ -40,7 +40,7 @@ SCENARIO("buffer count skip less", "[buffer][operators]"){ v_on.on_next(250, rxu::to_vector(4, 5)), v_on.on_next(250, rxu::to_vector(5)), v_on.on_completed(250) - }); + }); auto actual = res.get_observer().messages(); REQUIRE(required == actual); } @@ -48,7 +48,7 @@ SCENARIO("buffer count skip less", "[buffer][operators]"){ THEN("there was one subscription and one unsubscription to the xs"){ auto required = rxu::to_vector({ on.subscribe(200, 250) - }); + }); auto actual = xs.subscriptions(); REQUIRE(required == actual); } diff --git a/Rx/v2/test/operators/combine_latest.cpp b/Rx/v2/test/operators/combine_latest.cpp index fb13953..512db72 100644 --- a/Rx/v2/test/operators/combine_latest.cpp +++ b/Rx/v2/test/operators/combine_latest.cpp @@ -16,7 +16,7 @@ SCENARIO("combine_latest interleaved with tail", "[combine_latest][join][operato on.on_next(215, 2), on.on_next(225, 4), on.on_completed(230) - }); + }); auto o2 = sc.make_hot_observable({ on.on_next(150, 1), @@ -25,7 +25,7 @@ SCENARIO("combine_latest interleaved with tail", "[combine_latest][join][operato on.on_next(235, 6), on.on_next(240, 7), on.on_completed(250) - }); + }); WHEN("each int is combined with the latest from the other source"){ @@ -46,7 +46,7 @@ SCENARIO("combine_latest interleaved with tail", "[combine_latest][join][operato on.on_next(235, 4 + 6), on.on_next(240, 4 + 7), on.on_completed(250) - }); + }); auto actual = res.get_observer().messages(); REQUIRE(required == actual); } @@ -54,7 +54,7 @@ SCENARIO("combine_latest interleaved with tail", "[combine_latest][join][operato THEN("there was one subscription and one unsubscription to the o1"){ auto required = rxu::to_vector({ on.subscribe(200, 230) - }); + }); auto actual = o1.subscriptions(); REQUIRE(required == actual); } @@ -62,7 +62,7 @@ SCENARIO("combine_latest interleaved with tail", "[combine_latest][join][operato THEN("there was one subscription and one unsubscription to the o2"){ auto required = rxu::to_vector({ on.subscribe(200, 250) - }); + }); auto actual = o2.subscriptions(); REQUIRE(required == actual); } diff --git a/Rx/v2/test/operators/concat.cpp b/Rx/v2/test/operators/concat.cpp index 59a1813..619894a 100644 --- a/Rx/v2/test/operators/concat.cpp +++ b/Rx/v2/test/operators/concat.cpp @@ -108,7 +108,7 @@ SCENARIO("concat completes", "[concat][join][operators]"){ on.on_next(210, 105), on.on_next(220, 106), on.on_completed(230) - }); + }); auto ys2 = sc.make_cold_observable({ on.on_next(10, 201), @@ -116,7 +116,7 @@ SCENARIO("concat completes", "[concat][join][operators]"){ on.on_next(30, 203), on.on_next(40, 204), on.on_completed(50) - }); + }); auto ys3 = sc.make_cold_observable({ on.on_next(10, 301), @@ -125,14 +125,14 @@ SCENARIO("concat completes", "[concat][join][operators]"){ on.on_next(40, 304), on.on_next(120, 305), on.on_completed(150) - }); + }); auto xs = sc.make_hot_observable({ o_on.on_next(300, ys1), o_on.on_next(400, ys2), o_on.on_next(500, ys3), o_on.on_completed(600) - }); + }); WHEN("each int is merged"){ @@ -147,23 +147,23 @@ SCENARIO("concat completes", "[concat][join][operators]"){ THEN("the output contains merged ints"){ auto required = rxu::to_vector({ - on.on_next(310, 101), - on.on_next(320, 102), - on.on_next(410, 103), - on.on_next(420, 104), - on.on_next(510, 105), + on.on_next(310, 101), + on.on_next(320, 102), + on.on_next(410, 103), + on.on_next(420, 104), + on.on_next(510, 105), on.on_next(520, 106), on.on_next(540, 201), on.on_next(550, 202), on.on_next(560, 203), on.on_next(570, 204), - on.on_next(590, 301), - on.on_next(600, 302), - on.on_next(610, 303), - on.on_next(620, 304), - on.on_next(700, 305), - on.on_completed(730) - }); + on.on_next(590, 301), + on.on_next(600, 302), + on.on_next(610, 303), + on.on_next(620, 304), + on.on_next(700, 305), + on.on_completed(730) + }); auto actual = res.get_observer().messages(); REQUIRE(required == actual); } @@ -171,7 +171,7 @@ SCENARIO("concat completes", "[concat][join][operators]"){ THEN("there was one subscription and one unsubscription to the ints"){ auto required = rxu::to_vector({ on.subscribe(200, 600) - }); + }); auto actual = xs.subscriptions(); REQUIRE(required == actual); } @@ -179,7 +179,7 @@ SCENARIO("concat completes", "[concat][join][operators]"){ THEN("there was one subscription and one unsubscription to the ys1"){ auto required = rxu::to_vector({ on.subscribe(300, 530) - }); + }); auto actual = ys1.subscriptions(); REQUIRE(required == actual); } @@ -187,7 +187,7 @@ SCENARIO("concat completes", "[concat][join][operators]"){ THEN("there was one subscription and one unsubscription to the ys2"){ auto required = rxu::to_vector({ on.subscribe(530, 580) - }); + }); auto actual = ys2.subscriptions(); REQUIRE(required == actual); } @@ -195,7 +195,7 @@ SCENARIO("concat completes", "[concat][join][operators]"){ THEN("there was one subscription and one unsubscription to the ys3"){ auto required = rxu::to_vector({ on.subscribe(580, 730) - }); + }); auto actual = ys3.subscriptions(); REQUIRE(required == actual); } diff --git a/Rx/v2/test/operators/concat_map.cpp b/Rx/v2/test/operators/concat_map.cpp index c05fb18..4f6b675 100644 --- a/Rx/v2/test/operators/concat_map.cpp +++ b/Rx/v2/test/operators/concat_map.cpp @@ -187,7 +187,7 @@ SCENARIO("concat_map completes", "[concat_map][map][operators]"){ i_on.on_next(100, 4), i_on.on_next(200, 2), i_on.on_completed(500) - }); + }); auto ys = sc.make_cold_observable({ s_on.on_next(50, "foo"), @@ -195,7 +195,7 @@ SCENARIO("concat_map completes", "[concat_map][map][operators]"){ s_on.on_next(150, "baz"), s_on.on_next(200, "qux"), s_on.on_completed(250) - }); + }); WHEN("each int is mapped to the strings"){ @@ -223,7 +223,7 @@ SCENARIO("concat_map completes", "[concat_map][map][operators]"){ s_on.on_next(700, "baz"), s_on.on_next(750, "qux"), s_on.on_completed(800) - }); + }); auto actual = res.get_observer().messages(); REQUIRE(required == actual); } @@ -231,7 +231,7 @@ SCENARIO("concat_map completes", "[concat_map][map][operators]"){ THEN("there was one subscription and one unsubscription to the ints"){ auto required = rxu::to_vector({ i_on.subscribe(200, 700) - }); + }); auto actual = xs.subscriptions(); REQUIRE(required == actual); } @@ -240,7 +240,7 @@ SCENARIO("concat_map completes", "[concat_map][map][operators]"){ auto required = rxu::to_vector({ s_on.subscribe(300, 550), s_on.subscribe(550, 800) - }); + }); auto actual = ys.subscriptions(); REQUIRE(required == actual); } diff --git a/Rx/v2/test/operators/filter.cpp b/Rx/v2/test/operators/filter.cpp index 4d56dfa..529f10a 100644 --- a/Rx/v2/test/operators/filter.cpp +++ b/Rx/v2/test/operators/filter.cpp @@ -123,7 +123,7 @@ SCENARIO("filter stops on disposal", "[where][filter][operators]"){ on.on_next(560, 10), on.on_next(580, 11), on.on_completed(600) - }); + }); WHEN("filtered to ints that are primes"){ @@ -201,7 +201,7 @@ SCENARIO("filter stops on error", "[where][filter][operators]"){ on.on_next(610, 12), on.on_error(620, std::runtime_error("error in unsubscribed stream")), on.on_completed(630) - }); + }); WHEN("filtered to ints that are primes"){ @@ -280,7 +280,7 @@ SCENARIO("filter stops on throw from predicate", "[where][filter][operators]"){ on.on_next(610, 12), on.on_error(620, std::runtime_error("error in unsubscribed stream")), on.on_completed(630) - }); + }); WHEN("filtered to ints that are primes"){ @@ -361,7 +361,7 @@ SCENARIO("filter stops on dispose from predicate", "[where][filter][operators]") on.on_next(610, 12), on.on_error(620, std::exception()), on.on_completed(630) - }); + }); auto res = w.make_subscriber<int>(); diff --git a/Rx/v2/test/operators/merge.cpp b/Rx/v2/test/operators/merge.cpp index d287fe0..73af651 100644 --- a/Rx/v2/test/operators/merge.cpp +++ b/Rx/v2/test/operators/merge.cpp @@ -148,22 +148,22 @@ SCENARIO("merge completes", "[merge][join][operators]"){ THEN("the output contains merged ints"){ auto required = rxu::to_vector({ - on.on_next(310, 101), - on.on_next(320, 102), - on.on_next(410, 103), - on.on_next(410, 201), - on.on_next(420, 104), - on.on_next(420, 202), - on.on_next(430, 203), - on.on_next(440, 204), - on.on_next(510, 105), - on.on_next(510, 301), - on.on_next(520, 106), - on.on_next(520, 302), - on.on_next(530, 303), - on.on_next(540, 304), - on.on_next(620, 305), - on.on_completed(650) + on.on_next(310, 101), + on.on_next(320, 102), + on.on_next(410, 103), + on.on_next(410, 201), + on.on_next(420, 104), + on.on_next(420, 202), + on.on_next(430, 203), + on.on_next(440, 204), + on.on_next(510, 105), + on.on_next(510, 301), + on.on_next(520, 106), + on.on_next(520, 302), + on.on_next(530, 303), + on.on_next(540, 304), + on.on_next(620, 305), + on.on_completed(650) }); auto actual = res.get_observer().messages(); REQUIRE(required == actual); diff --git a/Rx/v2/test/operators/take.cpp b/Rx/v2/test/operators/take.cpp index f87b9df..39db55f 100644 --- a/Rx/v2/test/operators/take.cpp +++ b/Rx/v2/test/operators/take.cpp @@ -80,7 +80,7 @@ SCENARIO("take, complete after", "[take][operators]"){ on.on_next(590, 5), on.on_next(630, 10), on.on_completed(690) - }); + }); WHEN("20 values are taken"){ @@ -113,7 +113,7 @@ SCENARIO("take, complete after", "[take][operators]"){ on.on_next(590, 5), on.on_next(630, 10), on.on_completed(690) - }); + }); auto actual = res.get_observer().messages(); REQUIRE(required == actual); } @@ -121,7 +121,7 @@ SCENARIO("take, complete after", "[take][operators]"){ THEN("there was 1 subscription/unsubscription to the source"){ auto required = rxu::to_vector({ on.subscribe(200, 690) - }); + }); auto actual = xs.subscriptions(); REQUIRE(required == actual); } @@ -641,7 +641,7 @@ SCENARIO("take_until trigger on_next", "[take_until][take][operators]"){ on.on_next(150, 1), on.on_next(225, 99), on.on_completed(230) - }); + }); WHEN("one is taken until the other emits a marble"){ @@ -697,13 +697,13 @@ SCENARIO("take_until, preempt some data next", "[take_until][take][operators]"){ on.on_next(230, 4), on.on_next(240, 5), on.on_completed(250) - }); + }); auto r = sc.make_hot_observable({ on.on_next(150, 1), on.on_next(225, 99), on.on_completed(230) - }); + }); WHEN("one is taken until the other emits a marble"){ |