Skip to content

Commit 3d7c0e1

Browse files
eabaeaba
authored
[obsolete] ExpectNext(params T[] elems) (#6505)
* [obsolete] `ExpectNext(params T[] elems)` > `ExpectNext(CancellationToken cancellationToken, params T[] elems)` * reverted * removed obsolete
1 parent 9707dbe commit 3d7c0e1

35 files changed

+128
-99
lines changed

‎src/core/Akka.Persistence.TCK/Query/CurrentEventsByPersistenceIdSpec.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//-----------------------------------------------------------------------
77

88
using System;
9+
using System.Threading;
910
using System.Threading.Tasks;
1011
using Akka.Actor;
1112
using Akka.Configuration;
@@ -47,7 +48,7 @@ public virtual void ReadJournal_CurrentEventsByPersistenceId_should_find_existin
4748
var src = queries.CurrentEventsByPersistenceId("a", 0, long.MaxValue);
4849
var probe = src.Select(x => x.Event).RunWith(this.SinkProbe<object>(), Materializer);
4950
probe.Request(2)
50-
.ExpectNext("a-1", "a-2")
51+
.ExpectNext( "a-1", "a-2")
5152
.ExpectNoMsg(TimeSpan.FromMilliseconds(500));
5253
probe.Request(2)
5354
.ExpectNext("a-3")
@@ -62,7 +63,7 @@ public virtual void ReadJournal_CurrentEventsByPersistenceId_should_find_existin
6263
var src = queries.CurrentEventsByPersistenceId("b", 0L, 2L);
6364
var probe = src.Select(x => x.Event).RunWith(this.SinkProbe<object>(), Materializer)
6465
.Request(5)
65-
.ExpectNext("b-1", "b-2")
66+
.ExpectNext( "b-1", "b-2")
6667
.ExpectComplete();
6768
}
6869

@@ -74,7 +75,7 @@ public virtual void ReadJournal_CurrentEventsByPersistenceId_should_not_see_new_
7475
var src = queries.CurrentEventsByPersistenceId("f", 0L, long.MaxValue);
7576
var probe = src.Select(x => x.Event).RunWith(this.SinkProbe<object>(), Materializer);
7677
probe.Request(2)
77-
.ExpectNext("f-1", "f-2")
78+
.ExpectNext( "f-1", "f-2")
7879
.ExpectNoMsg(TimeSpan.FromMilliseconds(100));
7980

8081
pref.Tell("f-4");

‎src/core/Akka.Persistence.TCK/Query/EventsByPersistenceIdSpec.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//-----------------------------------------------------------------------
77

88
using System;
9+
using System.Threading;
910
using System.Threading.Tasks;
1011
using Akka.Actor;
1112
using Akka.Configuration;
@@ -47,7 +48,7 @@ public void ReadJournal_live_query_EventsByPersistenceId_should_find_new_events(
4748
var src = queries.EventsByPersistenceId("c", 0, long.MaxValue);
4849
var probe = src.Select(x => x.Event).RunWith(this.SinkProbe<object>(), Materializer)
4950
.Request(5)
50-
.ExpectNext("c-1", "c-2", "c-3");
51+
.ExpectNext( "c-1", "c-2", "c-3");
5152

5253
pref.Tell("c-4");
5354
ExpectMsg("c-4-done");
@@ -64,7 +65,7 @@ public void ReadJournal_live_query_EventsByPersistenceId_should_find_new_events_
6465
var src = queries.EventsByPersistenceId("d", 0, 4);
6566
var probe = src.Select(x => x.Event).RunWith(this.SinkProbe<object>(), Materializer)
6667
.Request(5)
67-
.ExpectNext("d-1", "d-2", "d-3");
68+
.ExpectNext( "d-1", "d-2", "d-3");
6869

6970
pref.Tell("d-4");
7071
ExpectMsg("d-4-done");
@@ -81,7 +82,7 @@ public void ReadJournal_live_query_EventsByPersistenceId_should_find_new_events_
8182
var src = queries.EventsByPersistenceId("e", 0, long.MaxValue);
8283
var probe = src.Select(x => x.Event).RunWith(this.SinkProbe<object>(), Materializer);
8384
probe.Request(2)
84-
.ExpectNext("e-1", "e-2")
85+
.ExpectNext( "e-1", "e-2")
8586
.ExpectNoMsg(TimeSpan.FromMilliseconds(100));
8687

8788
pref.Tell("e-4");

‎src/core/Akka.Streams.TestKit/TestSubscriber_Fluent.cs

-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public ManualProbe<T> ExpectNext(TimeSpan? timeout, T element, CancellationToken
6666
/// <summary>
6767
/// Fluent DSL. Expect multiple stream elements.
6868
/// </summary>
69-
[Obsolete("Use the method with CancellationToken support instead")]
7069
public ManualProbe<T> ExpectNext(params T[] elems)
7170
{
7271
ExpectNextTask(this, null, default, elems)

‎src/core/Akka.Streams.Tests/Dsl/ActorRefSourceSpec.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
using System;
99
using System.Linq;
10+
using System.Threading;
1011
using Akka.Actor;
1112
using Akka.Streams.Dsl;
1213
using Akka.Streams.TestKit;
@@ -132,7 +133,7 @@ public void A_ActorRefSource_must_signal_buffered_elements_and_complete_the_stre
132133
actorRef.Tell(3);
133134
actorRef.Tell(new Status.Success("ok"));
134135
sub.Request(10);
135-
s.ExpectNext(1, 2, 3);
136+
s.ExpectNext( 1, 2, 3);
136137
s.ExpectComplete();
137138
}, Materializer);
138139
}
@@ -155,7 +156,7 @@ public void A_ActorRefSource_must_not_buffer_elements_after_receiving_Status_Suc
155156
actorRef.Tell(100);
156157
actorRef.Tell(100);
157158
sub.Request(10);
158-
s.ExpectNext(1, 2, 3);
159+
s.ExpectNext( 1, 2, 3);
159160
s.ExpectComplete();
160161

