Skip to content

Commit dce014f

Browse files
RxDaveRxDave
committed
Fixed TCP Join and GroupJoin tests. (Barring the existing race condition for all TCP tests.)
1 parent ff0fff3 commit dce014f

File tree

2 files changed

+15
-37
lines changed

2 files changed

+15
-37
lines changed

‎Testing/Qactive.Tests/Tcp/Operators/GroupJoinTests.cs

+5-16
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Reactive;
33
using System.Reactive.Linq;
4-
using System.Runtime.Serialization;
54
using System.Threading.Tasks;
65
using Microsoft.VisualStudio.TestTools.UnitTesting;
76

@@ -23,9 +22,7 @@ from y in ys.Take(3)
2322
where x == y
2423
select x + y);
2524

26-
// TODO: The second parameter of Qbservable.Join is an IObservable<T> rather than an IQbservable<T>. Consider exposing various built-in serializable observable generators.
27-
QactiveAssert.AreEqual(results, OnError<int>(new SerializationException("Type 'System.Reactive.Linq.ObservableImpl.Range' in Assembly 'System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' is not marked as serializable.")));
28-
//QactiveAssert.Equal(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
25+
QactiveAssert.AreEqual(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
2926
}
3027

3128
[TestMethod]
@@ -42,9 +39,7 @@ from y in ys.Take(3)
4239
where x == y
4340
select x + y);
4441

45-
// TODO: The second parameter of Qbservable.Join is an IObservable<T> rather than an IQbservable<T>. Consider exposing various built-in serializable observable generators.
46-
QactiveAssert.AreEqual(results, OnError<int>(new SerializationException("Type 'System.Reactive.Linq.ObservableImpl.Range' in Assembly 'System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' is not marked as serializable.")));
47-
//QactiveAssert.Equal(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
42+
QactiveAssert.AreEqual(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
4843
}
4944

5045
[TestMethod]
@@ -62,9 +57,7 @@ from y in ys.Take(3)
6257
where x == y
6358
select x + y);
6459

65-
// TODO: The second parameter of Qbservable.Join is an IObservable<T> rather than an IQbservable<T>. Consider exposing various built-in serializable observable generators.
66-
QactiveAssert.AreEqual(results, OnError<int>(new SerializationException("Type 'System.Reactive.Linq.ObservableImpl.Range' in Assembly 'System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' is not marked as serializable.")));
67-
//QactiveAssert.Equal(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
60+
QactiveAssert.AreEqual(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
6861
}
6962

7063
[TestMethod]
@@ -81,9 +74,7 @@ from y in ys.Take(3)
8174
where x == y
8275
select x + y);
8376

84-
// TODO: The second parameter of Qbservable.Join is an IObservable<T> rather than an IQbservable<T>. Consider exposing various built-in serializable observable generators.
85-
QactiveAssert.AreEqual(results, OnError<int>(new SerializationException("Type 'System.Reactive.Linq.ObservableImpl.Range' in Assembly 'System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' is not marked as serializable.")));
86-
//QactiveAssert.Equal(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
77+
QactiveAssert.AreEqual(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
8778
}
8879

8980
[TestMethod]
@@ -101,9 +92,7 @@ from y in ys.Take(3)
10192
where x == y
10293
select x + y);
10394

104-
// TODO: The second parameter of Qbservable.Join is an IObservable<T> rather than an IQbservable<T>. Consider exposing various built-in serializable observable generators.
105-
QactiveAssert.AreEqual(results, OnError<int>(new SerializationException("Type 'System.Reactive.Linq.ObservableImpl.Range' in Assembly 'System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' is not marked as serializable.")));
106-
//QactiveAssert.Equal(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
95+
QactiveAssert.AreEqual(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
10796
}
10897

10998
private sealed class TestContext

‎Testing/Qactive.Tests/Tcp/Operators/JoinTests.cs

+10-21
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Reactive;
33
using System.Reactive.Linq;
4-
using System.Runtime.Serialization;
54
using System.Threading.Tasks;
65
using Microsoft.VisualStudio.TestTools.UnitTesting;
76

