Ensure that the order of arguments is expected, actual

Follow-up to #1346

Author: lukebakken

projects/Unit/Helper/RequestFormMatcher.cs

@@ -54,7 +54,7 @@ public Func<string, bool> Matcher()
                 foreach (string k in actual.Keys)
                 {
                     Assert.NotNull(_expected[k]);
-                    Assert.Equal(actual[k], _expected[k]);
+                    Assert.Equal(_expected[k], actual[k]);
                 }
                 return true;
             };

projects/Unit/TestOAuth2Client.cs

@@ -84,9 +84,9 @@ public void TestRequestToken()
 
             IToken token = _client.RequestToken();
             Assert.NotNull(token);
-            Assert.Equal(token.AccessToken, expectedJsonToken.access_token);
-            Assert.Equal(token.RefreshToken, expectedJsonToken.refresh_token);
-            Assert.Equal(token.ExpiresIn, TimeSpan.FromSeconds(expectedJsonToken.expires_in));
+            Assert.Equal(expectedJsonToken.access_token, token.AccessToken);
+            Assert.Equal(expectedJsonToken.refresh_token, token.RefreshToken);
+            Assert.Equal(TimeSpan.FromSeconds(expectedJsonToken.expires_in), token.ExpiresIn);
         }
 
         private void expectTokenRefresh(JsonToken expectedResponse)
@@ -134,9 +134,9 @@ public void TestRefreshToken()
             IToken refreshedToken = _client.RefreshToken(token);
             Assert.False(refreshedToken == token);
             Assert.NotNull(refreshedToken);
-            Assert.Equal(refreshedToken.AccessToken, expectedJsonToken.access_token);
-            Assert.Equal(refreshedToken.RefreshToken, expectedJsonToken.refresh_token);
-            Assert.Equal(refreshedToken.ExpiresIn, TimeSpan.FromSeconds(expectedJsonToken.expires_in));
+            Assert.Equal(expectedJsonToken.access_token, refreshedToken.AccessToken);
+            Assert.Equal(expectedJsonToken.refresh_token, refreshedToken.RefreshToken);
+            Assert.Equal(TimeSpan.FromSeconds(expectedJsonToken.expires_in), refreshedToken.ExpiresIn);
         }
 
         [Fact]

projects/Unit/TestOAuth2ClientCredentialsProvider.cs

@@ -67,8 +67,8 @@ public void ShouldRequestTokenWhenGettingPasswordOrValidUntilForFirstTimeAccess(
         {
             IToken firstToken = newToken("the_access_token", "the_refresh_token", TimeSpan.FromSeconds(1));
             _oAuth2Client.Setup(p => p.RequestToken()).Returns(firstToken);
-            Assert.Equal(firstToken.AccessToken, _provider.Password);
-            Assert.Equal(firstToken.ExpiresIn, _provider.ValidUntil.Value);
+            Assert.Equal(_provider.Password, firstToken.AccessToken);
+            Assert.Equal(_provider.ValidUntil.Value, firstToken.ExpiresIn);
         }
 
         [Fact]
@@ -78,15 +78,15 @@ public void ShouldRefreshTokenUsingRefreshTokenWhenAvailable()
             IToken refreshedToken = newToken("the_access_token2", "the_refresh_token_2", TimeSpan.FromSeconds(60));
             _oAuth2Client.Setup(p => p.RequestToken()).Returns(firstToken);
             _provider.Refresh();
-            Assert.Equal(firstToken.AccessToken, _provider.Password);
-            Assert.Equal(firstToken.ExpiresIn, _provider.ValidUntil.Value);
+            Assert.Equal(_provider.Password, firstToken.AccessToken);
+            Assert.Equal(_provider.ValidUntil.Value, firstToken.ExpiresIn);
             _oAuth2Client.Reset();
             System.Threading.Thread.Sleep(1000);
 
             _oAuth2Client.Setup(p => p.RefreshToken(firstToken)).Returns(refreshedToken);
             _provider.Refresh();
-            Assert.Equal(refreshedToken.AccessToken, _provider.Password);
-            Assert.Equal(refreshedToken.ExpiresIn, _provider.ValidUntil.Value);
+            Assert.Equal(_provider.Password, refreshedToken.AccessToken);
+            Assert.Equal(_provider.ValidUntil.Value, refreshedToken.ExpiresIn);
 
         }
 
@@ -99,12 +99,12 @@ public void ShouldRequestTokenWhenRefreshTokenNotAvailable()
                 .Returns(firstToken)
                 .Returns(refreshedToken);
             _provider.Refresh();
-            Assert.Equal(firstToken.AccessToken, _provider.Password);
-            Assert.Equal(firstToken.ExpiresIn, _provider.ValidUntil.Value);
+            Assert.Equal(_provider.Password, firstToken.AccessToken);
+            Assert.Equal(_provider.ValidUntil.Value, firstToken.ExpiresIn);
 
             _provider.Refresh();
-            Assert.Equal(refreshedToken.AccessToken, _provider.Password);
-            Assert.Equal(refreshedToken.ExpiresIn, _provider.ValidUntil.Value);
+            Assert.Equal(_provider.Password, refreshedToken.AccessToken);
+            Assert.Equal(_provider.ValidUntil.Value, refreshedToken.ExpiresIn);
             Mock.Verify(_oAuth2Client);
         }