Skip to content

Commit 9e7f12a

Browse files
Sergio0694Sergio0694
committed
Enabled weak messenger tests on .NET Standard 2.0
1 parent 1cf168b commit 9e7f12a

File tree

3 files changed

+0
-64
lines changed

3 files changed

+0
-64
lines changed

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ public partial class Test_Messenger
1616
[TestCategory("Mvvm")]
1717
[TestMethod]
1818
[DataRow(typeof(Messenger))]
19-
#if NETCOREAPP3_1
2019
[DataRow(typeof(WeakRefMessenger))]
21-
#endif
2220
public void Test_Messenger_RequestMessage_Ok(Type type)
2321
{
2422
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -47,9 +45,7 @@ void Receive(object recipient, NumberRequestMessage m)
4745
[TestCategory("Mvvm")]
4846
[TestMethod]
4947
[DataRow(typeof(Messenger))]
50-
#if NETCOREAPP3_1
5148
[DataRow(typeof(WeakRefMessenger))]
52-
#endif
5349
[ExpectedException(typeof(InvalidOperationException))]
5450
public void Test_Messenger_RequestMessage_Fail_NoReply(Type type)
5551
{
@@ -61,9 +57,7 @@ public void Test_Messenger_RequestMessage_Fail_NoReply(Type type)
6157
[TestCategory("Mvvm")]
6258
[TestMethod]
6359
[DataRow(typeof(Messenger))]
64-
#if NETCOREAPP3_1
6560
[DataRow(typeof(WeakRefMessenger))]
66-
#endif
6761
[ExpectedException(typeof(InvalidOperationException))]
6862
public void Test_Messenger_RequestMessage_Fail_MultipleReplies(Type type)
6963
{
@@ -88,9 +82,7 @@ public class NumberRequestMessage : RequestMessage<int>
8882
[TestCategory("Mvvm")]
8983
[TestMethod]
9084
[DataRow(typeof(Messenger))]
91-
#if NETCOREAPP3_1
9285
[DataRow(typeof(WeakRefMessenger))]
93-
#endif
9486
public async Task Test_Messenger_AsyncRequestMessage_Ok_Sync(Type type)
9587
{
9688
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -115,9 +107,7 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
115107
[TestCategory("Mvvm")]
116108
[TestMethod]
117109
[DataRow(typeof(Messenger))]
118-
#if NETCOREAPP3_1
119110
[DataRow(typeof(WeakRefMessenger))]
120-
#endif
121111
public async Task Test_Messenger_AsyncRequestMessage_Ok_Async(Type type)
122112
{
123113
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -149,9 +139,7 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
149139
[TestCategory("Mvvm")]
150140
[TestMethod]
151141
[DataRow(typeof(Messenger))]
152-
#if NETCOREAPP3_1
153142
[DataRow(typeof(WeakRefMessenger))]
154-
#endif
155143
[ExpectedException(typeof(InvalidOperationException))]
156144
public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply(Type type)
157145
{
@@ -163,9 +151,7 @@ public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply(Type type)
163151
[TestCategory("Mvvm")]
164152
[TestMethod]
165153
[DataRow(typeof(Messenger))]
166-
#if NETCOREAPP3_1
167154
[DataRow(typeof(WeakRefMessenger))]
168-
#endif
169155
[ExpectedException(typeof(InvalidOperationException))]
170156
public async Task Test_Messenger_AsyncRequestMessage_Fail_MultipleReplies(Type type)
171157
{
@@ -190,9 +176,7 @@ public class AsyncNumberRequestMessage : AsyncRequestMessage<int>
190176
[TestCategory("Mvvm")]
191177
[TestMethod]
192178
[DataRow(typeof(Messenger))]
193-
#if NETCOREAPP3_1
194179
[DataRow(typeof(WeakRefMessenger))]
195-
#endif
196180
public void Test_Messenger_CollectionRequestMessage_Ok_NoReplies(Type type)
197181
{
198182
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -212,9 +196,7 @@ void Receive(object recipient, NumbersCollectionRequestMessage m)
212196
[TestCategory("Mvvm")]
213197
[TestMethod]
214198
[DataRow(typeof(Messenger))]
215-
#if NETCOREAPP3_1
216199
[DataRow(typeof(WeakRefMessenger))]
217-
#endif
218200
public void Test_Messenger_CollectionRequestMessage_Ok_MultipleReplies(Type type)
219201
{
220202
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -269,9 +251,7 @@ public class NumbersCollectionRequestMessage : CollectionRequestMessage<int>
269251
[TestCategory("Mvvm")]
270252
[TestMethod]
271253
[DataRow(typeof(Messenger))]
272-
#if NETCOREAPP3_1
273254
[DataRow(typeof(WeakRefMessenger))]
274-
#endif
275255
public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_NoReplies(Type type)
276256
{
277257
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -291,9 +271,7 @@ void Receive(object recipient, AsyncNumbersCollectionRequestMessage m)
291271
[TestCategory("Mvvm")]
292272
[TestMethod]
293273
[DataRow(typeof(Messenger))]
294-
#if NETCOREAPP3_1
295274
[DataRow(typeof(WeakRefMessenger))]
296-
#endif
297275
public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_MultipleReplies(Type type)
298276
{
299277
var messenger = (IMessenger)Activator.CreateInstance(type);

‎UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ public partial class Test_Messenger
1414
[TestCategory("Mvvm")]
1515
[TestMethod]
1616
[DataRow(typeof(Messenger))]
17-
#if NETCOREAPP3_1
1817
[DataRow(typeof(WeakRefMessenger))]
19-
#endif
2018
public void Test_Messenger_UnregisterRecipientWithMessageType(Type type)
2119
{
2220
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -28,9 +26,7 @@ public void Test_Messenger_UnregisterRecipientWithMessageType(Type type)
2826
[TestCategory("Mvvm")]
2927
[TestMethod]
3028
[DataRow(typeof(Messenger))]
31-
#if NETCOREAPP3_1
3229
[DataRow(typeof(WeakRefMessenger))]
33-
#endif
3430
public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken(Type type)
3531
{
3632
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -42,9 +38,7 @@ public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken(Type type)
4238
[TestCategory("Mvvm")]
4339
[TestMethod]
4440
[DataRow(typeof(Messenger))]
45-
#if NETCOREAPP3_1
4641
[DataRow(typeof(WeakRefMessenger))]
47-
#endif
4842
public void Test_Messenger_UnregisterRecipientWithToken(Type type)
4943
{
5044
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -56,9 +50,7 @@ public void Test_Messenger_UnregisterRecipientWithToken(Type type)
5650
[TestCategory("Mvvm")]
5751
[TestMethod]
5852
[DataRow(typeof(Messenger))]
59-
#if NETCOREAPP3_1
6053
[DataRow(typeof(WeakRefMessenger))]
61-
#endif
6254
public void Test_Messenger_UnregisterRecipientWithRecipient(Type type)
6355
{
6456
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -70,9 +62,7 @@ public void Test_Messenger_UnregisterRecipientWithRecipient(Type type)
7062
[TestCategory("Mvvm")]
7163
[TestMethod]
7264
[DataRow(typeof(Messenger))]
73-
#if NETCOREAPP3_1
7465
[DataRow(typeof(WeakRefMessenger))]
75-
#endif
7666
public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType(Type type)
7767
{
7868
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -88,9 +78,7 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType(Type ty
8878
[TestCategory("Mvvm")]
8979
[TestMethod]
9080
[DataRow(typeof(Messenger))]
91-
#if NETCOREAPP3_1
9281
[DataRow(typeof(WeakRefMessenger))]
93-
#endif
9482
public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken(Type type)
9583
{
9684
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -106,9 +94,7 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken
10694
[TestCategory("Mvvm")]
10795
[TestMethod]
10896
[DataRow(typeof(Messenger))]
109-
#if NETCOREAPP3_1
11097
[DataRow(typeof(WeakRefMessenger))]
111-
#endif
11298
public void Test_Messenger_RegisterAndUnregisterRecipientWithToken(Type type)
11399
{
114100
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -124,9 +110,7 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithToken(Type type)
124110
[TestCategory("Mvvm")]
125111
[TestMethod]
126112
[DataRow(typeof(Messenger))]
127-
#if NETCOREAPP3_1
128113
[DataRow(typeof(WeakRefMessenger))]
129-
#endif
130114
public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient(Type type)
131115
{
132116
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -142,9 +126,7 @@ public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient(Type type
142126
[TestCategory("Mvvm")]
143127
[TestMethod]
144128
[DataRow(typeof(Messenger))]
145-
#if NETCOREAPP3_1
146129
[DataRow(typeof(WeakRefMessenger))]
147-
#endif
148130
public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithNoToken(Type type)
149131
{
150132
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -184,9 +166,7 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithN
184166
[TestCategory("Mvvm")]
185167
[TestMethod]
186168
[DataRow(typeof(Messenger))]
187-
#if NETCOREAPP3_1
188169
[DataRow(typeof(WeakRefMessenger))]
189-
#endif
190170
public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNoToken(Type type)
191171
{
192172
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -216,9 +196,7 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNo
216196
[TestCategory("Mvvm")]
217197
[TestMethod]
218198
[DataRow(typeof(Messenger))]
219-
#if NETCOREAPP3_1
220199
[DataRow(typeof(WeakRefMessenger))]
221-
#endif
222200
public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithToken(Type type)
223201
{
224202
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -248,9 +226,7 @@ public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithT
248226
[TestCategory("Mvvm")]
249227
[TestMethod]
250228
[DataRow(typeof(Messenger))]
251-
#if NETCOREAPP3_1
252229
[DataRow(typeof(WeakRefMessenger))]
253-
#endif
254230
public void Test_Messenger_DuplicateRegistrationWithMessageType(Type type)
255231
{
256232
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -267,9 +243,7 @@ public void Test_Messenger_DuplicateRegistrationWithMessageType(Type type)
267243
[TestCategory("Mvvm")]
268244
[TestMethod]
269245
[DataRow(typeof(Messenger))]
270-
#if NETCOREAPP3_1
271246
[DataRow(typeof(WeakRefMessenger))]
272-
#endif
273247
public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken(Type type)
274248
{
275249
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -286,9 +260,7 @@ public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken(Type typ
286260
[TestCategory("Mvvm")]
287261
[TestMethod]
288262
[DataRow(typeof(Messenger))]
289-
#if NETCOREAPP3_1
290263
[DataRow(typeof(WeakRefMessenger))]
291-
#endif
292264
public void Test_Messenger_IRecipient_NoMessages(Type type)
293265
{
294266
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -303,9 +275,7 @@ public void Test_Messenger_IRecipient_NoMessages(Type type)
303275
[TestCategory("Mvvm")]
304276
[TestMethod]
305277
[DataRow(typeof(Messenger))]
306-
#if NETCOREAPP3_1
307278
[DataRow(typeof(WeakRefMessenger))]
308-
#endif
309279
public void Test_Messenger_IRecipient_SomeMessages_NoToken(Type type)
310280
{
311281
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -338,9 +308,7 @@ public void Test_Messenger_IRecipient_SomeMessages_NoToken(Type type)
338308
[TestCategory("Mvvm")]
339309
[TestMethod]
340310
[DataRow(typeof(Messenger))]
341-
#if NETCOREAPP3_1
342311
[DataRow(typeof(WeakRefMessenger))]
343-
#endif
344312
public void Test_Messenger_IRecipient_SomeMessages_WithToken(Type type)
345313
{
346314
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -377,9 +345,7 @@ public void Test_Messenger_IRecipient_SomeMessages_WithToken(Type type)
377345
[TestCategory("Mvvm")]
378346
[TestMethod]
379347
[DataRow(typeof(Messenger))]
380-
#if NETCOREAPP3_1
381348
[DataRow(typeof(WeakRefMessenger))]
382-
#endif
383349
public void Test_Messenger_RegisterWithTypeParameter(Type type)
384350
{
385351
var messenger = (IMessenger)Activator.CreateInstance(type);

‎UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ public class Test_ObservableRecipient
1616
[TestCategory("Mvvm")]
1717
[TestMethod]
1818
[DataRow(typeof(Messenger))]
19-
#if NETCOREAPP3_1
2019
[DataRow(typeof(WeakRefMessenger))]
21-
#endif
2220
public void Test_ObservableRecipient_Activation(Type type)
2321
{
2422
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -40,9 +38,7 @@ public void Test_ObservableRecipient_Activation(Type type)
4038
[TestCategory("Mvvm")]
4139
[TestMethod]
4240
[DataRow(typeof(Messenger))]
43-
#if NETCOREAPP3_1
4441
[DataRow(typeof(WeakRefMessenger))]
45-
#endif
4642
public void Test_ObservableRecipient_IsSame(Type type)
4743
{
4844
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -63,9 +59,7 @@ public void Test_ObservableRecipient_Default()
6359
[TestCategory("Mvvm")]
6460
[TestMethod]
6561
[DataRow(typeof(Messenger))]
66-
#if NETCOREAPP3_1
6762
[DataRow(typeof(WeakRefMessenger))]
68-
#endif
6963
public void Test_ObservableRecipient_Injection(Type type)
7064
{
7165
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -77,9 +71,7 @@ public void Test_ObservableRecipient_Injection(Type type)
7771
[TestCategory("Mvvm")]
7872
[TestMethod]
7973
[DataRow(typeof(Messenger))]
80-
#if NETCOREAPP3_1
8174
[DataRow(typeof(WeakRefMessenger))]
82-
#endif
8375
public void Test_ObservableRecipient_Broadcast(Type type)
8476
{
8577
var messenger = (IMessenger)Activator.CreateInstance(type);

0 commit comments

Comments
 (0)