@@ -13,23 +12,21 @@ public class JoinTests : TestBase
1312
[TestMethod]
1413
public async Task Join()
1514
{
16-
var service = TcpTestService.Create(TcpTestService.UnrestrictedExpressionsOptions, Observable.Range(0, 6));
15+
var service = TcpTestService.Create(TcpTestService.UnrestrictedOptions, Observable.Range(0, 6));
1716

1817
var results = await service.QueryAsync(source => from x in source
1918
join y in Observable.Range(3, 7)
2019
on Observable.Never<Unit>() equals Observable.Never<Unit>()
2120
where x == y
2221
select x + y);
2322

24-
// TODO: The second parameter of Qbservable.Join is an IObservable<T> rather than an IQbservable<T>. Consider exposing various built-in serializable observable generators.
25-
QactiveAssert.AreEqual(results, OnError<int>(new SerializationException("Type 'System.Reactive.Linq.ObservableImpl.Range' in Assembly 'System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' is not marked as serializable.")));
26-
//QactiveAssert.Equal(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
23+
QactiveAssert.AreEqual(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
2724
}
2825

2926
[TestMethod]
3027
public async Task JoinClosure()
3128
{
32-
var service = TcpTestService.Create(TcpTestService.UnrestrictedExpressionsOptions, Observable.Range(0, 6));
29+
var service = TcpTestService.Create(TcpTestService.UnrestrictedOptions, Observable.Range(0, 6));
3330
var range3To7 = Observable.Range(3, 5);
3431

3532
var results = await service.QueryAsync(source => from x in source
@@ -38,15 +35,13 @@ on Observable.Never<Unit>() equals Observable.Never<Unit>()
3835
where x == y
3936
select x + y);
4037

41-
// TODO: The second parameter of Qbservable.Join is an IObservable<T> rather than an IQbservable<T>. Consider exposing various built-in serializable observable generators.
42-
QactiveAssert.AreEqual(results, OnError<int>(new SerializationException("Type 'System.Reactive.Linq.ObservableImpl.Range' in Assembly 'System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' is not marked as serializable.")));
43-
//QactiveAssert.Equal(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
38+
QactiveAssert.AreEqual(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
4439
}
4540

4641
[TestMethod]
4742
public async Task JoinDurationClosure()
4843
{
49-
var service = TcpTestService.Create(TcpTestService.UnrestrictedExpressionsOptions, Observable.Range(0, 6));
44+
var service = TcpTestService.Create(TcpTestService.UnrestrictedOptions, Observable.Range(0, 6));
5045
var range3To7 = Observable.Range(3, 5);
5146
var otherDuration = Observable.Never<Unit>();
5247

@@ -56,15 +51,13 @@ on Observable.Never<Unit>() equals otherDuration
5651
where x == y
5752
select x + y);
5853

59-
// TODO: The second parameter of Qbservable.Join is an IObservable<T> rather than an IQbservable<T>. Consider exposing various built-in serializable observable generators.
60-
QactiveAssert.AreEqual(results, OnError<int>(new SerializationException("Type 'System.Reactive.Linq.ObservableImpl.Range' in Assembly 'System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' is not marked as serializable.")));
61-
//QactiveAssert.Equal(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
54+
QactiveAssert.AreEqual(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
6255
}
6356

6457
[TestMethod]
6558
public async Task JoinWithContext()
6659
{
67-
var service = TcpTestService.Create(TcpTestService.UnrestrictedExpressionsOptions, Observable.Return(new TestContext()));
60+
var service = TcpTestService.Create(TcpTestService.UnrestrictedOptions, Observable.Return(new TestContext()));
6861

6962
var results = await service.QueryAsync(source => from context in source
7063
from x in context.Range0To5
@@ -73,15 +66,13 @@ on Observable.Never<Unit>() equals Observable.Never<Unit>()
7366
where x == y
7467
select x + y);
7568

76-
// TODO: The second parameter of Qbservable.Join is an IObservable<T> rather than an IQbservable<T>. Consider exposing various built-in serializable observable generators.
77-
QactiveAssert.AreEqual(results, OnError<int>(new SerializationException("Type 'System.Reactive.Linq.ObservableImpl.Range' in Assembly 'System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' is not marked as serializable.")));
78-
//QactiveAssert.Equal(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
69+
QactiveAssert.AreEqual(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
7970
}
8071

8172
[TestMethod]
8273
public async Task JoinClosureWithContext()
8374
{
84-
var service = TcpTestService.Create(TcpTestService.UnrestrictedExpressionsOptions, Observable.Return(new TestContext()));
75+
var service = TcpTestService.Create(TcpTestService.UnrestrictedOptions, Observable.Return(new TestContext()));
8576
var range3To7 = Observable.Range(3, 5);
8677

8778
var results = await service.QueryAsync(source => from context in source
@@ -91,9 +82,7 @@ on Observable.Never<Unit>() equals Observable.Never<Unit>()
9182
where x == y
9283
select x + y);
9384

94-
// TODO: The second parameter of Qbservable.Join is an IObservable<T> rather than an IQbservable<T>. Consider exposing various built-in serializable observable generators.
95-
QactiveAssert.AreEqual(results, OnError<int>(new SerializationException("Type 'System.Reactive.Linq.ObservableImpl.Range' in Assembly 'System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' is not marked as serializable.")));
96-
//QactiveAssert.Equal(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
85+
QactiveAssert.AreEqual(results, OnNext(6), OnNext(8), OnNext(10), OnCompleted<int>());
9786
}
9887

9988
private sealed class TestContext

0 commit comments

Comments
 (0)