Skip to content

Commit d68f9d2

Browse files
committed
Enabled tests for WeakRefMessenger
1 parent 5840ad0 commit d68f9d2

File tree

3 files changed

+96
-0
lines changed

3 files changed

+96
-0
lines changed

UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ public partial class Test_Messenger
1616
[TestCategory("Mvvm")]
1717
[TestMethod]
1818
[DataRow(typeof(Messenger))]
19+
#if NETCOREAPP3_1
20+
[DataRow(typeof(WeakRefMessenger))]
21+
#endif
1922
public void Test_Messenger_RequestMessage_Ok(Type type)
2023
{
2124
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -44,6 +47,9 @@ void Receive(object recipient, NumberRequestMessage m)
4447
[TestCategory("Mvvm")]
4548
[TestMethod]
4649
[DataRow(typeof(Messenger))]
50+
#if NETCOREAPP3_1
51+
[DataRow(typeof(WeakRefMessenger))]
52+
#endif
4753
[ExpectedException(typeof(InvalidOperationException))]
4854
public void Test_Messenger_RequestMessage_Fail_NoReply(Type type)
4955
{
@@ -55,6 +61,9 @@ public void Test_Messenger_RequestMessage_Fail_NoReply(Type type)
5561
[TestCategory("Mvvm")]
5662
[TestMethod]
5763
[DataRow(typeof(Messenger))]
64+
#if NETCOREAPP3_1
65+
[DataRow(typeof(WeakRefMessenger))]
66+
#endif
5867
[ExpectedException(typeof(InvalidOperationException))]
5968
public void Test_Messenger_RequestMessage_Fail_MultipleReplies(Type type)
6069
{
@@ -79,6 +88,9 @@ public class NumberRequestMessage : RequestMessage<int>
7988
[TestCategory("Mvvm")]
8089
[TestMethod]
8190
[DataRow(typeof(Messenger))]
91+
#if NETCOREAPP3_1
92+
[DataRow(typeof(WeakRefMessenger))]
93+
#endif
8294
public async Task Test_Messenger_AsyncRequestMessage_Ok_Sync(Type type)
8395
{
8496
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -103,6 +115,9 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
103115
[TestCategory("Mvvm")]
104116
[TestMethod]
105117
[DataRow(typeof(Messenger))]
118+
#if NETCOREAPP3_1
119+
[DataRow(typeof(WeakRefMessenger))]
120+
#endif
106121
public async Task Test_Messenger_AsyncRequestMessage_Ok_Async(Type type)
107122
{
108123
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -134,6 +149,9 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
134149
[TestCategory("Mvvm")]
135150
[TestMethod]
136151
[DataRow(typeof(Messenger))]
152+
#if NETCOREAPP3_1
153+
[DataRow(typeof(WeakRefMessenger))]
154+
#endif
137155
[ExpectedException(typeof(InvalidOperationException))]
138156
public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply(Type type)
139157
{
@@ -145,6 +163,9 @@ public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply(Type type)
145163
[TestCategory("Mvvm")]
146164
[TestMethod]
147165
[DataRow(typeof(Messenger))]
166+
#if NETCOREAPP3_1
167+
[DataRow(typeof(WeakRefMessenger))]
168+
#endif
148169
[ExpectedException(typeof(InvalidOperationException))]
149170
public async Task Test_Messenger_AsyncRequestMessage_Fail_MultipleReplies(Type type)
150171
{
@@ -169,6 +190,9 @@ public class AsyncNumberRequestMessage : AsyncRequestMessage<int>
169190
[TestCategory("Mvvm")]
170191
[TestMethod]
171192
[DataRow(typeof(Messenger))]
193+
#if NETCOREAPP3_1
194+
[DataRow(typeof(WeakRefMessenger))]
195+
#endif
172196
public void Test_Messenger_CollectionRequestMessage_Ok_NoReplies(Type type)
173197
{
174198
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -188,6 +212,9 @@ void Receive(object recipient, NumbersCollectionRequestMessage m)
188212
[TestCategory("Mvvm")]
189213
[TestMethod]
190214
[DataRow(typeof(Messenger))]
215+
#if NETCOREAPP3_1
216+
[DataRow(typeof(WeakRefMessenger))]
217+
#endif
191218
public void Test_Messenger_CollectionRequestMessage_Ok_MultipleReplies(Type type)
192219
{
193220
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -242,6 +269,9 @@ public class NumbersCollectionRequestMessage : CollectionRequestMessage<int>
242269
[TestCategory("Mvvm")]
243270
[TestMethod]
244271
[DataRow(typeof(Messenger))]
272+
#if NETCOREAPP3_1
273+
[DataRow(typeof(WeakRefMessenger))]
274+
#endif
245275
public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_NoReplies(Type type)
246276
{
247277
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -261,6 +291,9 @@ void Receive(object recipient, AsyncNumbersCollectionRequestMessage m)
261291
[TestCategory("Mvvm")]
262292
[TestMethod]
263293
[DataRow(typeof(Messenger))]
294+
#if NETCOREAPP3_1
295+
[DataRow(typeof(WeakRefMessenger))]
296+
#endif
264297
public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_MultipleReplies(Type type)
265298
{
266299
var messenger = (IMessenger)Activator.CreateInstance(type);

UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ public partial class Test_Messenger
1414
[TestCategory("Mvvm")]
1515
[TestMethod]
1616
[DataRow(typeof(Messenger))]
17+
#if NETCOREAPP3_1
18+
[DataRow(typeof(WeakRefMessenger))]
19+
#endif
1720
public void Test_Messenger_UnregisterRecipientWithMessageType(Type type)
1821
{
1922
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -25,6 +28,9 @@ public void Test_Messenger_UnregisterRecipientWithMessageType(Type type)
2528
[TestCategory("Mvvm")]
2629
[TestMethod]
2730
[DataRow(typeof(Messenger))]
31+
#if NETCOREAPP3_1
32+
[DataRow(typeof(WeakRefMessenger))]
33+
#endif
2834
public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken(Type type)
2935
{
3036
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -36,6 +42,9 @@ public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken(Type type)
3642
[TestCategory("Mvvm")]
3743
[TestMethod]
3844
[DataRow(typeof(Messenger))]
45+
#if NETCOREAPP3_1
46+
[DataRow(typeof(WeakRefMessenger))]
47+
#endif
3948
public void Test_Messenger_UnregisterRecipientWithToken(Type type)
4049
{
4150
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -47,6 +56,9 @@ public void Test_Messenger_UnregisterRecipientWithToken(Type type)
4756
[TestCategory("Mvvm")]
4857
[TestMethod]
4958
[DataRow(typeof(Messenger))]
59+
#if NETCOREAPP3_1
60+
[DataRow(typeof(WeakRefMessenger))]
61+
#endif
5062
public void Test_Messenger_UnregisterRecipientWithRecipient(Type type)
5163
{
5264
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -58,6 +70,9 @@ public void Test_Messenger_UnregisterRecipientWithRecipient(Type type)
5870
[TestCategory("Mvvm")]
5971
[TestMethod]
6072
[DataRow(typeof(Messenger))]
73+
#if NETCOREAPP3_1
74+
[DataRow(typeof(WeakRefMessenger))]
75+
#endif
6176
public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType(Type type)
6277
{
6378
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -73,6 +88,9 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType(Type ty
7388
[TestCategory("Mvvm")]
7489
[TestMethod]
7590
[DataRow(typeof(Messenger))]
91+
#if NETCOREAPP3_1
92+
[DataRow(typeof(WeakRefMessenger))]
93+
#endif
7694
public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken(Type type)
7795
{
7896
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -88,6 +106,9 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken
88106
[TestCategory("Mvvm")]
89107
[TestMethod]
90108
[DataRow(typeof(Messenger))]
109+
#if NETCOREAPP3_1
110+
[DataRow(typeof(WeakRefMessenger))]
111+
#endif
91112
public void Test_Messenger_RegisterAndUnregisterRecipientWithToken(Type type)
92113
{
93114
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -103,6 +124,9 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithToken(Type type)
103124
[TestCategory("Mvvm")]
104125
[TestMethod]
105126
[DataRow(typeof(Messenger))]
127+
#if NETCOREAPP3_1
128+
[DataRow(typeof(WeakRefMessenger))]
129+
#endif
106130
public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient(Type type)
107131
{
108132
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -118,6 +142,9 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient(Type type
118142
[TestCategory("Mvvm")]
119143
[TestMethod]
120144
[DataRow(typeof(Messenger))]
145+
#if NETCOREAPP3_1
146+
[DataRow(typeof(WeakRefMessenger))]
147+
#endif
121148
public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithNoToken(Type type)
122149
{
123150
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -157,6 +184,9 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithN
157184
[TestCategory("Mvvm")]
158185
[TestMethod]
159186
[DataRow(typeof(Messenger))]
187+
#if NETCOREAPP3_1
188+
[DataRow(typeof(WeakRefMessenger))]
189+
#endif
160190
public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNoToken(Type type)
161191
{
162192
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -186,6 +216,9 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNo
186216
[TestCategory("Mvvm")]
187217
[TestMethod]
188218
[DataRow(typeof(Messenger))]
219+
#if NETCOREAPP3_1
220+
[DataRow(typeof(WeakRefMessenger))]
221+
#endif
189222
public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithToken(Type type)
190223
{
191224
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -215,6 +248,9 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithT
215248
[TestCategory("Mvvm")]
216249
[TestMethod]
217250
[DataRow(typeof(Messenger))]
251+
#if NETCOREAPP3_1
252+
[DataRow(typeof(WeakRefMessenger))]
253+
#endif
218254
public void Test_Messenger_DuplicateRegistrationWithMessageType(Type type)
219255
{
220256
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -231,6 +267,9 @@ public void Test_Messenger_DuplicateRegistrationWithMessageType(Type type)
231267
[TestCategory("Mvvm")]
232268
[TestMethod]
233269
[DataRow(typeof(Messenger))]
270+
#if NETCOREAPP3_1
271+
[DataRow(typeof(WeakRefMessenger))]
272+
#endif
234273
public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken(Type type)
235274
{
236275
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -247,6 +286,9 @@ public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken(Type typ
247286
[TestCategory("Mvvm")]
248287
[TestMethod]
249288
[DataRow(typeof(Messenger))]
289+
#if NETCOREAPP3_1
290+
[DataRow(typeof(WeakRefMessenger))]
291+
#endif
250292
public void Test_Messenger_IRecipient_NoMessages(Type type)
251293
{
252294
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -261,6 +303,9 @@ public void Test_Messenger_IRecipient_NoMessages(Type type)
261303
[TestCategory("Mvvm")]
262304
[TestMethod]
263305
[DataRow(typeof(Messenger))]
306+
#if NETCOREAPP3_1
307+
[DataRow(typeof(WeakRefMessenger))]
308+
#endif
264309
public void Test_Messenger_IRecipient_SomeMessages_NoToken(Type type)
265310
{
266311
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -293,6 +338,9 @@ public void Test_Messenger_IRecipient_SomeMessages_NoToken(Type type)
293338
[TestCategory("Mvvm")]
294339
[TestMethod]
295340
[DataRow(typeof(Messenger))]
341+
#if NETCOREAPP3_1
342+
[DataRow(typeof(WeakRefMessenger))]
343+
#endif
296344
public void Test_Messenger_IRecipient_SomeMessages_WithToken(Type type)
297345
{
298346
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -329,6 +377,9 @@ public void Test_Messenger_IRecipient_SomeMessages_WithToken(Type type)
329377
[TestCategory("Mvvm")]
330378
[TestMethod]
331379
[DataRow(typeof(Messenger))]
380+
#if NETCOREAPP3_1
381+
[DataRow(typeof(WeakRefMessenger))]
382+
#endif
332383
public void Test_Messenger_RegisterWithTypeParameter(Type type)
333384
{
334385
var messenger = (IMessenger)Activator.CreateInstance(type);

UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ public class Test_ObservableRecipient
1616
[TestCategory("Mvvm")]
1717
[TestMethod]
1818
[DataRow(typeof(Messenger))]
19+
#if NETCOREAPP3_1
20+
[DataRow(typeof(WeakRefMessenger))]
21+
#endif
1922
public void Test_ObservableRecipient_Activation(Type type)
2023
{
2124
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -37,6 +40,9 @@ public void Test_ObservableRecipient_Activation(Type type)
3740
[TestCategory("Mvvm")]
3841
[TestMethod]
3942
[DataRow(typeof(Messenger))]
43+
#if NETCOREAPP3_1
44+
[DataRow(typeof(WeakRefMessenger))]
45+
#endif
4046
public void Test_ObservableRecipient_IsSame(Type type)
4147
{
4248
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -57,6 +63,9 @@ public void Test_ObservableRecipient_Default()
5763
[TestCategory("Mvvm")]
5864
[TestMethod]
5965
[DataRow(typeof(Messenger))]
66+
#if NETCOREAPP3_1
67+
[DataRow(typeof(WeakRefMessenger))]
68+
#endif
6069
public void Test_ObservableRecipient_Injection(Type type)
6170
{
6271
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -68,6 +77,9 @@ public void Test_ObservableRecipient_Injection(Type type)
6877
[TestCategory("Mvvm")]
6978
[TestMethod]
7079
[DataRow(typeof(Messenger))]
80+
#if NETCOREAPP3_1
81+
[DataRow(typeof(WeakRefMessenger))]
82+
#endif
7183
public void Test_ObservableRecipient_Broadcast(Type type)
7284
{
7385
var messenger = (IMessenger)Activator.CreateInstance(type);

0 commit comments

Comments
 (0)