SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-07-09 02:16:55 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Flatten Condition out of existence

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-09 21:13:55 -04:00
parent 2a700dee9c
commit 770f6f75d5
26 changed files with 548 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs
View File

@@ -346,7 +346,10 @@ namespace SabreTools.Metadata.DatFiles.Test
{
return new Data.Models.Metadata.Adjuster
{
Condition = CreateMetadataCondition(),
ConditionValue = "value",
ConditionMask = "mask",
ConditionRelation = Data.Models.Metadata.Relation.Equal,
ConditionTag = "tag",
Default = true,
Name = "name",
};
@@ -427,7 +430,10 @@ namespace SabreTools.Metadata.DatFiles.Test
{
return new Data.Models.Metadata.Configuration
{
Condition = CreateMetadataCondition(),
ConditionValue = "value",
ConditionMask = "mask",
ConditionRelation = Data.Models.Metadata.Relation.Equal,
ConditionTag = "tag",
ConfLocation = [CreateMetadataConfLocation()],
ConfSetting = [CreateMetadataConfSetting()],
Mask = "mask",
@@ -436,17 +442,6 @@ namespace SabreTools.Metadata.DatFiles.Test
};
}
private static Data.Models.Metadata.Condition CreateMetadataCondition()
{
return new Data.Models.Metadata.Condition
{
Value = "value",
Mask = "mask",
Relation = Data.Models.Metadata.Relation.Equal,
Tag = "tag",
};
}
private static Data.Models.Metadata.ConfLocation CreateMetadataConfLocation()
{
return new Data.Models.Metadata.ConfLocation
@@ -461,7 +456,10 @@ namespace SabreTools.Metadata.DatFiles.Test
{
return new Data.Models.Metadata.ConfSetting
{
Condition = CreateMetadataCondition(),
ConditionValue = "value",
ConditionMask = "mask",
ConditionRelation = Data.Models.Metadata.Relation.Equal,
ConditionTag = "tag",
Default = true,
Name = "name",
Value = "value",
@@ -523,7 +521,10 @@ namespace SabreTools.Metadata.DatFiles.Test
{
return new Data.Models.Metadata.DipSwitch
{
Condition = CreateMetadataCondition(),
ConditionValue = "value",
ConditionMask = "mask",
ConditionRelation = Data.Models.Metadata.Relation.Equal,
ConditionTag = "tag",
Default = true,
DipLocation = [CreateMetadataDipLocation()],
DipValue = [CreateMetadataDipValue()],
@@ -538,7 +539,10 @@ namespace SabreTools.Metadata.DatFiles.Test
{
return new Data.Models.Metadata.DipValue
{
Condition = CreateMetadataCondition(),
ConditionValue = "value",
ConditionMask = "mask",
ConditionRelation = Data.Models.Metadata.Relation.Equal,
ConditionTag = "tag",
Default = true,
Name = "name",
Value = "value",
@@ -1132,10 +1136,12 @@ namespace SabreTools.Metadata.DatFiles.Test
private static void ValidateAdjuster(Adjuster? adjuster)
{
Assert.NotNull(adjuster);
Assert.Equal("value", adjuster.ConditionValue);
Assert.Equal("mask", adjuster.ConditionMask);
Assert.Equal(Data.Models.Metadata.Relation.Equal, adjuster.ConditionRelation);
Assert.Equal("tag", adjuster.ConditionTag);
Assert.True(adjuster.Default);
Assert.Equal("name", adjuster.Name);
ValidateCondition(adjuster.Condition);
}
private static void ValidateAnalog(Analog? analog)
@@ -1169,24 +1175,17 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal(Data.Models.Metadata.ChipType.CPU, chip.ChipType);
}
private static void ValidateCondition(Condition? condition)
{
Assert.NotNull(condition);
Assert.Equal("value", condition.Value);
Assert.Equal("mask", condition.Mask);
Assert.Equal(Data.Models.Metadata.Relation.Equal, condition.Relation);
Assert.Equal("tag", condition.Tag);
}
private static void ValidateConfiguration(Configuration? configuration)
{
Assert.NotNull(configuration);
Assert.Equal("value", configuration.ConditionValue);
Assert.Equal("mask", configuration.ConditionMask);
Assert.Equal(Data.Models.Metadata.Relation.Equal, configuration.ConditionRelation);
Assert.Equal("tag", configuration.ConditionTag);
Assert.Equal("mask", configuration.Mask);
Assert.Equal("name", configuration.Name);
Assert.Equal("tag", configuration.Tag);
ValidateCondition(configuration.Condition);
ConfLocation[]? confLocations = configuration.ConfLocation;
Assert.NotNull(confLocations);
ConfLocation? confLocation = Assert.Single(confLocations);
@@ -1209,11 +1208,13 @@ namespace SabreTools.Metadata.DatFiles.Test
private static void ValidateConfSetting(ConfSetting? confSetting)
{
Assert.NotNull(confSetting);
Assert.Equal("value", confSetting.ConditionValue);
Assert.Equal("mask", confSetting.ConditionMask);
Assert.Equal(Data.Models.Metadata.Relation.Equal, confSetting.ConditionRelation);
Assert.Equal("tag", confSetting.ConditionTag);
Assert.True(confSetting.Default);
Assert.Equal("name", confSetting.Name);
Assert.Equal("value", confSetting.Value);
ValidateCondition(confSetting.Condition);
}
private static void ValidateControl(Control? control)
@@ -1276,13 +1277,15 @@ namespace SabreTools.Metadata.DatFiles.Test
private static void ValidateDipSwitch(DipSwitch? dipSwitch)
{
Assert.NotNull(dipSwitch);
Assert.Equal("value", dipSwitch.ConditionValue);
Assert.Equal("mask", dipSwitch.ConditionMask);
Assert.Equal(Data.Models.Metadata.Relation.Equal, dipSwitch.ConditionRelation);
Assert.Equal("tag", dipSwitch.ConditionTag);
Assert.True(dipSwitch.Default);
Assert.Equal("mask", dipSwitch.Mask);
Assert.Equal("name", dipSwitch.Name);
Assert.Equal("tag", dipSwitch.Tag);
ValidateCondition(dipSwitch.Condition);
DipLocation[]? dipLocations = dipSwitch.DipLocation;
Assert.NotNull(dipLocations);
DipLocation? dipLocation = Assert.Single(dipLocations);
@@ -1302,11 +1305,13 @@ namespace SabreTools.Metadata.DatFiles.Test
private static void ValidateDipValue(DipValue? dipValue)
{
Assert.NotNull(dipValue);
Assert.Equal("value", dipValue.ConditionValue);
Assert.Equal("mask", dipValue.ConditionMask);
Assert.Equal(Data.Models.Metadata.Relation.Equal, dipValue.ConditionRelation);
Assert.Equal("tag", dipValue.ConditionTag);
Assert.True(dipValue.Default);
Assert.Equal("name", dipValue.Name);
Assert.Equal("value", dipValue.Value);
ValidateCondition(dipValue.Condition);
}
private static void ValidateDisk(Disk? disk)

40
SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs
View File

@@ -612,11 +612,12 @@ namespace SabreTools.Metadata.DatFiles.Test
private static void ValidateMetadataAdjuster(Data.Models.Metadata.Adjuster? adjuster)
{
Assert.NotNull(adjuster);
Assert.Equal("value", adjuster.ConditionValue);
Assert.Equal("mask", adjuster.ConditionMask);
Assert.Equal(Data.Models.Metadata.Relation.Equal, adjuster.ConditionRelation);
Assert.Equal("tag", adjuster.ConditionTag);
Assert.True(adjuster.Default);
Assert.Equal("name", adjuster.Name);
Data.Models.Metadata.Condition? condition = adjuster.Condition;
ValidateMetadataCondition(condition);
}
private static void ValidateMetadataAnalog(Data.Models.Metadata.Analog? analog)
@@ -682,24 +683,17 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal(Data.Models.Metadata.ChipType.CPU, chip.ChipType);
}
private static void ValidateMetadataCondition(Data.Models.Metadata.Condition? condition)
{
Assert.NotNull(condition);
Assert.Equal("value", condition.Value);
Assert.Equal("mask", condition.Mask);
Assert.Equal(Data.Models.Metadata.Relation.Equal, condition.Relation);
Assert.Equal("tag", condition.Tag);
}
private static void ValidateMetadataConfiguration(Data.Models.Metadata.Configuration? configuration)
{
Assert.NotNull(configuration);
Assert.Equal("value", configuration.ConditionValue);
Assert.Equal("mask", configuration.ConditionMask);
Assert.Equal(Data.Models.Metadata.Relation.Equal, configuration.ConditionRelation);
Assert.Equal("tag", configuration.ConditionTag);
Assert.Equal("mask", configuration.Mask);
Assert.Equal("name", configuration.Name);
Assert.Equal("tag", configuration.Tag);
ValidateMetadataCondition(configuration.Condition);
Data.Models.Metadata.ConfLocation[]? confLocations = configuration.ConfLocation;
Assert.NotNull(confLocations);
Data.Models.Metadata.ConfLocation? confLocation = Assert.Single(confLocations);
@@ -722,11 +716,13 @@ namespace SabreTools.Metadata.DatFiles.Test
private static void ValidateMetadataConfSetting(Data.Models.Metadata.ConfSetting? confSetting)
{
Assert.NotNull(confSetting);
Assert.Equal("value", confSetting.ConditionValue);
Assert.Equal("mask", confSetting.ConditionMask);
Assert.Equal(Data.Models.Metadata.Relation.Equal, confSetting.ConditionRelation);
Assert.Equal("tag", confSetting.ConditionTag);
Assert.True(confSetting.Default);
Assert.Equal("name", confSetting.Name);
Assert.Equal("value", confSetting.Value);
ValidateMetadataCondition(confSetting.Condition);
}
private static void ValidateMetadataControl(Data.Models.Metadata.Control? control)
@@ -794,13 +790,15 @@ namespace SabreTools.Metadata.DatFiles.Test
private static void ValidateMetadataDipSwitch(Data.Models.Metadata.DipSwitch? dipSwitch)
{
Assert.NotNull(dipSwitch);
Assert.Equal("value", dipSwitch.ConditionValue);
Assert.Equal("mask", dipSwitch.ConditionMask);
Assert.Equal(Data.Models.Metadata.Relation.Equal, dipSwitch.ConditionRelation);
Assert.Equal("tag", dipSwitch.ConditionTag);
Assert.True(dipSwitch.Default);
Assert.Equal("mask", dipSwitch.Mask);
Assert.Equal("name", dipSwitch.Name);
Assert.Equal("tag", dipSwitch.Tag);
ValidateMetadataCondition(dipSwitch.Condition);
Data.Models.Metadata.DipLocation[]? dipLocations = dipSwitch.DipLocation;
Assert.NotNull(dipLocations);
Data.Models.Metadata.DipLocation? dipLocation = Assert.Single(dipLocations);
@@ -820,11 +818,13 @@ namespace SabreTools.Metadata.DatFiles.Test
private static void ValidateMetadataDipValue(Data.Models.Metadata.DipValue? dipValue)
{
Assert.NotNull(dipValue);
Assert.Equal("value", dipValue.ConditionValue);
Assert.Equal("mask", dipValue.ConditionMask);
Assert.Equal(Data.Models.Metadata.Relation.Equal, dipValue.ConditionRelation);
Assert.Equal("tag", dipValue.ConditionTag);
Assert.True(dipValue.Default);
Assert.Equal("name", dipValue.Name);
Assert.Equal("value", dipValue.Value);
ValidateMetadataCondition(dipValue.Condition);
}
private static void ValidateMetadataDisk(Data.Models.Metadata.Disk? disk)

1
SabreTools.Metadata.DatFiles.Test/FormatsTests.cs
View File

@@ -760,7 +760,6 @@ namespace SabreTools.Metadata.DatFiles.Test
Data.Models.Metadata.ItemType.Adjuster,
Data.Models.Metadata.ItemType.BiosSet,
Data.Models.Metadata.ItemType.Chip,
Data.Models.Metadata.ItemType.Condition,
Data.Models.Metadata.ItemType.Configuration,
Data.Models.Metadata.ItemType.Device,
Data.Models.Metadata.ItemType.DeviceRef,