161162
}, Materializer);

‎src/core/Akka.Streams.Tests/Dsl/FlowExpandSpec.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public void Expand_must_work_properly_with_finite_extrapolations()
184184
source.SendNext(1);
185185

186186
sink.Request(4)
187-
.ExpectNext((1, 0), (1, 1), (1, 2))
187+
.ExpectNext( (1, 0), (1, 1), (1, 2))
188188
.ExpectNoMsg(TimeSpan.FromMilliseconds(100));
189189

190190
source.SendNext(2).SendComplete();

‎src/core/Akka.Streams.Tests/Dsl/FlowInterleaveSpec.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System;
99
using System.Collections.Generic;
1010
using System.Linq;
11+
using System.Threading;
1112
using Akka.Streams.Dsl;
1213
using Akka.Streams.TestKit;
1314
using Akka.Util.Internal;
@@ -68,7 +69,7 @@ public void An_Interleave_for_Flow_must_work_when_segmentSize_is_not_equal_eleme
6869
.RunWith(Sink.FromSubscriber(probe), Materializer);
6970

7071
probe.ExpectSubscription().Request(10);
71-
probe.ExpectNext(0, 1, 3, 4, 2, 5);
72+
probe.ExpectNext( 0, 1, 3, 4, 2, 5);
7273
probe.ExpectComplete();
7374
}, Materializer);
7475
}
@@ -85,7 +86,7 @@ public void An_Interleave_for_Flow_must_work_with_segmentSize_1()
8586
.RunWith(Sink.FromSubscriber(probe), Materializer);
8687

8788
probe.ExpectSubscription().Request(10);
88-
probe.ExpectNext(0, 3, 1, 4, 2, 5);
89+
probe.ExpectNext( 0, 3, 1, 4, 2, 5);
8990
probe.ExpectComplete();
9091
}, Materializer);
9192
}

‎src/core/Akka.Streams.Tests/Dsl/FlowKillSwitchSpec.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public void A_SharedKillSwitch_must_provide_a_flow_that_if_materialized_multiple
220220

221221
downstream2.Request(2);
222222
upstream2.SendNext("A").SendNext("B");
223-
downstream2.ExpectNext("A", "B");
223+
downstream2.ExpectNext( "A", "B");
224224

225225
killSwitch.Shutdown();
226226

@@ -258,7 +258,7 @@ public void A_SharedKillSwitch_must_provide_a_flow_that_if_materialized_multiple
258258

259259
downstream2.Request(2);
260260
upstream2.SendNext("A").SendNext("B");
261-
downstream2.ExpectNext("A", "B");
261+
downstream2.ExpectNext( "A", "B");
262262

263263
var testException = new TestException("Abort");
264264
killSwitch.Abort(testException);
@@ -591,7 +591,7 @@ public void A_CancellationToken_flow_must_provide_a_flow_that_if_materialized_mu
591591

592592
downstream2.Request(2);
593593
upstream2.SendNext("A").SendNext("B");
594-
downstream2.ExpectNext("A", "B");
594+
downstream2.ExpectNext( "A", "B");
595595

596596
cancel.Cancel();
597597

@@ -629,7 +629,7 @@ public void A_CancellationToken_flow_must_provide_a_flow_that_if_materialized_mu
629629

630630
downstream2.Request(2);
631631
upstream2.SendNext("A").SendNext("B");
632-
downstream2.ExpectNext("A", "B");
632+
downstream2.ExpectNext( "A", "B");
633633

