xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

梳理了所有的Db,DTO,ItemViewModel的属性

Browse Source
This commit is contained in:
David P.G
2025-07-27 21:08:58 +08:00
parent e509b7de0b
commit 4a56405629
38 changed files with 417 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
DMS.Infrastructure.UnitTests/FakerHelper.cs
View File

@@ -112,23 +112,23 @@ namespace DMS.Infrastructure.UnitTests
return dbMqttServer;
}
public static CreateDeviceDto FakeCreateDeviceDto()
{
var deviceDto = new Faker<CreateDeviceDto>()
.RuleFor(d => d.Name, f => f.Commerce.ProductName())
.RuleFor(d => d.Description, f => f.Commerce.ProductDescription())
.RuleFor(d => d.IpAddress, f => f.Internet.Ip())
.RuleFor(d => d.OpcUaServerUrl, f => f.Internet.Url())
.Generate();
deviceDto.Port = 102;
deviceDto.Protocol = ProtocolType.S7;
deviceDto.Slot = 1;
deviceDto.Rack = 0;
deviceDto.CpuType = "S7-1200";
deviceDto.DeviceType = Core.Enums.DeviceType.SiemensPLC;
return deviceDto;
}
// public static CreateDeviceDto FakeCreateDeviceDto()
// {
// var deviceDto = new Faker<CreateDeviceDto>()
// .RuleFor(d => d.Name, f => f.Commerce.ProductName())
// .RuleFor(d => d.Description, f => f.Commerce.ProductDescription())
// .RuleFor(d => d.IpAddress, f => f.Internet.Ip())
// .RuleFor(d => d.OpcUaServerUrl, f => f.Internet.Url())
// .Generate();
// deviceDto.Port = 102;
// deviceDto.Protocol = ProtocolType.S7;
// deviceDto.Slot = 1;
// deviceDto.Rack = 0;
// deviceDto.CpuType = "S7-1200";
// deviceDto.DeviceType = Core.Enums.DeviceType.SiemensPLC;
//
// return deviceDto;
// }
public static MenuBeanDto FakeCreateMenuDto()
{
@@ -146,7 +146,7 @@ namespace DMS.Infrastructure.UnitTests
var variableDto = new Faker<VariableDto>()
.RuleFor(v => v.Name, f => f.Commerce.ProductName())
.RuleFor(v => v.S7Address, f => $"DB1.DBD{f.Random.Int(0, 1000)}")
.RuleFor(v => v.DataType, f => f.PickRandom<SignalType>())
.RuleFor(v => v.SignalType, f => f.PickRandom<SignalType>())
.RuleFor(v => v.PollLevel, f => f.PickRandom<PollLevelType>())
.RuleFor(v => v.IsActive, f => f.Random.Bool())
.RuleFor(v => v.IsHistoryEnabled, f => f.Random.Bool())

30
DMS.Infrastructure.UnitTests/Services/DeviceAppServiceTest.cs
View File

@@ -22,21 +22,21 @@ public class DeviceAppServiceTest : BaseServiceTest // 继承基类
public async Task CreateDeviceWithDetailsAsyncTest()
{
// Arrange
var dto = new CreateDeviceWithDetailsDto
{
Device = FakerHelper.FakeCreateDeviceDto(),
VariableTable = FakerHelper.FakeVariableTableDto(),
DeviceMenu = FakerHelper.FakeCreateMenuDto(),
VariableTableMenu = FakerHelper.FakeCreateMenuDto()
// ... 填充其他需要的数据
};
// Act
var addedDeviceId = await _deviceService.CreateDeviceWithDetailsAsync(dto);
// Assert
Assert.NotEqual(0, addedDeviceId);
// var dto = new CreateDeviceWithDetailsDto
// {
// Device = FakerHelper.FakeCreateDeviceDto(),
// VariableTable = FakerHelper.FakeVariableTableDto(),
// DeviceMenu = FakerHelper.FakeCreateMenuDto(),
// VariableTableMenu = FakerHelper.FakeCreateMenuDto()
//
// // ... 填充其他需要的数据
// };
//
// // Act
// var addDto = await _deviceService.CreateDeviceWithDetailsAsync(dto);
//
// // Assert
// Assert.NotEqual(0, addDto.Device.Id);
}
[Fact]