@@ -21,17 +21,17 @@ namespace Microsoft.Azure.SignalR.Tests
2121{
2222 public class ServiceLifetimeManagerFacts
2323 {
24- private static readonly List < string > TestUsers = new List < string > { "user1" , "user2" } ;
24+ private static readonly List < string > TestUsers = new List < string > { "user1" , "user2" } ;
2525
26- private static readonly List < string > TestGroups = new List < string > { "group1" , "group2" } ;
26+ private static readonly List < string > TestGroups = new List < string > { "group1" , "group2" } ;
2727
2828 private const string MockProtocol = "blazorpack" ;
2929
3030 private const string TestMethod = "TestMethod" ;
3131
32- private static readonly object [ ] TestArgs = { "TestArgs" } ;
32+ private static readonly object [ ] TestArgs = { "TestArgs" } ;
3333
34- private static readonly List < string > TestConnectionIds = new List < string > { "connection1" , "connection2" } ;
34+ private static readonly List < string > TestConnectionIds = new List < string > { "connection1" , "connection2" } ;
3535
3636 private static readonly IHubProtocolResolver HubProtocolResolver =
3737 new DefaultHubProtocolResolver ( new IHubProtocol [ ]
@@ -229,7 +229,7 @@ public async void TestSendConnectionAsyncisOverwrittenWhenClientConnectionExiste
229229 public async void SetUserIdTest ( )
230230 {
231231 var connectionContext = new TestConnectionContext ( ) ;
232- connectionContext . Features . Set < IServiceUserIdFeature > ( new ServiceUserIdFeature ( "testUser" ) ) ;
232+ connectionContext . Features . Set ( new ServiceUserIdFeature ( "testUser" ) ) ;
233233
234234 var hubConnectionContext = new HubConnectionContext ( connectionContext , new ( ) , NullLoggerFactory . Instance ) ;
235235 var serviceLifetimeManager = MockLifetimeManager ( new TestServiceConnectionManager < TestHub > ( ) ) ;
@@ -248,6 +248,7 @@ public async void DoNotSetUserIdWithoutFeatureTest()
248248 await serviceLifetimeManager . OnConnectedAsync ( hubConnectionContext ) ;
249249
250250 Assert . Null ( hubConnectionContext . UserIdentifier ) ;
251+ Assert . Null ( hubConnectionContext . Features . Get < ServiceUserIdFeature > ( ) ) ;
251252 }
252253
253254 private HubLifetimeManager < TestHub > MockLifetimeManager ( IServiceConnectionManager < TestHub > serviceConnectionManager , IClientConnectionManager clientConnectionManager = null , IBlazorDetector blazorDetector = null )
@@ -324,41 +325,41 @@ private static void VerifyServiceMessage(string methodName, ServiceMessage servi
324325 switch ( methodName )
325326 {
326327 case "SendAllAsync" :
327- Assert . Null ( ( ( BroadcastDataMessage ) serviceMessage ) . ExcludedList ) ;
328+ Assert . Null ( ( ( BroadcastDataMessage ) serviceMessage ) . ExcludedList ) ;
328329 break ;
329330 case "SendAllExceptAsync" :
330- Assert . Equal ( TestConnectionIds , ( ( BroadcastDataMessage ) serviceMessage ) . ExcludedList ) ;
331+ Assert . Equal ( TestConnectionIds , ( ( BroadcastDataMessage ) serviceMessage ) . ExcludedList ) ;
331332 break ;
332333 case "SendConnectionAsync" :
333- Assert . Equal ( TestConnectionIds [ 0 ] , ( ( MultiConnectionDataMessage ) serviceMessage ) . ConnectionList [ 0 ] ) ;
334+ Assert . Equal ( TestConnectionIds [ 0 ] , ( ( MultiConnectionDataMessage ) serviceMessage ) . ConnectionList [ 0 ] ) ;
334335 break ;
335336 case "SendConnectionsAsync" :
336- Assert . Equal ( TestConnectionIds , ( ( MultiConnectionDataMessage ) serviceMessage ) . ConnectionList ) ;
337+ Assert . Equal ( TestConnectionIds , ( ( MultiConnectionDataMessage ) serviceMessage ) . ConnectionList ) ;
337338 break ;
338339 case "SendGroupAsync" :
339- Assert . Equal ( TestGroups [ 0 ] , ( ( GroupBroadcastDataMessage ) serviceMessage ) . GroupName ) ;
340- Assert . Null ( ( ( GroupBroadcastDataMessage ) serviceMessage ) . ExcludedList ) ;
340+ Assert . Equal ( TestGroups [ 0 ] , ( ( GroupBroadcastDataMessage ) serviceMessage ) . GroupName ) ;
341+ Assert . Null ( ( ( GroupBroadcastDataMessage ) serviceMessage ) . ExcludedList ) ;
341342 break ;
342343 case "SendGroupsAsync" :
343- Assert . Equal ( TestGroups , ( ( MultiGroupBroadcastDataMessage ) serviceMessage ) . GroupList ) ;
344+ Assert . Equal ( TestGroups , ( ( MultiGroupBroadcastDataMessage ) serviceMessage ) . GroupList ) ;
344345 break ;
345346 case "SendGroupExceptAsync" :
346- Assert . Equal ( TestGroups [ 0 ] , ( ( GroupBroadcastDataMessage ) serviceMessage ) . GroupName ) ;
347- Assert . Equal ( TestConnectionIds , ( ( GroupBroadcastDataMessage ) serviceMessage ) . ExcludedList ) ;
347+ Assert . Equal ( TestGroups [ 0 ] , ( ( GroupBroadcastDataMessage ) serviceMessage ) . GroupName ) ;
348+ Assert . Equal ( TestConnectionIds , ( ( GroupBroadcastDataMessage ) serviceMessage ) . ExcludedList ) ;
348349 break ;
349350 case "SendUserAsync" :
350- Assert . Equal ( TestUsers [ 0 ] , ( ( UserDataMessage ) serviceMessage ) . UserId ) ;
351+ Assert . Equal ( TestUsers [ 0 ] , ( ( UserDataMessage ) serviceMessage ) . UserId ) ;
351352 break ;
352353 case "SendUsersAsync" :
353- Assert . Equal ( TestUsers , ( ( MultiUserDataMessage ) serviceMessage ) . UserList ) ;
354+ Assert . Equal ( TestUsers , ( ( MultiUserDataMessage ) serviceMessage ) . UserList ) ;
354355 break ;
355356 case "AddToGroupAsync" :
356- Assert . Equal ( TestConnectionIds [ 0 ] , ( ( JoinGroupWithAckMessage ) serviceMessage ) . ConnectionId ) ;
357- Assert . Equal ( TestGroups [ 0 ] , ( ( JoinGroupWithAckMessage ) serviceMessage ) . GroupName ) ;
357+ Assert . Equal ( TestConnectionIds [ 0 ] , ( ( JoinGroupWithAckMessage ) serviceMessage ) . ConnectionId ) ;
358+ Assert . Equal ( TestGroups [ 0 ] , ( ( JoinGroupWithAckMessage ) serviceMessage ) . GroupName ) ;
358359 break ;
359360 case "RemoveFromGroupAsync" :
360- Assert . Equal ( TestConnectionIds [ 0 ] , ( ( LeaveGroupWithAckMessage ) serviceMessage ) . ConnectionId ) ;
361- Assert . Equal ( TestGroups [ 0 ] , ( ( LeaveGroupWithAckMessage ) serviceMessage ) . GroupName ) ;
361+ Assert . Equal ( TestConnectionIds [ 0 ] , ( ( LeaveGroupWithAckMessage ) serviceMessage ) . ConnectionId ) ;
362+ Assert . Equal ( TestGroups [ 0 ] , ( ( LeaveGroupWithAckMessage ) serviceMessage ) . GroupName ) ;
362363 break ;
363364 default :
364365 break ;
0 commit comments