634634
cancel.Cancel();
635635
upstream1.ExpectCancellation();

‎src/core/Akka.Streams.Tests/Dsl/FlowRecoverSpec.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//-----------------------------------------------------------------------
77

88
using System.Linq;
9+
using System.Threading;
910
using Akka.Streams.Dsl;
1011
using Akka.Streams.TestKit;
1112
using Akka.Streams.Util;
@@ -80,7 +81,7 @@ public void A_Recover_must_not_influence_stream_when_there_is_no_exception()
8081
.Recover(_ => Option<int>.Create(0))
8182
.RunWith(this.SinkProbe<int>(), Materializer)
8283
.Request(3)
83-
.ExpectNext(1, 2, 3)
84+
.ExpectNext( 1, 2, 3)
8485
.ExpectComplete();
8586
}, Materializer);
8687
}

‎src/core/Akka.Streams.Tests/Dsl/FlowRecoverWithSpec.cs

+13-12
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
using System;
99
using System.Linq;
10+
using System.Threading;
1011
using Akka.Streams.Dsl;
1112
using Akka.Streams.Stage;
1213
using Akka.Streams.TestKit;
@@ -71,7 +72,7 @@ public void A_RecoverWith_must_cancel_substream_if_parent_is_terminated_when_the
7172

7273
probe
7374
.Request(2)
74-
.ExpectNext(1, 2);
75+
.ExpectNext( 1, 2);
7576

7677
probe
7778
.Request(1)
@@ -118,15 +119,15 @@ public void A_RecoverWith_must_be_able_to_recover_with_the_same_unmaterialized_s
118119

119120
probe
120121
.Request(2)
121-
.ExpectNext(1, 2);
122+
.ExpectNext( 1, 2);
122123

123124
probe
124125
.Request(2)
125-
.ExpectNext(1, 2);
126+
.ExpectNext( 1, 2);
126127

127128
probe
128129
.Request(2)
129-
.ExpectNext(1, 2);
130+
.ExpectNext( 1, 2);
130131

131132
probe.Cancel();
132133
}, Materializer);
@@ -142,7 +143,7 @@ public void A_RecoverWith_must_not_influence_stream_when_there_is_no_exception()
142143
.RecoverWithRetries(_ => Source.Single(0), -1)
143144
.RunWith(this.SinkProbe<int>(), Materializer)
144145
.Request(3)
145-
.ExpectNext(1, 2, 3)
146+
.ExpectNext( 1, 2, 3)
146147
.ExpectComplete();
147148
}, Materializer);
148149
}
@@ -187,11 +188,11 @@ public void A_RecoverWith_must_switch_the_second_time_if_alternative_source_thro
187188

188189
probe
189190
.Request(2)
190-
.ExpectNext(1, 2);
191+
.ExpectNext( 1, 2);
191192

192193
probe
193194
.Request(2)
194-
.ExpectNext(11, 33);
195+
.ExpectNext( 11, 33);
195196

196197
probe
197198
.Request(1)
@@ -227,7 +228,7 @@ public void A_RecoverWith_must_terminate_with_exception_if_partial_function_fail
227228

228229
probe
229230
.Request(2)
230-
.ExpectNext(1, 2);
231+
.ExpectNext( 1, 2);
231232

232233
probe
233234
.Request(1)
@@ -260,10 +261,10 @@ public void A_RecoverWith_must_terminate_with_exception_after_set_number_of_retr
260261
}), 3)
261262
.RunWith(this.SinkProbe<int>(), Materializer);
262263

263-
probe.Request(2).ExpectNext(1, 2);
264-
probe.Request(2).ExpectNext(11, 22);
265-
probe.Request(2).ExpectNext(11, 22);
266-
probe.Request(2).ExpectNext(11, 22);
264+
probe.Request(2).ExpectNext( 1, 2);
265+
probe.Request(2).ExpectNext( 11, 22);
266+
probe.Request(2).ExpectNext( 11, 22);
267+
probe.Request(2).ExpectNext( 11, 22);
267268
probe.Request(1).ExpectError().Should().Be(Ex);
268269
}, Materializer);
269270
}

‎src/core/Akka.Streams.Tests/Dsl/FlowScanAsyncSpec.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System;
99
using System.Collections.Generic;
1010
using System.Linq;
11+
using System.Threading;
1112
using System.Threading.Tasks;
1213
using Akka.Streams.Dsl;
1314
using Akka.Streams.Implementation;
@@ -53,7 +54,7 @@ public void A_ScanAsync_must_work_with_a_single_source()
5354
.Via(SumScanFlow)
5455
.RunWith(this.SinkProbe<int>(), Materializer)
5556
.Request(2)
56-
.ExpectNext(0, 1)
57+
.ExpectNext( 0, 1)
5758
.ExpectComplete();
5859
}
5960

