Skip to content
This repository was archived by the owner on Dec 24, 2020. It is now read-only.

Commit 58dba97

Browse files
kevinchaletkevinchalet
committed
Use Assert.Single()/Empty() instead of Assert.Equal()
1 parent 99c3fb2 commit 58dba97

File tree

9 files changed

+31
-43
lines changed

9 files changed

+31
-43
lines changed

‎test/AspNet.Security.OpenIdConnect.Extensions.Tests/OpenIdConnectExtensionsTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public void Clone_ExcludesUnwantedClaims()
154154
var clone = identity.Clone(claim => claim.Type == OpenIdConnectConstants.Claims.Name);
155155

156156
// Assert
157-
Assert.Equal(1, clone.Claims.Count());
157+
Assert.Single(clone.Claims);
158158
Assert.Null(clone.FindFirst(OpenIdConnectConstants.Claims.Subject));
159159
Assert.Equal("Bob le Bricoleur", clone.FindFirst(OpenIdConnectConstants.Claims.Name).Value);
160160
}
@@ -172,7 +172,7 @@ public void Clone_ExcludesUnwantedClaimsFromActor()
172172
var clone = identity.Clone(claim => claim.Type == OpenIdConnectConstants.Claims.Name);
173173

174174
// Assert
175-
Assert.Equal(1, clone.Actor.Claims.Count());
175+
Assert.Single(clone.Actor.Claims);
176176
Assert.Null(clone.Actor.FindFirst(OpenIdConnectConstants.Claims.Subject));
177177
Assert.Equal("Bob le Bricoleur", clone.Actor.FindFirst(OpenIdConnectConstants.Claims.Name).Value);
178178
}
@@ -191,7 +191,7 @@ public void Clone_ExcludesUnwantedClaimsFromIdentities()
191191
var clone = principal.Clone(claim => claim.Type == OpenIdConnectConstants.Claims.Name);
192192

193193
// Assert
194-
Assert.Equal(1, clone.Claims.Count());
194+
Assert.Single(clone.Claims);
195195
Assert.Null(clone.FindFirst(OpenIdConnectConstants.Claims.Subject));
196196
Assert.Equal("Bob le Bricoleur", clone.FindFirst(OpenIdConnectConstants.Claims.Name).Value);
197197
}

‎test/AspNet.Security.OpenIdConnect.Primitives.Tests/OpenIdConnectMessageTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void Constructor_IgnoresNamelessParameters()
3939
});
4040

4141
// Assert
42-
Assert.Equal(0, message.GetParameters().Count());
42+
Assert.Empty(message.GetParameters());
4343
}
4444

4545
[Fact]
@@ -67,7 +67,7 @@ public void Constructor_IgnoresDuplicateParameters()
6767
});
6868

6969
// Assert
70-
Assert.Equal(1, message.GetParameters().Count());
70+
Assert.Single(message.GetParameters());
7171
Assert.Equal("Fabrikam", message.GetParameter("parameter"));
7272
}
7373

@@ -521,7 +521,7 @@ public void SetParameter_RemovesNullParameters()
521521
message.SetParameter("null", null);
522522

523523
// Assert
524-
Assert.Equal(0, message.GetParameters().Count());
524+
Assert.Empty(message.GetParameters());
525525
}
526526

527527
[Fact]
@@ -537,7 +537,7 @@ public void SetParameter_RemovesEmptyParameters()
537537
message.SetParameter("value", new JValue(string.Empty));
538538

539539
// Assert
540-
Assert.Equal(0, message.GetParameters().Count());
540+
Assert.Empty(message.GetParameters());
541541
}
542542

543543
[Theory]

‎test/AspNet.Security.OpenIdConnect.Server.Tests/OpenIdConnectServerExtensionsTests.cs

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void EncryptingCredentials_AddKey_RegistersCredentials()
135135
credentials.AddKey(key);
136136

137137
// Assert
138-
Assert.Equal(1, credentials.Count);
138+
Assert.Single(credentials);
139139
Assert.Equal(SecurityAlgorithms.Aes256KW, credentials[0].Alg);
140140
Assert.Equal(SecurityAlgorithms.Aes256CbcHmacSha512, credentials[0].Enc);
141141
}
@@ -312,7 +312,7 @@ public void SigningCredentials_AddCertificate_RegistersCredentials()
312312
password: "Owin.Security.OpenIdConnect.Server");
313313

