Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dgdimitrov/refactoring #41

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+3,182 −3,578
Open

Dgdimitrov/refactoring #41

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
51daeef
initial
ddidgdimitrov-infragistics Sep 20, 2024
8281021
task(*): refactoring
ddidgdimitrov-infragistics Oct 23, 2024
f711e00
Merge branch 'main' of https://github.com/IgniteUI/NorthwindAPI into …
ddidgdimitrov-infragistics Oct 23, 2024
37a728c
resolve conflicts and styling
ddidgdimitrov-infragistics Oct 23, 2024
390f6f2
typo
ddidgdimitrov-infragistics Oct 23, 2024
b944338
fix warnings
ddidgdimitrov-infragistics Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
task(*): refactoring
@ddidgdimitrov-infragistics
ddidgdimitrov-infragistics committed Oct 23, 2024
commit 8281021851b43b4816137f1b6e4c9fd4b4b0bd3c
12 changes: 10 additions & 2 deletions NorthwindCRUD.Tests/BaseFixture.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using System.Data.Common;
using AutoMapper;
using Microsoft.Data.Sqlite;
using Microsoft.EntityFrameworkCore;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using NorthwindCRUD.Services;

namespace NorthwindCRUD.Tests
{
@@ -17,13 +19,19 @@ public class BaseFixture
[TestInitialize]
public void Initialize()
{
var mappingConfigs = new MapperConfiguration(cfg =>
{
cfg.AddProfile<MappingProfiles>();
});
var mapper = mappingConfigs.CreateMapper();
var pagingService = new PagingService(mapper);
DataContext context = GetInMemoryDatabaseContext();
DataContext context2 = GetInMemoryDatabaseContext();
Assert.AreNotEqual(context.GetHashCode(), context2.GetHashCode(), "Contexts instances should be different.");
Assert.AreEqual(context.Database.GetDbConnection(), context2.Database.GetDbConnection(), "Contexts instances should have the same database connection.");

DataHelper = new DataHelper(context);
DataHelper2 = new DataHelper(context2);
DataHelper = new DataHelper(context, pagingService, mapper);
DataHelper2 = new DataHelper(context2, pagingService, mapper);
}

protected DataContext GetInMemoryDatabaseContext()
20 changes: 10 additions & 10 deletions NorthwindCRUD.Tests/CategroyServiceFixture.cs
View file
Original file line number Diff line number Diff line change
@@ -6,10 +6,10 @@ namespace NorthwindCRUD.Tests
public class CategoryServiceFixture : BaseFixture
{
[TestMethod]
public void ShouldCreateCategory()
public async Task ShouldCreateCategory()
{
var category = DataHelper.GetCategory();
var createdCategory = DataHelper.CategoryService.Create(category);
var createdCategory = await DataHelper.CategoryService.Create(category);

Assert.IsNotNull(createdCategory);
createdCategory = DataHelper2.CategoryService.GetById(createdCategory.CategoryId);
@@ -19,16 +19,16 @@ public void ShouldCreateCategory()
}

[TestMethod]
public void ShouldUpdateCategory()
public async Task ShouldUpdateCategory()
{
var category = DataHelper.GetCategory();
string orignalName = category.Name;
string orignalDescription = category.Description;
var createdCategory = DataHelper.CategoryService.Create(category);
var createdCategory = await DataHelper.CategoryService.Create(category);

createdCategory.Name = "Updated Category";
createdCategory.Description = "Updated Description";
var updatedCategory = DataHelper.CategoryService.Update(createdCategory);
var updatedCategory = await DataHelper.CategoryService.Update(createdCategory, createdCategory.CategoryId);

Assert.IsNotNull(updatedCategory);
updatedCategory = DataHelper2.CategoryService.GetById(updatedCategory.CategoryId);
@@ -40,11 +40,11 @@ public void ShouldUpdateCategory()
}

[TestMethod]
public void ShouldDeleteCategory()
public async Task ShouldDeleteCategory()
{
var category = DataHelper.GetCategory();

var createdCategory = DataHelper.CategoryService.Create(category);
var createdCategory = await DataHelper.CategoryService.Create(category);

DataHelper.CategoryService.Delete(createdCategory.CategoryId);
var deletedCategory = DataHelper2.CategoryService.GetById(createdCategory.CategoryId);
@@ -53,10 +53,10 @@ public void ShouldDeleteCategory()
}

[TestMethod]
public void ShouldReturnAllCategories()
public async Task ShouldReturnAllCategories()
{
DataHelper.CategoryService.Create(DataHelper.GetCategory());
DataHelper.CategoryService.Create(DataHelper.GetCategory());
await DataHelper.CategoryService.Create(DataHelper.GetCategory());
await DataHelper.CategoryService.Create(DataHelper.GetCategory());
var result = DataHelper2.CategoryService.GetAll();

Assert.IsNotNull(result);
50 changes: 28 additions & 22 deletions NorthwindCRUD.Tests/CustomerServiceFixture.cs
View file
Original file line number Diff line number Diff line change
@@ -6,36 +6,42 @@ namespace NorthwindCRUD.Tests
public class CustomerServiceFixture : BaseFixture
{
[TestMethod]
public void ShouldCreateCustomer()
public async Task ShouldCreateCustomer()
{
//var customer = DataHelper.GetCustomer();
//var createdCustomer = DataHelper.CustomerService.Create(customer);
//Assert.IsNotNull(createdCustomer);
//Assert.AreEqual(customer, createdCustomer, "Customers instances should be the same since we are over the same context");
var customer = DataHelper.GetCustomer();
var createdCustomer = await DataHelper.CustomerService.Create(customer);
Assert.IsNotNull(createdCustomer);
Assert.AreEqual(customer.CompanyName, createdCustomer.CompanyName);
Assert.AreEqual(customer.ContactName, createdCustomer.ContactName);
Assert.AreEqual(customer.ContactTitle, createdCustomer.ContactTitle);
Assert.AreEqual(customer.Address.Street, createdCustomer.Address.Street);
Assert.AreEqual(customer.Address.City, createdCustomer.Address.City);
Assert.AreEqual(customer.Address.PostalCode, createdCustomer.Address.PostalCode);
Assert.AreEqual(customer.Address.Country, createdCustomer.Address.Country);
Assert.AreEqual(customer.Address.Phone, createdCustomer.Address.Phone);

////createdCustomer = DataHelper2.CustomerService.GetById(createdCustomer.CustomerId);
//Assert.IsNotNull(createdCustomer);
//Assert.AreNotEqual(customer, createdCustomer, "Customer instances should be different");
createdCustomer = DataHelper2.CustomerService.GetById(createdCustomer.CustomerId);
Assert.IsNotNull(createdCustomer);

//Assert.AreEqual(customer.CompanyName, createdCustomer.CompanyName);
//Assert.AreEqual(customer.ContactName, createdCustomer.ContactName);
//Assert.AreEqual(customer.ContactTitle, createdCustomer.ContactTitle);
//Assert.AreEqual(customer.Address.Street, createdCustomer.Address.Street);
//Assert.AreEqual(customer.Address.City, createdCustomer.Address.City);
//Assert.AreEqual(customer.Address.PostalCode, createdCustomer.Address.PostalCode);
//Assert.AreEqual(customer.Address.Country, createdCustomer.Address.Country);
//Assert.AreEqual(customer.Address.Phone, createdCustomer.Address.Phone);
Assert.AreEqual(customer.CompanyName, createdCustomer.CompanyName);
Assert.AreEqual(customer.ContactName, createdCustomer.ContactName);
Assert.AreEqual(customer.ContactTitle, createdCustomer.ContactTitle);
Assert.AreEqual(customer.Address.Street, createdCustomer.Address.Street);
Assert.AreEqual(customer.Address.City, createdCustomer.Address.City);
Assert.AreEqual(customer.Address.PostalCode, createdCustomer.Address.PostalCode);
Assert.AreEqual(customer.Address.Country, createdCustomer.Address.Country);
Assert.AreEqual(customer.Address.Phone, createdCustomer.Address.Phone);
}

[TestMethod]
public void ShouldReturnAllCustomers()
public async Task ShouldReturnAllCustomers()
{
//DataHelper.CustomerService.Create(DataHelper.GetCustomer());
//DataHelper.CustomerService.Create(DataHelper.GetCustomer());
await DataHelper.CustomerService.Create(DataHelper.GetCustomer());
await DataHelper.CustomerService.Create(DataHelper.GetCustomer());

//var result = DataHelper2.CustomerService.GetAll();
//Assert.IsNotNull(result);
//Assert.AreEqual(2, result.Length);
var result = DataHelper2.CustomerService.GetAll();
Assert.IsNotNull(result);
Assert.AreEqual(2, result.Length);
}
}
}
35 changes: 17 additions & 18 deletions NorthwindCRUD.Tests/EmployeeServiceFixture.cs
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using NorthwindCRUD.Models.DbModels;

namespace NorthwindCRUD.Tests
{
[TestClass]
public class EmployeeServiceFixture : BaseFixture
{
[TestMethod]
public void ShouldCreateEmployee()
public async Task ShouldCreateEmployee()
{
EmployeeDb employee = DataHelper.GetEmployee();
var employee = DataHelper.GetEmployee();

var createdEmployee = DataHelper.EmployeeService.Create(employee);
var createdEmployee = await DataHelper.EmployeeService.Create(employee);

Assert.IsNotNull(createdEmployee);
createdEmployee = DataHelper2.EmployeeService.GetById(createdEmployee.EmployeeId);
@@ -22,14 +21,14 @@ public void ShouldCreateEmployee()
}

[TestMethod]
public void ShouldUpdateEmployee()
public async Task ShouldUpdateEmployee()
{
var employee = DataHelper.GetEmployee();
string originalTitle = employee.Title;
var createdEmployee = DataHelper.EmployeeService.Create(employee);
var createdEmployee = await DataHelper.EmployeeService.Create(employee);

createdEmployee.Title = "Director";
var updatedEmployee = DataHelper.EmployeeService.Update(createdEmployee);
var updatedEmployee = await DataHelper.EmployeeService.Update(createdEmployee, createdEmployee.EmployeeId);

Assert.IsNotNull(updatedEmployee);
updatedEmployee = DataHelper2.EmployeeService.GetById(updatedEmployee.EmployeeId);
@@ -39,10 +38,10 @@ public void ShouldUpdateEmployee()
}

[TestMethod]
public void ShouldDeleteEmployee()
public async Task ShouldDeleteEmployee()
{
var employee = DataHelper.GetEmployee();
var createdEmployee = DataHelper.EmployeeService.Create(employee);
var createdEmployee = await DataHelper.EmployeeService.Create(employee);

DataHelper.EmployeeService.Delete(createdEmployee.EmployeeId);
var deletedEmployee = DataHelper2.EmployeeService.GetById(createdEmployee.EmployeeId);
@@ -51,10 +50,10 @@ public void ShouldDeleteEmployee()
}

[TestMethod]
public void ShouldReturnAllEmployees()
public async Task ShouldReturnAllEmployees()
{
DataHelper.EmployeeService.Create(DataHelper.GetEmployee());
DataHelper.EmployeeService.Create(DataHelper.GetEmployee());
await DataHelper.EmployeeService.Create(DataHelper.GetEmployee());
await DataHelper.EmployeeService.Create(DataHelper.GetEmployee());

var result = DataHelper2.EmployeeService.GetAll();

@@ -63,19 +62,19 @@ public void ShouldReturnAllEmployees()
}

[TestMethod]
public void ShouldReturnEmployeesByReportsTo()
public async Task ShouldReturnEmployeesByReportsTo()
{
var manager = DataHelper.GetEmployee();

var createdManager = DataHelper.EmployeeService.Create(manager);
var createdManager = await DataHelper.EmployeeService.Create(manager);
var employee1 = DataHelper.GetEmployee();
employee1.ReportsTo = createdManager.EmployeeId;

var employee2 = DataHelper.GetEmployee();
employee2.ReportsTo = createdManager.EmployeeId;

var createdEmployee1 = DataHelper.EmployeeService.Create(employee1);
var createdEmployee2 = DataHelper.EmployeeService.Create(employee2);
var createdEmployee1 = await DataHelper.EmployeeService.Create(employee1);
var createdEmployee2 = await DataHelper.EmployeeService.Create(employee2);

var result = DataHelper.EmployeeService.GetEmployeesByReportsTo(createdManager.EmployeeId);
Assert.IsNotNull(result);
@@ -84,11 +83,11 @@ public void ShouldReturnEmployeesByReportsTo()
}

[TestMethod]
public void ShouldReturnEmployeeById()
public async Task ShouldReturnEmployeeById()
{
var employee = DataHelper.GetEmployee();

var createdEmployee = DataHelper.EmployeeService.Create(employee);
var createdEmployee = await DataHelper.EmployeeService.Create(employee);

var result = DataHelper.EmployeeService.GetById(createdEmployee.EmployeeId);

22 changes: 11 additions & 11 deletions NorthwindCRUD.Tests/EmployeeTerritoryServiceFixture.cs
View file
Original file line number Diff line number Diff line change
@@ -6,10 +6,10 @@ namespace NorthwindCRUD.Tests
public class EmployeeTerritoryServiceFixture : BaseFixture
{
[TestMethod]
public void ShouldAddTerritoryToEmployee()
public async Task ShouldAddTerritoryToEmployee()
{
var employeeId = DataHelper.CreateEmployee().EmployeeId;
var territoryId = DataHelper.CreateTerritory().TerritoryId;
var employeeId = (await DataHelper.CreateEmployee()).EmployeeId;
var territoryId = (await DataHelper.CreateTerritory()).TerritoryId;

DataHelper.CreateEmployeeTerritory(employeeId, territoryId);

@@ -19,11 +19,11 @@ public void ShouldAddTerritoryToEmployee()
}

[TestMethod]
public void ShouldReturnTerritoriesForEmployee()
public async Task ShouldReturnTerritoriesForEmployee()
{
var employeeId = DataHelper.CreateEmployee().EmployeeId;
var territoryId1 = DataHelper.CreateTerritory().TerritoryId;
var territoryId2 = DataHelper.CreateTerritory().TerritoryId;
var employeeId = (await DataHelper.CreateEmployee()).EmployeeId;
var territoryId1 = (await DataHelper.CreateTerritory()).TerritoryId;
var territoryId2 = (await DataHelper.CreateTerritory()).TerritoryId;

DataHelper.CreateEmployeeTerritory(employeeId, territoryId1);
DataHelper.CreateEmployeeTerritory(employeeId, territoryId2);
@@ -37,11 +37,11 @@ public void ShouldReturnTerritoriesForEmployee()
}

[TestMethod]
public void ShouldReturnEmployeesForTerritory()
public async Task ShouldReturnEmployeesForTerritory()
{
var territoryId = DataHelper.CreateTerritory().TerritoryId;
var employeeId1 = DataHelper.CreateEmployee().EmployeeId;
var employeeId2 = DataHelper.CreateEmployee().EmployeeId;
var territoryId = (await DataHelper.CreateTerritory()).TerritoryId;
var employeeId1 = (await DataHelper.CreateEmployee()).EmployeeId;
var employeeId2 = (await DataHelper.CreateEmployee()).EmployeeId;

DataHelper.CreateEmployeeTerritory(employeeId1, territoryId);
DataHelper.CreateEmployeeTerritory(employeeId2, territoryId);
Loading