Skip to content

Commit 3457153

Browse files
authored
Merge pull request #24 from IgniteUI/cpi/add-ca-stylecop-analyzers
Added Code Analysis and Stylecop rules to NorthwindCRUD project.
2 parents aeec22a + b4c15a2 commit 3457153

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+689
-584
lines changed

NorthwindCRUD.Tests/CategroyServiceFixture.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public void ShouldCreateCategory()
1414
Assert.IsNotNull(createdCategory);
1515
createdCategory = DataHelper2.CategoryService.GetById(createdCategory.CategoryId);
1616

17-
Assert.AreEqual(category.Name, createdCategory.Name);
18-
Assert.AreEqual(category.Description, createdCategory.Description);
17+
Assert.AreEqual(category.Name, createdCategory?.Name);
18+
Assert.AreEqual(category.Description, createdCategory?.Description);
1919
}
2020

2121
[TestMethod]
@@ -32,6 +32,7 @@ public void ShouldUpdateCategory()
3232

3333
Assert.IsNotNull(updatedCategory);
3434
updatedCategory = DataHelper2.CategoryService.GetById(updatedCategory.CategoryId);
35+
Assert.IsNotNull(updatedCategory);
3536
Assert.AreNotEqual(orignalName, updatedCategory.Name);
3637
Assert.AreNotEqual(orignalDescription, updatedCategory.Description);
3738
Assert.AreEqual(createdCategory.Name, updatedCategory.Name);

NorthwindCRUD.Tests/CustomerServiceFixture.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public void ShouldCreateCustomer()
1414
Assert.AreEqual(customer, createdCustomer, "Customers instances should be the same since we are over the same context");
1515

1616
createdCustomer = DataHelper2.CustomerService.GetById(createdCustomer.CustomerId);
17+
Assert.IsNotNull(createdCustomer);
1718
Assert.AreNotEqual(customer, createdCustomer, "Customer instances should be different");
1819

1920
Assert.AreEqual(customer.CompanyName, createdCustomer.CompanyName);

NorthwindCRUD.Tests/EmployeeServiceFixture.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ public void ShouldCreateEmployee()
1414
var createdEmployee = DataHelper.EmployeeService.Create(employee);
1515

1616
Assert.IsNotNull(createdEmployee);
17-
var newEmployee = DataHelper2.EmployeeService.GetById(createdEmployee.EmployeeId);
18-
Assert.AreEqual(employee.FirstName, newEmployee.FirstName);
19-
Assert.AreEqual(employee.LastName, newEmployee.LastName);
20-
Assert.AreEqual(employee.Title, newEmployee.Title);
17+
createdEmployee = DataHelper2.EmployeeService.GetById(createdEmployee.EmployeeId);
18+
Assert.IsNotNull(createdEmployee);
19+
Assert.AreEqual(employee.FirstName, createdEmployee.FirstName);
20+
Assert.AreEqual(employee.LastName, createdEmployee.LastName);
21+
Assert.AreEqual(employee.Title, createdEmployee.Title);
2122
}
2223

2324
[TestMethod]
@@ -32,7 +33,7 @@ public void ShouldUpdateEmployee()
3233

3334
Assert.IsNotNull(updatedEmployee);
3435
updatedEmployee = DataHelper2.EmployeeService.GetById(updatedEmployee.EmployeeId);
35-
36+
Assert.IsNotNull(updatedEmployee);
3637
Assert.AreNotEqual(originalTitle, updatedEmployee.Title);
3738
Assert.AreEqual(createdEmployee.Title, updatedEmployee.Title);
3839
}

NorthwindCRUD.Tests/OrderServiceFixture.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ public void ShouldCreateOrder()
2020

2121
Assert.IsNotNull(createdOrder);
2222
createdOrder = DataHelper2.OrderService.GetById(createdOrder.OrderId);
23+
Assert.IsNotNull(createdOrder);
24+
2325
Assert.AreEqual(order.OrderId, createdOrder.OrderId);
2426
Assert.AreEqual(order.CustomerId, createdOrder.CustomerId);
2527
Assert.AreEqual(order.EmployeeId, createdOrder.EmployeeId);
@@ -39,6 +41,7 @@ public void ShouldUpdateOrder()
3941

4042
Assert.IsNotNull(updatedOrder);
4143
updatedOrder = DataHelper2.OrderService.GetById(updatedOrder.OrderId);
44+
Assert.IsNotNull(updatedOrder);
4245
Assert.AreNotEqual(originalCustomerId, updatedOrder.CustomerId);
4346
Assert.AreNotEqual(originalEmployeeId, updatedOrder.EmployeeId);
4447
Assert.AreEqual(order.CustomerId, updatedOrder.CustomerId);

NorthwindCRUD.Tests/ProductServiceFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void ShouldCreateProduct()
1313

1414
Assert.IsNotNull(createdProduct);
1515
createdProduct = DataHelper2.ProductService.GetById(createdProduct.ProductId);
16-
16+
Assert.IsNotNull(createdProduct);
1717
Assert.AreEqual(product.UnitPrice, createdProduct.UnitPrice);
1818
Assert.AreEqual(product.UnitsInStock, createdProduct.UnitsInStock);
1919
}
@@ -31,7 +31,7 @@ public void ShouldUpdateProduct()
3131

3232
Assert.IsNotNull(updatedProduct);
3333
updatedProduct = DataHelper2.ProductService.GetById(updatedProduct.ProductId);
34-
34+
Assert.IsNotNull(updatedProduct);
3535
Assert.AreNotEqual(originaUnitPrice, updatedProduct.UnitPrice);
3636
Assert.AreNotEqual(originaUnitsInStock, updatedProduct.UnitsInStock);
3737