314314
// Assert
315-
Assert.Equal(1, credentials.Count);
315+
Assert.Single(credentials);
316316
Assert.Equal(SecurityAlgorithms.RsaSha256, credentials[0].Algorithm);
317317
Assert.NotNull(credentials[0].Kid);
318318
}
@@ -358,7 +358,7 @@ public void SigningCredentials_AddDevelopmentCertificateCanGenerateCertificate()
358358
credentials.AddDevelopmentCertificate();
359359

360360
// Assert
361-
Assert.Equal(1, credentials.Count);
361+
Assert.Single(credentials);
362362
Assert.Equal(SecurityAlgorithms.RsaSha256, credentials[0].Algorithm);
363363
Assert.NotNull(credentials[0].Kid);
364364
}
@@ -474,7 +474,7 @@ public void SigningCredentials_AddEphemeralKeyRegistersSigningCredentials(string
474474
credentials.AddEphemeralKey(algorithm);
475475

476476
// Assert
477-
Assert.Equal(1, credentials.Count);
477+
Assert.Single(credentials);
478478
Assert.Equal(algorithm, credentials[0].Algorithm);
479479
Assert.NotNull(credentials[0].Kid);
480480
}
@@ -489,7 +489,7 @@ public void SigningCredentials_AddEphemeralKeyUsesRsaSha256ByDefault()
489489
credentials.AddEphemeralKey();
490490

491491
// Assert
492-
Assert.Equal(1, credentials.Count);
492+
Assert.Single(credentials);
493493
Assert.Equal(SecurityAlgorithms.RsaSha256, credentials[0].Algorithm);
494494
Assert.NotNull(credentials[0].Kid);
495495
}
@@ -541,14 +541,8 @@ public void SigningCredentials_AddKey_ThrowsAnExceptionForNonPrivateKey()
541541
}
542542

543543
#if !SUPPORTS_ECDSA
544-
[Theory]
545-
[InlineData(SecurityAlgorithms.EcdsaSha256)]
546-
[InlineData(SecurityAlgorithms.EcdsaSha384)]
547-
[InlineData(SecurityAlgorithms.EcdsaSha512)]
548-
[InlineData(SecurityAlgorithms.EcdsaSha256Signature)]
549-
[InlineData(SecurityAlgorithms.EcdsaSha384Signature)]
550-
[InlineData(SecurityAlgorithms.EcdsaSha512Signature)]
551-
public void SigningCredentials_AddKey_ThrowsAnExceptionForEcdsaKeyOnUnsupportedPlatforms(string algorithm)
544+
[Fact]
545+
public void SigningCredentials_AddKey_ThrowsAnExceptionForEcdsaKeyOnUnsupportedPlatforms()
552546
{
553547
// Arrange
554548
var credentials = new List<SigningCredentials>();
@@ -600,7 +594,7 @@ public void SigningCredentials_AddKey_RegistersSigningCredentials(string algorit
600594
credentials.AddKey(key);
601595

602596
// Assert
603-
Assert.Equal(1, credentials.Count);
597+
Assert.Single(credentials);
604598
Assert.Equal(algorithm, credentials[0].Algorithm);
605599
}
606600

‎test/AspNet.Security.OpenIdConnect.Server.Tests/OpenIdConnectServerHandlerTests.Discovery.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ public async Task InvokeConfigurationEndpointAsync_DuplicateSigningAlgorithmsAre
694694
var algorithms = (string[]) response[OpenIdConnectConstants.Metadata.IdTokenSigningAlgValuesSupported];
695695

696696
// Assert
697-
Assert.Equal(1, algorithms.Count());
697+
Assert.Single(algorithms);
698698
}
699699

700700
[Theory]

‎test/AspNet.Security.OpenIdConnect.Server.Tests/OpenIdConnectServerHandlerTests.Serialization.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2497,7 +2497,7 @@ public async Task DeserializeAccessTokenAsync_IgnoresAsymmetricEncryptingKeys()
24972497
var keys = context.TokenValidationParameters.TokenDecryptionKeys.ToArray();
24982498

