Fixing tests

This commit is contained in:
Pranav K 2015-11-17 17:06:36 -08:00
parent 5a3c4957d9
commit ef293c645c
5 changed files with 31 additions and 77 deletions

View File

@ -82,14 +82,11 @@ namespace MusicStore.Controllers
dbContext.AddRange(cartItems); dbContext.AddRange(cartItems);
dbContext.SaveChanges(); dbContext.SaveChanges();
var controller = new CheckoutController() var controller = new CheckoutController();
{
DbContext = dbContext,
};
controller.ActionContext.HttpContext = httpContext; controller.ActionContext.HttpContext = httpContext;
// Act // Act
var result = await controller.AddressAndPayment(order, CancellationToken.None); var result = await controller.AddressAndPayment(dbContext, order, CancellationToken.None);
// Assert // Assert
var redirectResult = Assert.IsType<RedirectToActionResult>(result); var redirectResult = Assert.IsType<RedirectToActionResult>(result);
@ -105,6 +102,7 @@ namespace MusicStore.Controllers
{ {
// Arrange // Arrange
var context = new DefaultHttpContext(); var context = new DefaultHttpContext();
var dbContext = _serviceProvider.GetRequiredService<MusicStoreContext>();
// AddressAndPayment action reads the Promo code from FormCollection. // AddressAndPayment action reads the Promo code from FormCollection.
context.Request.Form = context.Request.Form =
@ -117,7 +115,7 @@ namespace MusicStore.Controllers
var order = new Order(); var order = new Order();
// Act // Act
var result = await controller.AddressAndPayment(order, CancellationToken.None); var result = await controller.AddressAndPayment(dbContext, order, CancellationToken.None);
// Assert // Assert
var viewResult = Assert.IsType<ViewResult>(result); var viewResult = Assert.IsType<ViewResult>(result);
@ -134,6 +132,7 @@ namespace MusicStore.Controllers
var context = new DefaultHttpContext(); var context = new DefaultHttpContext();
context.Request.Form = context.Request.Form =
new FormCollection(new Dictionary<string, StringValues>()); new FormCollection(new Dictionary<string, StringValues>());
var dbContext = _serviceProvider.GetRequiredService<MusicStoreContext>();
var controller = new CheckoutController(); var controller = new CheckoutController();
controller.ActionContext.HttpContext = context; controller.ActionContext.HttpContext = context;
@ -141,7 +140,7 @@ namespace MusicStore.Controllers
var order = new Order(); var order = new Order();
// Act // Act
var result = await controller.AddressAndPayment(order, new CancellationToken(true)); var result = await controller.AddressAndPayment(dbContext, order, new CancellationToken(true));
// Assert // Assert
var viewResult = Assert.IsType<ViewResult>(result); var viewResult = Assert.IsType<ViewResult>(result);
@ -157,11 +156,12 @@ namespace MusicStore.Controllers
// Arrange // Arrange
var controller = new CheckoutController(); var controller = new CheckoutController();
controller.ModelState.AddModelError("a", "ModelErrorA"); controller.ModelState.AddModelError("a", "ModelErrorA");
var dbContext = _serviceProvider.GetRequiredService<MusicStoreContext>();
var order = new Order(); var order = new Order();
// Act // Act
var result = await controller.AddressAndPayment(order, CancellationToken.None); var result = await controller.AddressAndPayment(dbContext, order, CancellationToken.None);
// Assert // Assert
var viewResult = Assert.IsType<ViewResult>(result); var viewResult = Assert.IsType<ViewResult>(result);
@ -193,14 +193,11 @@ namespace MusicStore.Controllers
}); });
dbContext.SaveChanges(); dbContext.SaveChanges();
var controller = new CheckoutController() var controller = new CheckoutController();
{
DbContext = dbContext,
};
controller.ActionContext.HttpContext = httpContext; controller.ActionContext.HttpContext = httpContext;
// Act // Act
var result = await controller.Complete(orderId); var result = await controller.Complete(dbContext, orderId);
// Assert // Assert
var viewResult = Assert.IsType<ViewResult>(result); var viewResult = Assert.IsType<ViewResult>(result);
@ -218,14 +215,11 @@ namespace MusicStore.Controllers
var dbContext = var dbContext =
_serviceProvider.GetRequiredService<MusicStoreContext>(); _serviceProvider.GetRequiredService<MusicStoreContext>();
var controller = new CheckoutController() var controller = new CheckoutController();
{
DbContext = dbContext,
};
controller.ActionContext.HttpContext = new DefaultHttpContext(); controller.ActionContext.HttpContext = new DefaultHttpContext();
// Act // Act
var result = await controller.Complete(invalidOrderId); var result = await controller.Complete(dbContext, invalidOrderId);
// Assert // Assert
var viewResult = Assert.IsType<ViewResult>(result); var viewResult = Assert.IsType<ViewResult>(result);