NorthwindCRUD.Tests/RegionServiceFixture.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public void ShouldCreateRegion()
1515

1616
Assert.IsNotNull(createdRegion);
1717
createdRegion = DataHelper2.RegionService.GetById(createdRegion.RegionId);
18+
Assert.IsNotNull(createdRegion);
1819
Assert.AreEqual(region.RegionId, createdRegion.RegionId);
1920
Assert.AreEqual(region.RegionDescription, createdRegion.RegionDescription);
2021
}
@@ -30,6 +31,7 @@ public void ShouldUpdateRegion()
3031

3132
Assert.IsNotNull(updatedRegion);
3233
updatedRegion = DataHelper2.RegionService.GetById(updatedRegion.RegionId);
34+
Assert.IsNotNull(updatedRegion);
3335
Assert.AreNotEqual(originalRegionDescription, updatedRegion.RegionDescription);
3436
Assert.AreEqual(region.RegionDescription, updatedRegion.RegionDescription);
3537
}

NorthwindCRUD.Tests/ShipperServiceFixture.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public void ShouldCreateShipper()
1414

1515
Assert.IsNotNull(createdShipper);
1616
createdShipper = DataHelper2.ShipperService.GetById(createdShipper.ShipperId);
17+
Assert.IsNotNull(createdShipper);
1718
Assert.AreEqual(shipper.ShipperId, createdShipper.ShipperId);
1819
Assert.AreEqual(shipper.CompanyName, createdShipper.CompanyName);
1920
Assert.AreEqual(shipper.Phone, createdShipper.Phone);
@@ -34,6 +35,7 @@ public void ShouldUpdateShipper()
3435

3536
Assert.IsNotNull(updatedShipper);
3637
updatedShipper = DataHelper2.ShipperService.GetById(updatedShipper.ShipperId);
38+
Assert.IsNotNull(updatedShipper);
3739
Assert.AreNotEqual(originalCompanyName, updatedShipper.CompanyName);
3840
Assert.AreNotEqual(originalPhone, updatedShipper.Phone);
3941
Assert.AreEqual(shipper.CompanyName, updatedShipper.CompanyName);

NorthwindCRUD.Tests/SupplierServiceFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public void ShouldCreateSupplier()
1515

1616
Assert.IsNotNull(createdSupplier);
1717
createdSupplier = DataHelper2.SupplierService.GetById(createdSupplier.SupplierId);
18-
18+
Assert.IsNotNull(createdSupplier);
1919
Assert.AreEqual(supplier.SupplierId, createdSupplier.SupplierId);
2020
Assert.AreEqual(supplier.CompanyName, createdSupplier.CompanyName);
2121
Assert.AreEqual(supplier.ContactName, createdSupplier.ContactName);
@@ -35,9 +35,9 @@ public void ShouldUpdateSupplier()
3535
supplier.ContactTitle = "Updated Title";
3636

3737
var updatedSupplier = DataHelper.SupplierService.Update(supplier);
38-
3938
Assert.IsNotNull(updatedSupplier);
4039
updatedSupplier = DataHelper2.SupplierService.GetById(updatedSupplier.SupplierId);
40+
Assert.IsNotNull(updatedSupplier);
4141
Assert.AreEqual(supplier.CompanyName, updatedSupplier.CompanyName);
4242
Assert.AreEqual(supplier.ContactName, updatedSupplier.ContactName);
4343
Assert.AreEqual(supplier.ContactTitle, updatedSupplier.ContactTitle);

NorthwindCRUD.Tests/TerritoryServiceFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public void ShouldCreateTerritory()
1414

1515
Assert.IsNotNull(createdTerritory);
1616
createdTerritory = DataHelper2.TerritoryService.GetById(createdTerritory.TerritoryId);
17-
17+
Assert.IsNotNull(createdTerritory);
1818
Assert.AreEqual(territory.TerritoryId, createdTerritory.TerritoryId);
1919
Assert.AreEqual(territory.TerritoryDescription, createdTerritory.TerritoryDescription);
2020
Assert.AreEqual(territory.RegionId, createdTerritory.RegionId);
@@ -32,8 +32,8 @@ public void ShouldUpdateTerritory()
3232
var updatedTerritory = DataHelper.TerritoryService.Update(createdTerritory);
3333

3434
Assert.IsNotNull(updatedTerritory);
35-
3635
updatedTerritory = DataHelper2.TerritoryService.GetById(updatedTerritory.TerritoryId);
36+
Assert.IsNotNull(updatedTerritory);
3737
Assert.AreNotEqual(originalTerritoryDescription, updatedTerritory.TerritoryDescription);
3838
Assert.AreEqual(createdTerritory.TerritoryDescription, updatedTerritory.TerritoryDescription);
3939
}

NorthwindCRUD/Controllers/AuthController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class AuthController : Controller
1515
private readonly AuthService authService;
1616
private readonly IMapper mapper;
1717
private readonly ILogger logger;
18-
18+
1919
public AuthController(IConfiguration configuration, AuthService authService, IMapper mapper, ILogger logger)
2020
{
2121
this.configuration = configuration;
@@ -38,6 +38,7 @@ public ActionResult<string> Login(LoginDto userModel)
3838

3939
return Ok(token);
4040
}
41+
4142
return BadRequest("Email or password are not correct!");
4243
}
4344

@@ -75,7 +76,6 @@ public ActionResult<string> Register(RegisterDto userModel)
7576
{
7677
var token = this.authService.GenerateJwtToken(user.Email);
7778
return Ok(token);
78-
7979
}
8080

8181
return BadRequest("Email or password are not correct!");

0 commit comments

Comments
 (0)