24992499
// Assert
2500-
Assert.Equal(1, keys.Length);
2500+
Assert.Single(keys);
25012501
Assert.NotSame(credentials, keys[0]);
25022502
Assert.Same(context.Options.EncryptingCredentials[1].Key, keys[0]);
25032503
Assert.IsType<SymmetricSecurityKey>(keys[0]);
@@ -2833,7 +2833,7 @@ public async Task DeserializeIdentityTokenAsync_IgnoresSymmetricSigningKeys()
28332833
var keys = context.TokenValidationParameters.IssuerSigningKeys.ToArray();
28342834

28352835
// Assert
2836-
Assert.Equal(1, keys.Length);
2836+
Assert.Single(keys);
28372837
Assert.NotSame(credentials, keys[0]);
28382838
Assert.Same(context.Options.SigningCredentials[1].Key, keys[0]);
28392839
Assert.IsType<X509SecurityKey>(keys[0]);

‎test/Owin.Security.OpenIdConnect.Extensions.Tests/OpenIdConnectExtensionsTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public void Clone_ExcludesUnwantedClaims()
154154
var clone = identity.Clone(claim => claim.Type == OpenIdConnectConstants.Claims.Name);
155155

156156
// Assert
157-
Assert.Equal(1, clone.Claims.Count());
157+
Assert.Single(clone.Claims);
158158
Assert.Null(clone.FindFirst(OpenIdConnectConstants.Claims.Subject));
159159
Assert.Equal("Bob le Bricoleur", clone.FindFirst(OpenIdConnectConstants.Claims.Name).Value);
160160
}
@@ -172,7 +172,7 @@ public void Clone_ExcludesUnwantedClaimsFromActor()
172172
var clone = identity.Clone(claim => claim.Type == OpenIdConnectConstants.Claims.Name);
173173

174174
// Assert
175-
Assert.Equal(1, clone.Actor.Claims.Count());
175+
Assert.Single(clone.Actor.Claims);
176176
Assert.Null(clone.Actor.FindFirst(OpenIdConnectConstants.Claims.Subject));
177177
Assert.Equal("Bob le Bricoleur", clone.Actor.FindFirst(OpenIdConnectConstants.Claims.Name).Value);
178178
}
@@ -191,7 +191,7 @@ public void Clone_ExcludesUnwantedClaimsFromIdentities()
191191
var clone = principal.Clone(claim => claim.Type == OpenIdConnectConstants.Claims.Name);
192192

193193
// Assert
194-
Assert.Equal(1, clone.Claims.Count());
194+
Assert.Single(clone.Claims);
195195
Assert.Null(clone.FindFirst(OpenIdConnectConstants.Claims.Subject));
196196
Assert.Equal("Bob le Bricoleur", clone.FindFirst(OpenIdConnectConstants.Claims.Name).Value);
197197
}

‎test/Owin.Security.OpenIdConnect.Server.Tests/OpenIdConnectServerExtensionsTests.cs

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public void EncryptingCredentials_AddKey_RegistersCredentials()
138138
credentials.AddKey(key);
139139

140140
// Assert
141-
Assert.Equal(1, credentials.Count);
141+
Assert.Single(credentials);
142142
Assert.Equal(SecurityAlgorithms.Aes256KW, credentials[0].Alg);
143143
Assert.Equal(SecurityAlgorithms.Aes256CbcHmacSha512, credentials[0].Enc);
144144
}
@@ -315,7 +315,7 @@ public void SigningCredentials_AddCertificate_RegistersCredentials()
315315
password: "Owin.Security.OpenIdConnect.Server");
316316

