on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

CS2-27: Fixed ClusterService unit tests

Browse Source
This commit is contained in:
Харченко Владимир 2022-01-31 16:13:27 +05:00
parent eaf7cb85b2
commit 87d7563ed3
4 changed files with 87 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsbCloudDb/Model/AsbCloudDbContext.cs
View File

@ -10,6 +10,7 @@ namespace AsbCloudDb.Model
{
public virtual DbSet<Cluster> Clusters { get; set; }
public virtual DbSet<Company> Companies { get; set; }
public virtual DbSet<CompanyType> CompaniesTypes { get; set; }
public virtual DbSet<Deposit> Deposits { get; set; }
public virtual DbSet<FileCategory> FileCategories { get; set; }
public virtual DbSet<FileInfo> Files { get; set; }
@ -35,8 +36,9 @@ namespace AsbCloudDb.Model
public virtual DbSet<WellType> WellTypes { get; set; }
public virtual DbSet<DrillParams> DrillParams { get; set; }
public virtual DbSet<DrillFlowChart> DrillFlowChart { get; set; }
public virtual DbSet<RelationUserUserRole> RelationUserUserRoles { get; set; }
public virtual DbSet<Permission> Permissions { get; set; }
public virtual DbSet<RelationCompanyWell> RelationCompaniesWells { get; set; }
public virtual DbSet<RelationUserUserRole> RelationUserUserRoles { get; set; }
public virtual DbSet<RelationUserRolePermission> RelationUserRolePermissions { get; set; }
public virtual DbSet<RelationUserRoleUserRole> RelationUserRoleUserRoles { get; set; }

32
AsbCloudInfrastructure/Validators/DependencyInjection.cs
View File

@ -9,22 +9,22 @@ namespace AsbCloudInfrastructure.Validators
{
public static IServiceCollection AddValidators(this IServiceCollection services)
{
services.AddTransient<IValidator<AuthDto>, AuthDtoValidator>();
services.AddTransient<IValidator<ClusterDto>, ClusterDtoValidator>();
services.AddTransient<IValidator<CompanyDto>, CompanyDtoValidator>();
services.AddTransient<IValidator<DepositDto>, DepositDtoValidator>();
services.AddTransient<IValidator<DrillFlowChartDto>, DrillFlowChartDtoValidator>();
services.AddTransient<IValidator<EventDto>, EventDtoValidator>();
services.AddTransient<IValidator<FileInfoDto>, FileInfoDtoValidator>();
services.AddTransient<IValidator<FileMarkDto>, FileMarkDtoValidator>();
services.AddTransient<IValidator<MeasureDto>, MeasureDtoValidator>();
services.AddTransient<IValidator<MessageDto>, MessageDtoValidator>();
services.AddTransient<IValidator<PermissionDto>, PermissionDtoValidator>();
services.AddTransient<IValidator<ReportPropertiesDto>, ReportPropertiesDtoValidator>();
services.AddTransient<IValidator<UserRegistrationDto>, UserRegistrationDtoValidator>();
services.AddTransient<IValidator<UserRoleDto>, UserRoleDtoValidator>();
services.AddTransient<IValidator<WellDto>, WellDtoValidator>();
services.AddTransient<IValidator<WellOperationDto>, WellOperationDtoValidator>();
// services.AddTransient<IValidator<AuthDto>, AuthDtoValidator>();
// services.AddTransient<IValidator<ClusterDto>, ClusterDtoValidator>();
// services.AddTransient<IValidator<CompanyDto>, CompanyDtoValidator>();
// services.AddTransient<IValidator<DepositDto>, DepositDtoValidator>();
// services.AddTransient<IValidator<DrillFlowChartDto>, DrillFlowChartDtoValidator>();
// services.AddTransient<IValidator<EventDto>, EventDtoValidator>();
// services.AddTransient<IValidator<FileInfoDto>, FileInfoDtoValidator>();
// services.AddTransient<IValidator<FileMarkDto>, FileMarkDtoValidator>();
// services.AddTransient<IValidator<MeasureDto>, MeasureDtoValidator>();
// services.AddTransient<IValidator<MessageDto>, MessageDtoValidator>();
// services.AddTransient<IValidator<PermissionDto>, PermissionDtoValidator>();
// services.AddTransient<IValidator<ReportPropertiesDto>, ReportPropertiesDtoValidator>();
// services.AddTransient<IValidator<UserRegistrationDto>, UserRegistrationDtoValidator>();
// services.AddTransient<IValidator<UserRoleDto>, UserRoleDtoValidator>();
// services.AddTransient<IValidator<WellDto>, WellDtoValidator>();
// services.AddTransient<IValidator<WellOperationDto>, WellOperationDtoValidator>();
return services;
}

107
AsbCloudWebApi.Tests/ServicesTests/ClusterServiceTest.cs
View File

@ -13,80 +13,96 @@ public class ClusterServiceTest
{
private readonly AsbCloudDbContext context;
private readonly Mock<IWellService> wellService;
private readonly List<Deposit> deposits = new()
{
new Deposit { Id = 1, Caption = "Test deposit 1" },
new Deposit { Id = 2, Caption = "Test deposit 2" },
new Deposit { Id = 3, Caption = "Test deposit 3" },
new Deposit { Id = 4, Caption = "Test deposit 4" },
new Deposit { Id = 4, Caption = "Test deposit 4" }
};
private readonly List<Cluster> clusters = new()
{
new Cluster { Id = 1, IdDeposit = 1 },
new Cluster { Id = 2, IdDeposit = 1 },
new Cluster { Id = 3, IdDeposit = 2 },
new Cluster { Id = 4, IdDeposit = 2 },
new Cluster { Id = 1, Caption = "Test cluster 1", IdDeposit = 1, Timezone = new SimpleTimezone()},
new Cluster { Id = 2, Caption = "Test cluster 2", IdDeposit = 1, Timezone = new SimpleTimezone() },
new Cluster { Id = 3, Caption = "Test cluster 3", IdDeposit = 2, Timezone = new SimpleTimezone() },
new Cluster { Id = 4, Caption = "Test cluster 4", IdDeposit = 2, Timezone = new SimpleTimezone() }
};
private readonly List<Well> wells = new()
{
new Well { Id = 1, IdCluster = 1 },
new Well { Id = 2, IdCluster = 1 },
new Well { Id = 3, IdCluster = 2 },
new Well { Id = 4, IdCluster = 2 },
new Well { Id = 1, Caption = "Test well 1", IdCluster = 1 },
new Well { Id = 2, Caption = "Test well 2", IdCluster = 2 },
new Well { Id = 3, Caption = "Test well 3", IdCluster = 1 },
new Well { Id = 4, Caption = "Test well 4", IdCluster = 2 }
};
private readonly List<CompanyType> companiesTypes = new()
{
new CompanyType { Id = 1, Caption = "test company type"}
};
private readonly List<Company> companies = new()
{
new Company { Id = 1 },
new Company { Id = 2 }
new Company { Id = 1, Caption = "Test company 1", IdCompanyType = 1},
new Company { Id = 2, Caption = "Test company 2", IdCompanyType = 1}
};
private readonly List<RelationCompanyWell> relations = new()
{
new RelationCompanyWell { IdCompany = 1, IdWell = 1 },
new RelationCompanyWell { IdCompany = 1, IdWell = 2 }
new RelationCompanyWell { IdCompany = 1, IdWell = 2 },
new RelationCompanyWell { IdCompany = 2, IdWell = 2 }
};
private readonly List<WellSectionType> wellSectionTypes = new()
{
new WellSectionType { Id = 1, Caption = "Test well section type 1" }
};
private readonly List<DrillParams> drillParams = new()
{
new DrillParams {Id = 1, IdWell = 1, IdWellSectionType = 1},
new DrillParams {Id = 2, IdWell = 2, IdWellSectionType = 1}
};
public ClusterServiceTest()
{
context = TestHelpter.MakeTestContext();
wellService = new Mock<IWellService>();
context.Deposits.RemoveRange(deposits);
context.Clusters.RemoveRange(clusters);
context.Wells.RemoveRange(wells);
context.Companies.RemoveRange(companies);
context.RemoveRange(relations);
context.SaveChanges();
context.Deposits.RemoveRange(context.Deposits);
context.Clusters.RemoveRange(context.Clusters);
context.Wells.RemoveRange(context.Wells);
context.CompaniesTypes.RemoveRange(context.CompaniesTypes);
context.Companies.RemoveRange(context.Companies);
context.RelationCompaniesWells.RemoveRange(context.RelationCompaniesWells);
context.WellSectionTypes.RemoveRange(context.WellSectionTypes);
context.DrillParams.RemoveRange(context.DrillParams);
if(context.ChangeTracker.HasChanges())
context.SaveChanges();
context.Deposits.AddRange(deposits);
context.Clusters.AddRange(clusters);
context.Wells.AddRange(wells);
context.CompaniesTypes.AddRange(companiesTypes);
context.Companies.AddRange(companies);
context.AddRange(relations);
context.RelationCompaniesWells.AddRange(relations);
context.WellSectionTypes.AddRange(wellSectionTypes);
context.DrillParams.AddRange(drillParams);
context.SaveChanges();
}
~ClusterServiceTest()
{
context.Deposits.RemoveRange(context.Deposits.Where(u => u.Id > 1));
context.Clusters.RemoveRange(context.Clusters.Where(u => u.Id > 1));
context.Wells.RemoveRange(context.Wells.Where(u => u.Id > 1));
context.Companies.RemoveRange(context.Companies.Where(u => u.Id > 1));
context.RemoveRange(relations);
context.Deposits.RemoveRange(context.Deposits);
context.Clusters.RemoveRange(context.Clusters);
context.Wells.RemoveRange(context.Wells);
context.CompaniesTypes.RemoveRange(context.CompaniesTypes);
context.Companies.RemoveRange(context.Companies);
context.RelationCompaniesWells.RemoveRange(context.RelationCompaniesWells);
context.SaveChanges();
}
[Fact]
public async Task GetDepositsAsync_returns_depositDtos()
{
var service = new ClusterService(context, wellService.Object);
var dtos = await service.GetDepositsAsync(1);
Assert.True(dtos.Any());
}
[Fact]
public async Task GetDepositsAsync_returns_one_deposit()
{
@ -97,7 +113,7 @@ public class ClusterServiceTest
}
[Fact]
public async Task GetDepositsAsync_returns_one_deposit_with_two_companies()
public async Task GetDepositsAsync_returns_one_deposit_with_two_clusters()
{
var service = new ClusterService(context, wellService.Object);
var dtos = await service.GetDepositsAsync(1);
@ -123,7 +139,7 @@ public class ClusterServiceTest
}
[Fact]
public async Task GetDrillParamsAsync_returns_one_deposit_with_two_companies()
public async Task GetDrillParamsAsync_returns_one_deposit_with_two_clusters()
{
var service = new ClusterService(context, wellService.Object);
var dtos = await service.GetDepositsDrillParamsAsync(1);
@ -132,20 +148,31 @@ public class ClusterServiceTest
}
[Fact]
public async Task GetClustersAsync_returns_dtos()
public async Task GetClustersAsync_returns_two_dtos()
{
var service = new ClusterService(context, wellService.Object);
var dtos = await service.GetClustersAsync(1);
Assert.True(dtos.Any());
Assert.Equal(2, dtos.Count());
}
[Fact]
public async Task GetClustersAsync_returns_one_cluster()
public async Task GetClustersAsync_with_deposit_returns_two_clusters()
{
var service = new ClusterService(context, wellService.Object);
var dtos = await service.GetClustersAsync(1);
var dtos = await service.GetClustersAsync(1,1);
Assert.Equal(2, dtos.Count());
}
[Fact]
public async Task GetWellsAsync_returns_one_well_by_cluster_and_company()
{
var service = new ClusterService(context, wellService.Object);
var dtos = await service.GetWellsAsync(1,1);
Assert.Equal(1, dtos.Count());
}
}

1
AsbCloudWebApi.Tests/TestHelpter.cs
View File

@ -16,6 +16,7 @@ namespace AsbCloudWebApi.Tests
.UseNpgsql("Host=localhost;Database=tests;Username=postgres;Password=q;Persist Security Info=True;Include Error Detail=True")
.Options;
var context = new AsbCloudDbContext(options);
context.Database.Migrate();
return context;
}
}