Fix flaky test (#570)

* Fix flaky test

Try and fix flaky Apple provider test by not validating token lifetimes and increasing the delay slightly.

* Make the asserts easier to read

Swap the order so the asserts make more sense if the test fails.

* Wait longer before expiry

The macOS machines seem to be a bit "slow" so it seems that the two initial generations where they should be the same end up different because it takes too long to complete. If this doesn't work, I'll just disable the test as it's redundant for the v6 release anyway.

Author: martincostello

test/AspNet.Security.OAuth.Providers.Tests/Apple/AppleClientSecretGeneratorTests.cs

@@ -117,12 +117,13 @@ await GenerateTokenAsync(Configure, async (context) =>
         public async Task GenerateAsync_Varies_Key_By_Options()
         {
             // Arrange
-            var clientSecretExpiresAfter = TimeSpan.FromSeconds(2);
+            var clientSecretExpiresAfter = TimeSpan.FromSeconds(3);
 
             void ConfigureA(AppleAuthenticationOptions options)
             {
                 options.ClientId = "my-client-id";
                 options.ClientSecretExpiresAfter = clientSecretExpiresAfter;
+                options.JwtSecurityTokenHandler = new FrozenJwtSecurityTokenHandler();
                 options.KeyId = "my-key-id";
                 options.TeamId = "my-team-id";
                 options.PrivateKeyBytes = (_) => TestKeys.GetPrivateKeyBytesAsync();
@@ -132,7 +133,7 @@ void ConfigureA(AppleAuthenticationOptions options)
             {
                 ClientId = "my-other-client-id",
                 ClientSecretExpiresAfter = clientSecretExpiresAfter,
-                JwtSecurityTokenHandler = new JwtSecurityTokenHandler(),
+                JwtSecurityTokenHandler = new FrozenJwtSecurityTokenHandler(),
                 KeyId = "my-other-key-id",
                 TeamId = "my-other-team-id",
                 PrivateKeyBytes = (_) => TestKeys.GetPrivateKeyBytesAsync(),
@@ -155,13 +156,13 @@ await GenerateTokenAsync(ConfigureA, async (contextA) =>
 
                 // Assert
                 tokenA1.ShouldNotBeNullOrWhiteSpace();
-                tokenA1.ShouldBe(tokenA2);
+                tokenA2.ShouldBe(tokenA1);
                 tokenB1.ShouldNotBeNullOrWhiteSpace();
-                tokenB1.ShouldBe(tokenB2);
-                tokenA1.ShouldNotBe(tokenB1);
+                tokenB2.ShouldBe(tokenB1);
+                tokenB1.ShouldNotBe(tokenA1);
 
                 // Act
-                await Task.Delay(clientSecretExpiresAfter * 2);
+                await Task.Delay(clientSecretExpiresAfter * 3);
 
                 string tokenA3 = await generator.GenerateAsync(contextA);
                 string tokenB3 = await generator.GenerateAsync(contextB);