317317
// Assert
318-
Assert.Equal(1, credentials.Count);
318+
Assert.Single(credentials);
319319
Assert.Equal(SecurityAlgorithms.RsaSha256, credentials[0].Algorithm);
320320
Assert.NotNull(credentials[0].Kid);
321321
}
@@ -415,7 +415,7 @@ public void SigningCredentials_AddEphemeralKeyRegistersSigningCredentials(string
415415
credentials.AddEphemeralKey(algorithm);
416416

417417
// Assert
418-
Assert.Equal(1, credentials.Count);
418+
Assert.Single(credentials);
419419
Assert.Equal(algorithm, credentials[0].Algorithm);
420420
Assert.NotNull(credentials[0].Kid);
421421
}
@@ -430,7 +430,7 @@ public void SigningCredentials_AddEphemeralKeyUsesRsaSha256ByDefault()
430430
credentials.AddEphemeralKey();
431431

432432
// Assert
433-
Assert.Equal(1, credentials.Count);
433+
Assert.Single(credentials);
434434
Assert.Equal(SecurityAlgorithms.RsaSha256, credentials[0].Algorithm);
435435
Assert.NotNull(credentials[0].Kid);
436436
}
@@ -482,14 +482,8 @@ public void SigningCredentials_AddKey_ThrowsAnExceptionForNonPrivateKey()
482482
}
483483

484484
#if !SUPPORTS_ECDSA
485-
[Theory]
486-
[InlineData(SecurityAlgorithms.EcdsaSha256)]
487-
[InlineData(SecurityAlgorithms.EcdsaSha384)]
488-
[InlineData(SecurityAlgorithms.EcdsaSha512)]
489-
[InlineData(SecurityAlgorithms.EcdsaSha256Signature)]
490-
[InlineData(SecurityAlgorithms.EcdsaSha384Signature)]
491-
[InlineData(SecurityAlgorithms.EcdsaSha512Signature)]
492-
public void SigningCredentials_AddKey_ThrowsAnExceptionForEcdsaKeyOnUnsupportedPlatforms(string algorithm)
485+
[Fact]
486+
public void SigningCredentials_AddKey_ThrowsAnExceptionForEcdsaKeyOnUnsupportedPlatforms()
493487
{
494488
// Arrange
495489
var credentials = new List<SigningCredentials>();
@@ -541,7 +535,7 @@ public void SigningCredentials_AddKey_RegistersSigningCredentials(string algorit
541535
credentials.AddKey(key);
542536

543537
// Assert
544-
Assert.Equal(1, credentials.Count);
538+
Assert.Single(credentials);
545539
Assert.Equal(algorithm, credentials[0].Algorithm);
546540
}
547541

‎test/Owin.Security.OpenIdConnect.Server.Tests/OpenIdConnectServerHandlerTests.Discovery.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ public async Task InvokeConfigurationEndpointAsync_DuplicateSigningAlgorithmsAre
694694
var algorithms = (string[]) response[OpenIdConnectConstants.Metadata.IdTokenSigningAlgValuesSupported];
695695

696696
// Assert
697-
Assert.Equal(1, algorithms.Count());
697+
Assert.Single(algorithms);
698698
}
699699

700700
[Theory]

‎test/Owin.Security.OpenIdConnect.Server.Tests/OpenIdConnectServerHandlerTests.Serialization.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2455,7 +2455,7 @@ public async Task DeserializeAccessTokenAsync_IgnoresAsymmetricEncryptingKeys()
24552455
var keys = context.TokenValidationParameters.TokenDecryptionKeys.ToArray();
24562456

24572457
// Assert
2458-
Assert.Equal(1, keys.Length);
2458+
Assert.Single(keys);
24592459
Assert.NotSame(credentials, keys[0]);
24602460
Assert.Same(context.Options.EncryptingCredentials[1].Key, keys[0]);
24612461
Assert.IsType<SymmetricSecurityKey>(keys[0]);
@@ -2787,7 +2787,7 @@ public async Task DeserializeIdentityTokenAsync_IgnoresSymmetricSigningKeys()
27872787
var keys = context.TokenValidationParameters.IssuerSigningKeys.ToArray();
27882788

27892789
// Assert
2790-
Assert.Equal(1, keys.Length);
2790+
Assert.Single(keys);
27912791
Assert.NotSame(credentials, keys[0]);
27922792
Assert.Same(context.Options.SigningCredentials[1].Key, keys[0]);
27932793
Assert.IsType<X509SecurityKey>(keys[0]);

0 commit comments

Comments
 (0)