View File

@ -46,16 +46,13 @@ namespace MusicStore.Controllers
public async Task Index_GetsSixTopAlbums() public async Task Index_GetsSixTopAlbums()
{ {
// Arrange // Arrange
var controller = new HomeController() var dbContext = _serviceProvider.GetRequiredService<MusicStoreContext>();
{ var cache = _serviceProvider.GetRequiredService<IMemoryCache>();
DbContext = _serviceProvider.GetRequiredService<MusicStoreContext>(), var controller = new HomeController();
Cache = _serviceProvider.GetRequiredService<IMemoryCache>(), PopulateData(dbContext);
};
PopulateData(controller.DbContext);
// Action // Action
var result = await controller.Index(); var result = await controller.Index(dbContext, cache);
// Assert // Assert
var viewResult = Assert.IsType<ViewResult>(result); var viewResult = Assert.IsType<ViewResult>(result);

View File

@ -64,11 +64,7 @@ namespace MusicStore.Controllers
var httpContext = _serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext; var httpContext = _serviceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
httpContext.User = new ClaimsPrincipal(new ClaimsIdentity(claims)); httpContext.User = new ClaimsPrincipal(new ClaimsIdentity(claims));
var controller = new ManageController() var controller = new ManageController(userManager, signInManager);
{
UserManager = userManager,
SignInManager = signInManager,
};
controller.ActionContext.HttpContext = httpContext; controller.ActionContext.HttpContext = httpContext;
// Act // Act

View File

@ -42,10 +42,7 @@ namespace MusicStore.Controllers
var httpContext = new DefaultHttpContext(); var httpContext = new DefaultHttpContext();
httpContext.Session = new TestSession(); httpContext.Session = new TestSession();
var controller = new ShoppingCartController() var controller = new ShoppingCartController(_serviceProvider.GetRequiredService<MusicStoreContext>());
{
DbContext = _serviceProvider.GetRequiredService<MusicStoreContext>(),
};
controller.ActionContext.HttpContext = httpContext; controller.ActionContext.HttpContext = httpContext;
// Act // Act
@ -69,10 +66,7 @@ namespace MusicStore.Controllers
httpContext.Session = new TestSession(); httpContext.Session = new TestSession();
httpContext.Session.SetString("Session", "CartId_A"); httpContext.Session.SetString("Session", "CartId_A");
var controller = new ShoppingCartController() var controller = new ShoppingCartController(_serviceProvider.GetRequiredService<MusicStoreContext>());
{
DbContext = _serviceProvider.GetRequiredService<MusicStoreContext>(),
};
controller.ActionContext.HttpContext = httpContext; controller.ActionContext.HttpContext = httpContext;
// Act // Act
@ -106,10 +100,7 @@ namespace MusicStore.Controllers
dbContext.AddRange(cartItems); dbContext.AddRange(cartItems);
dbContext.SaveChanges(); dbContext.SaveChanges();
var controller = new ShoppingCartController() var controller = new ShoppingCartController(dbContext);
{
DbContext = dbContext,
};
controller.ActionContext.HttpContext = httpContext; controller.ActionContext.HttpContext = httpContext;
// Act // Act
@ -140,10 +131,7 @@ namespace MusicStore.Controllers
dbContext.AddRange(albums); dbContext.AddRange(albums);
dbContext.SaveChanges(); dbContext.SaveChanges();
var controller = new ShoppingCartController() var controller = new ShoppingCartController(dbContext);
{
DbContext = dbContext
};
controller.ActionContext.HttpContext = httpContext; controller.ActionContext.HttpContext = httpContext;
// Act // Act
@ -196,15 +184,11 @@ namespace MusicStore.Controllers
httpContext.Request.Headers.Add(headers); httpContext.Request.Headers.Add(headers);
// Cotroller initialization // Cotroller initialization
var controller = new ShoppingCartController() var controller = new ShoppingCartController(dbContext);
{
DbContext = dbContext,
Antiforgery = antiForgery,
};
controller.ActionContext.HttpContext = httpContext; controller.ActionContext.HttpContext = httpContext;
// Act // Act
var result = await controller.RemoveFromCart(cartItemId, CancellationToken.None); var result = await controller.RemoveFromCart(antiForgery, cartItemId, CancellationToken.None);
// Assert // Assert
var jsonResult = Assert.IsType<JsonResult>(result); var jsonResult = Assert.IsType<JsonResult>(result);

View File

@ -33,10 +33,7 @@ namespace MusicStore.Controllers
var dbContext = _serviceProvider.GetRequiredService<MusicStoreContext>(); var dbContext = _serviceProvider.GetRequiredService<MusicStoreContext>();
CreateTestGenres(numberOfGenres: 10, numberOfAlbums: 1, dbContext: dbContext); CreateTestGenres(numberOfGenres: 10, numberOfAlbums: 1, dbContext: dbContext);
var controller = new StoreController() var controller = new StoreController(dbContext);
{
DbContext = dbContext,
};
// Act // Act
var result = await controller.Index(); var result = await controller.Index();
@ -54,10 +51,7 @@ namespace MusicStore.Controllers
public async Task Browse_ReturnsHttpNotFoundWhenNoGenreData() public async Task Browse_ReturnsHttpNotFoundWhenNoGenreData()
{ {
// Arrange // Arrange
var controller = new StoreController() var controller = new StoreController(_serviceProvider.GetRequiredService<MusicStoreContext>());
{
DbContext = _serviceProvider.GetRequiredService<MusicStoreContext>(),
};
// Act // Act
var result = await controller.Browse(string.Empty); var result = await controller.Browse(string.Empty);
@ -75,10 +69,7 @@ namespace MusicStore.Controllers
var dbContext = _serviceProvider.GetRequiredService<MusicStoreContext>(); var dbContext = _serviceProvider.GetRequiredService<MusicStoreContext>();
CreateTestGenres(numberOfGenres: 3, numberOfAlbums: 3, dbContext: dbContext); CreateTestGenres(numberOfGenres: 3, numberOfAlbums: 3, dbContext: dbContext);
var controller = new StoreController() var controller = new StoreController(dbContext);
{
DbContext = dbContext,
};
// Act // Act
var result = await controller.Browse(genreName); var result = await controller.Browse(genreName);
@ -99,14 +90,10 @@ namespace MusicStore.Controllers
{ {
// Arrange // Arrange
var albumId = int.MinValue; var albumId = int.MinValue;
var controller = new StoreController() var controller = new StoreController(_serviceProvider.GetRequiredService<MusicStoreContext>());
{
DbContext = _serviceProvider.GetRequiredService<MusicStoreContext>(),
Cache = _serviceProvider.GetRequiredService<IMemoryCache>(),
};
// Act // Act
var result = await controller.Details(albumId); var result = await controller.Details(_serviceProvider.GetRequiredService<IMemoryCache>(), albumId);
// Assert // Assert
Assert.IsType<HttpNotFoundResult>(result); Assert.IsType<HttpNotFoundResult>(result);
@ -123,14 +110,10 @@ namespace MusicStore.Controllers
var cache = _serviceProvider.GetRequiredService<IMemoryCache>(); var cache = _serviceProvider.GetRequiredService<IMemoryCache>();
var controller = new StoreController() var controller = new StoreController(dbContext);
{
DbContext = dbContext,
Cache = cache,
};
// Act // Act
var result = await controller.Details(albumId); var result = await controller.Details(cache, albumId);
// Assert // Assert
var viewResult = Assert.IsType<ViewResult>(result); var viewResult = Assert.IsType<ViewResult>(result);