@@ -101,7 +102,7 @@ public void A_ScanAsync_with_the_restarting_decider_must_skip_error_values_with_
101102
var elements = new[] { 1, -1, 1 };
102103

103104
WhenFailedScan(elements, 0, decider: Deciders.RestartingDecider)
104-
.ExpectNext(1, 1)
105+
.ExpectNext( 1, 1)
105106
.ExpectComplete();
106107
}
107108

@@ -111,7 +112,7 @@ public void A_ScanAsync_with_the_restarting_decider_must_emit_zero_with_a_failed
111112
var elements = new[] { 1, -1, 1 };
112113

113114
WhenFailedTask(elements, 0, decider: Deciders.RestartingDecider)
114-
.ExpectNext(1, 1)
115+
.ExpectNext( 1, 1)
115116
.ExpectComplete();
116117
}
117118

@@ -121,7 +122,7 @@ public void A_ScanAsync_with_the_resuming_decider_must_skip_values_with_a_failed
121122
var elements = new[] { 1, -1, 1 };
122123

123124
WhenFailedScan(elements, 0, decider: Deciders.ResumingDecider)
124-
.ExpectNext(1, 2)
125+
.ExpectNext( 1, 2)
125126
.ExpectComplete();
126127
}
127128

@@ -131,7 +132,7 @@ public void A_ScanAsync_with_the_resuming_decider_must_skip_values_with_a_failed
131132
var elements = new[] { 1, -1, 1 };
132133

133134
WhenFailedTask(elements, 0, decider: Deciders.ResumingDecider)
134-
.ExpectNext(1, 2)
135+
.ExpectNext( 1, 2)
135136
.ExpectComplete();
136137
}
137138

‎src/core/Akka.Streams.Tests/Dsl/FlowSelectManySpec.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void SelectMany_should_be_able_to_resume()
9090
})
9191
.WithAttributes(ActorAttributes.CreateSupervisionStrategy(Deciders.ResumingDecider))
9292
.RunWith(this.SinkProbe<int>(), Materializer)
93-
.Request(4).ExpectNext(1, 2, 4, 5)
93+
.Request(4).ExpectNext( 1, 2, 4, 5)
9494
.ExpectComplete();
9595
}
9696
}

‎src/core/Akka.Streams.Tests/Dsl/FlowSkipWhileSpec.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//-----------------------------------------------------------------------
77

88
using System.Linq;
9+
using System.Threading;
910
using Akka.Streams.Dsl;
1011
using Akka.Streams.Supervision;
1112
using Akka.Streams.TestKit;
@@ -35,7 +36,7 @@ public void A_SkipWhile_must_skip_while_predicate_is_true()
3536
.SkipWhile(x => x < 3)
3637
.RunWith(this.SinkProbe<int>(), Materializer)
3738
.Request(2)
38-
.ExpectNext(3, 4)
39+
.ExpectNext( 3, 4)
3940
.ExpectComplete();
4041
}, Materializer);
4142
}

‎src/core/Akka.Streams.Tests/Dsl/FlowStatefulSelectManySpec.cs

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System;
99
using System.Collections.Generic;
1010
using System.Linq;
11+
using System.Threading;
1112
using Akka.Streams.Dsl;
1213
using Akka.Streams.Supervision;
1314
using Akka.Streams.TestKit;
@@ -91,8 +92,8 @@ public void A_StatefulSelectMany_must_be_able_to_restart()
9192
.WithAttributes(ActorAttributes.CreateSupervisionStrategy(Deciders.RestartingDecider))
9293
.RunWith(this.SinkProbe<int>(), Materializer);
9394

94-
probe.Request(2).ExpectNext(1, 1);
95-
probe.Request(4).ExpectNext(1, 1, 1, 1);
95+
probe.Request(2).ExpectNext( 1, 1);
96+
probe.Request(4).ExpectNext( 1, 1, 1, 1);
9697
probe.ExpectComplete();
9798
}
9899

@@ -122,9 +123,9 @@ public void A_StatefulSelectMany_must_be_able_to_resume()
122123
.WithAttributes(ActorAttributes.CreateSupervisionStrategy(Deciders.ResumingDecider))
123124
.RunWith(this.SinkProbe<int>(), Materializer);
124125

125-
probe.Request(2).ExpectNext(1, 1);
126+
probe.Request(2).ExpectNext( 1, 1);
126127
probe.RequestNext(4);
127-
probe.Request(4).ExpectNext(1, 1, 1, 1);
128+
probe.Request(4).ExpectNext( 1, 1, 1, 1);
128129
probe.ExpectComplete();
129130
}
130131
}

0 commit comments

Comments
 (0)