diff --git a/App/test/Events-TenantUserApp.Tests/ControllerTests/AccountControllerTests.cs b/App/test/Events-TenantUserApp.Tests/ControllerTests/AccountControllerTests.cs deleted file mode 100644 index b171c14..0000000 --- a/App/test/Events-TenantUserApp.Tests/ControllerTests/AccountControllerTests.cs +++ /dev/null @@ -1,99 +0,0 @@ -using System.Threading.Tasks; -using Events_Tenant.Common.Interfaces; -using Events_Tenant.Common.Models; -using Events_TenantUserApp.Controllers; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Localization; -using Microsoft.Extensions.Logging; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Moq; -using Xunit; -using Assert = Xunit.Assert; - -namespace Events_TenantUserApp.Tests.ControllerTests -{ - [TestClass] - public class AccountControllerTests - { - private readonly AccountController _accountController; - - public AccountControllerTests(IStringLocalizer localizer, IStringLocalizer baseLocalizer, ILogger logger, IConfiguration configuration) - { - var mockTenantRepo = new Mock(); - mockTenantRepo.Setup(repo => repo.GetCustomer("test@email.com", 123456)).Returns(GetCustomerAsync()); - mockTenantRepo.Setup(repo => repo.AddCustomer(GetCustomer(), 123456)).Returns(GetCustomerId()); - - var mockCatalogRepo = new Mock(); - - var mockUtilities = new Mock(); - - _accountController = new AccountController(localizer, baseLocalizer, mockTenantRepo.Object, mockCatalogRepo.Object, logger, configuration); - - } - - [Fact] - public void LoginTest() - { - //Act - var result = _accountController.Login("tenantName", "test@email.com"); - - // Assert - var redirectToActionResult = Assert.IsType(result); - Assert.Null(redirectToActionResult.ControllerName); - } - - [Fact] - public void LogoutTest() - { - //Act - var result = _accountController.Logout("tenantName", "testemail@gmail.com"); - - // Assert - var redirectToActionResult = Assert.IsType(result); - Assert.NotNull(redirectToActionResult.ControllerName); - Assert.Equal("Index", redirectToActionResult.ActionName); - Assert.Equal("Events", redirectToActionResult.ControllerName); - } - - [Fact] - public void RegisterCustomerTest() - { - //Act - var result = _accountController.Register("tenantName", GetCustomer()); - - // Assert - var redirectToActionResult = Assert.IsType(result); - Assert.Null(redirectToActionResult.ControllerName); - } - - private CustomerModel GetCustomer() - { - return new CustomerModel - { - CountryCode = "USA", - PostalCode = "123", - Email = "test@gmail.com", - FirstName = "customer1", - LastName = "lastName" - }; - } - - private async Task GetCustomerId() - { - return 1; - } - private async Task GetCustomerAsync() - { - return new CustomerModel - { - CountryCode = "USA", - PostalCode = "123", - Email = "test@gmail.com", - FirstName = "customer1", - LastName = "lastName" - }; - } - - } -} diff --git a/App/test/Events-TenantUserApp.Tests/ControllerTests/EventsControllerTests.cs b/App/test/Events-TenantUserApp.Tests/ControllerTests/EventsControllerTests.cs index 16d74bd..c685764 100644 --- a/App/test/Events-TenantUserApp.Tests/ControllerTests/EventsControllerTests.cs +++ b/App/test/Events-TenantUserApp.Tests/ControllerTests/EventsControllerTests.cs @@ -33,8 +33,9 @@ public EventsControllerTests(IStringLocalizer baseLocalizer, ILo mockTenantRepo.Setup(repo => repo.GetAllCountries(12345)).Returns(GetCountries()); mockTenantRepo.Setup(repo => repo.GetEventsForTenant(12345)).Returns(GetEvents()); - _eventsController = new EventsController(mockTenantRepo.Object, mockCatalogRepo.Object, baseLocalizer, logger, configuration); + var mockLookupClient = new Mock(); + _eventsController = new EventsController(mockTenantRepo.Object, mockCatalogRepo.Object, baseLocalizer, logger, configuration, mockLookupClient.Object, mockUtilities.Object); } [Fact] @@ -47,7 +48,6 @@ public void Index_ReturnsView() var viewResult = Assert.IsType(result); var model = Assert.IsAssignableFrom>(viewResult.ViewData.Model); Assert.Equal(2, model.Count()); - } private async Task GetTenantModel() @@ -126,5 +126,4 @@ private async Task> GetEvents() }; } } -} - +} \ No newline at end of file diff --git a/App/test/Events-TenantUserApp.Tests/ControllerTests/FindSeatsControllerTests.cs b/App/test/Events-TenantUserApp.Tests/ControllerTests/FindSeatsControllerTests.cs index 7268379..8e7e15c 100644 --- a/App/test/Events-TenantUserApp.Tests/ControllerTests/FindSeatsControllerTests.cs +++ b/App/test/Events-TenantUserApp.Tests/ControllerTests/FindSeatsControllerTests.cs @@ -38,8 +38,9 @@ public FindSeatsControllerTests(IStringLocalizer localizer, mockTenantRepo.Setup(r => r.AddTicketPurchase(GetTicketPurchaseModel(), 12345)).Returns(GetTicketId()); var mockUtilities = new Mock(); + var mockLookupClient = new Mock(); - _findSeatsController = new FindSeatsController(mockTenantRepo.Object, mockCatalogRepo.Object, localizer, baseLocalizer, logger, configuration); + _findSeatsController = new FindSeatsController(mockTenantRepo.Object, mockCatalogRepo.Object, localizer, baseLocalizer, logger, configuration, mockLookupClient.Object); } [Fact] @@ -51,7 +52,6 @@ public void FindSeatsTests_EventId_Null() Assert.NotNull(redirectToActionResult.ControllerName); Assert.Equal("Index", redirectToActionResult.ActionName); Assert.Equal("Events", redirectToActionResult.ControllerName); - } [Fact] @@ -73,7 +73,6 @@ public void GetAvailableSeatsTest() // Assert var contentResult = Assert.IsType(result); Assert.Equal("290", contentResult.Content); - } [Fact] @@ -191,4 +190,4 @@ private List GetTicketModels() return ticketModels; } } -} +} \ No newline at end of file diff --git a/App/test/Events-TenantUserApp.Tests/ControllerTests/HomeControllerTests.cs b/App/test/Events-TenantUserApp.Tests/ControllerTests/HomeControllerTests.cs index 80fb443..da7d1f2 100644 --- a/App/test/Events-TenantUserApp.Tests/ControllerTests/HomeControllerTests.cs +++ b/App/test/Events-TenantUserApp.Tests/ControllerTests/HomeControllerTests.cs @@ -31,7 +31,9 @@ public HomeControllerTests(ILogger logger) mockCatalogRepo.Setup(repo => repo.GetAllTenants()).Returns(GetTenants()); mockTenantRepo.Setup(repo => repo.GetVenueDetails(1234646)).Returns(GetVenueDetails()); - _homeController = new HomeController(mockCatalogRepo.Object, mockTenantRepo.Object, logger); + var mockUtilities = new Mock(); + + _homeController = new HomeController(mockCatalogRepo.Object, mockTenantRepo.Object, logger, mockUtilities.Object); } [Fact] @@ -84,4 +86,4 @@ private async Task> GetTenants() }; } } -} +} \ No newline at end of file diff --git a/App/test/Events-TenantUserApp.Tests/project.fragment.lock.json b/App/test/Events-TenantUserApp.Tests/project.fragment.lock.json index 208ddc6..fed9a1a 100644 --- a/App/test/Events-TenantUserApp.Tests/project.fragment.lock.json +++ b/App/test/Events-TenantUserApp.Tests/project.fragment.lock.json @@ -14,6 +14,9 @@ "../../packages/Microsoft.EntityFrameworkCore.1.1.1/lib/net451/Microsoft.EntityFrameworkCore.dll": {}, "../../packages/Microsoft.Extensions.Caching.Abstractions.1.1.1/lib/netstandard1.0/Microsoft.Extensions.Caching.Abstractions.dll": {}, "../../packages/Microsoft.Extensions.Caching.Memory.1.1.1/lib/net451/Microsoft.Extensions.Caching.Memory.dll": {}, + "../../packages/Microsoft.Extensions.Configuration.1.1.1/lib/netstandard1.1/Microsoft.Extensions.Configuration.dll": {}, + "../../packages/Microsoft.Extensions.Configuration.Abstractions.1.1.1/lib/netstandard1.0/Microsoft.Extensions.Configuration.Abstractions.dll": {}, + "../../packages/Microsoft.Extensions.Configuration.EnvironmentVariables.1.1.1/lib/net451/Microsoft.Extensions.Configuration.EnvironmentVariables.dll": {}, "../../packages/Microsoft.Extensions.DependencyInjection.1.1.0/lib/netstandard1.1/Microsoft.Extensions.DependencyInjection.dll": {}, "../../packages/Microsoft.Extensions.DependencyInjection.Abstractions.1.1.0/lib/netstandard1.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {}, "../../packages/Microsoft.Extensions.Logging.1.1.1/lib/netstandard1.1/Microsoft.Extensions.Logging.dll": {},