Skip to content

Commit

Permalink
Merge pull request #337 from derrickstolee/fix-warnings
Browse files Browse the repository at this point in the history 
AzureReposHostProviderTests: fix warnings around orgName
  • Loading branch information
@mjcheetham
mjcheetham committed May 5, 2021
2 parents e8e87b9 + c4a6da8 commit 4df3dd0
Showing 1 changed file with 12 additions and 18 deletions.
30 changes: 12 additions & 18 deletions src/shared/Microsoft.AzureRepos.Tests/AzureReposHostProviderTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public class AzureReposHostProviderTests
$"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
private static readonly string AzDevUseHttpPathKey =
$"{Constants.GitConfiguration.Credential.SectionName}.https://dev.azure.com.{Constants.GitConfiguration.Credential.UseHttpPath}";
private static readonly string OrgName = "org";

[Fact]
public void AzureReposProvider_IsSupported_AzureHost_UnencryptedHttp_ReturnsTrue()
Expand Down Expand Up @@ -143,7 +144,6 @@ public async Task AzureReposProvider_GetCredentialAsync_UnencryptedHttp_ThrowsEx
[Fact]
public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_VsComUrlUser_ReturnsCredential()
{
var orgName = "org";
var urlAccount = "jane.doe";

var input = new InputArguments(new Dictionary<string, string>
Expand Down Expand Up @@ -176,7 +176,7 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_
.ReturnsAsync(authResult);

var authorityCacheMock = new Mock<IAzureDevOpsAuthorityCache>(MockBehavior.Strict);
authorityCacheMock.Setup(x => x.GetAuthority(orgName)).Returns(authorityUrl);
authorityCacheMock.Setup(x => x.GetAuthority(OrgName)).Returns(authorityUrl);

var userMgrMock = new Mock<IAzureReposBindingManager>(MockBehavior.Strict);

Expand All @@ -192,7 +192,6 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_
[Fact]
public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_DevAzureUrlUser_ReturnsCredential()
{
var orgName = "org";
var urlAccount = "jane.doe";

var input = new InputArguments(new Dictionary<string, string>
Expand Down Expand Up @@ -226,7 +225,7 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_
.ReturnsAsync(authResult);

var authorityCacheMock = new Mock<IAzureDevOpsAuthorityCache>(MockBehavior.Strict);
authorityCacheMock.Setup(x => x.GetAuthority(orgName)).Returns(authorityUrl);
authorityCacheMock.Setup(x => x.GetAuthority(OrgName)).Returns(authorityUrl);

var userMgrMock = new Mock<IAzureReposBindingManager>(MockBehavior.Strict);

Expand All @@ -242,7 +241,6 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_
[Fact]
public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_DevAzureUrlOrgName_ReturnsCredential()
{
var orgName = "org";

var input = new InputArguments(new Dictionary<string, string>
{
Expand Down Expand Up @@ -276,10 +274,10 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_
.ReturnsAsync(authResult);

var authorityCacheMock = new Mock<IAzureDevOpsAuthorityCache>(MockBehavior.Strict);
authorityCacheMock.Setup(x => x.GetAuthority(orgName)).Returns(authorityUrl);
authorityCacheMock.Setup(x => x.GetAuthority(OrgName)).Returns(authorityUrl);

var userMgrMock = new Mock<IAzureReposBindingManager>(MockBehavior.Strict);
userMgrMock.Setup(x => x.GetBinding(orgName)).Returns((AzureReposBinding)null);
userMgrMock.Setup(x => x.GetBinding(OrgName)).Returns((AzureReposBinding)null);

var provider = new AzureReposHostProvider(context, azDevOpsMock.Object, msAuthMock.Object, authorityCacheMock.Object, userMgrMock.Object);

Expand All @@ -302,7 +300,6 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_

var expectedOrgUri = new Uri("https://dev.azure.com/org");
var remoteUri = new Uri("https://dev.azure.com/org/proj/_git/repo");
var orgName = "org";
var authorityUrl = "https://login.microsoftonline.com/common";
var expectedClientId = AzureDevOpsConstants.AadClientId;
var expectedRedirectUri = AzureDevOpsConstants.AadRedirectUri;
Expand All @@ -324,10 +321,10 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_
.ReturnsAsync(authResult);

var authorityCacheMock = new Mock<IAzureDevOpsAuthorityCache>(MockBehavior.Strict);
authorityCacheMock.Setup(x => x.GetAuthority(orgName)).Returns(authorityUrl);
authorityCacheMock.Setup(x => x.GetAuthority(OrgName)).Returns(authorityUrl);

var userMgrMock = new Mock<IAzureReposBindingManager>(MockBehavior.Strict);
userMgrMock.Setup(x => x.GetBinding(orgName)).Returns((AzureReposBinding)null);
userMgrMock.Setup(x => x.GetBinding(OrgName)).Returns((AzureReposBinding)null);

var provider = new AzureReposHostProvider(context, azDevOpsMock.Object, msAuthMock.Object, authorityCacheMock.Object, userMgrMock.Object);

Expand All @@ -341,7 +338,6 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_
[Fact]
public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_BoundUser_ReturnsCredential()
{
var orgName = "org";

var input = new InputArguments(new Dictionary<string, string>
{
Expand Down Expand Up @@ -373,11 +369,11 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_
.ReturnsAsync(authResult);

var authorityCacheMock = new Mock<IAzureDevOpsAuthorityCache>(MockBehavior.Strict);
authorityCacheMock.Setup(x => x.GetAuthority(orgName)).Returns(authorityUrl);
authorityCacheMock.Setup(x => x.GetAuthority(OrgName)).Returns(authorityUrl);

var userMgrMock = new Mock<IAzureReposBindingManager>(MockBehavior.Strict);
userMgrMock.Setup(x => x.GetBinding(orgName))
.Returns(new AzureReposBinding(orgName, account, null));
userMgrMock.Setup(x => x.GetBinding(OrgName))
.Returns(new AzureReposBinding(OrgName, account, null));

var provider = new AzureReposHostProvider(context, azDevOpsMock.Object, msAuthMock.Object, authorityCacheMock.Object, userMgrMock.Object);

Expand All @@ -391,7 +387,6 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_
[Fact]
public async Task AzureReposProvider_GetCredentialAsync_JwtMode_NoCachedAuthority_NoUser_ReturnsCredential()
{
var orgName = "org";

var input = new InputArguments(new Dictionary<string, string>
{
Expand Down Expand Up @@ -425,10 +420,10 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_NoCachedAuthorit

var authorityCacheMock = new Mock<IAzureDevOpsAuthorityCache>(MockBehavior.Strict);
authorityCacheMock.Setup(x => x.GetAuthority(It.IsAny<string>())).Returns((string)null);
authorityCacheMock.Setup(x => x.UpdateAuthority(orgName, authorityUrl));
authorityCacheMock.Setup(x => x.UpdateAuthority(OrgName, authorityUrl));

var userMgrMock = new Mock<IAzureReposBindingManager>(MockBehavior.Strict);
userMgrMock.Setup(x => x.GetBinding(orgName)).Returns((AzureReposBinding)null);
userMgrMock.Setup(x => x.GetBinding(OrgName)).Returns((AzureReposBinding)null);

var provider = new AzureReposHostProvider(context, azDevOpsMock.Object, msAuthMock.Object, authorityCacheMock.Object, userMgrMock.Object);

Expand All @@ -442,7 +437,6 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_NoCachedAuthorit
[Fact]
public async Task AzureReposProvider_GetCredentialAsync_PatMode_NoExistingPat_GeneratesCredential()
{
var orgName = "org";

var input = new InputArguments(new Dictionary<string, string>
{
Expand Down

0 comments on commit 4df3dd0

Please sign in to comment.