diff --git a/SabreTools.Data.Extensions/MetadataExtensions.cs b/SabreTools.Data.Extensions/MetadataExtensions.cs index 794373df..175b3b99 100644 --- a/SabreTools.Data.Extensions/MetadataExtensions.cs +++ b/SabreTools.Data.Extensions/MetadataExtensions.cs @@ -151,18 +151,36 @@ namespace SabreTools.Data.Extensions { cloneAdjuster.Default = selfAdjuster.Default; } + else if (self is Analog selfAnalog && clone is Analog cloneAnalog) + { + cloneAnalog.Mask = selfAnalog.Mask; + } + else if (self is Archive selfArchive && clone is Archive cloneArchive) + { + cloneArchive.Description = selfArchive.Description; + } else if (self is BiosSet selfBiosSet && clone is BiosSet cloneBiosSet) { cloneBiosSet.Default = selfBiosSet.Default; + cloneBiosSet.Description = selfBiosSet.Description; } else if (self is Chip selfChip && clone is Chip cloneChip) { cloneChip.ChipType = selfChip.ChipType; cloneChip.SoundOnly = selfChip.SoundOnly; + cloneChip.Tag = selfChip.Tag; } else if (self is Condition selfCondition && clone is Condition cloneCondition) { + cloneCondition.Mask = selfCondition.Mask; cloneCondition.Relation = selfCondition.Relation; + cloneCondition.Tag = selfCondition.Tag; + cloneCondition.Value = selfCondition.Value; + } + else if (self is Configuration selfConfiguration && clone is Configuration cloneConfiguration) + { + cloneConfiguration.Mask = selfConfiguration.Mask; + cloneConfiguration.Tag = selfConfiguration.Tag; } else if (self is ConfLocation selfConfLocation && clone is ConfLocation cloneConfLocation) { @@ -171,6 +189,7 @@ namespace SabreTools.Data.Extensions else if (self is ConfSetting selfConfSetting && clone is ConfSetting cloneConfSetting) { cloneConfSetting.Default = selfConfSetting.Default; + cloneConfSetting.Value = selfConfSetting.Value; } else if (self is Control selfControl && clone is Control cloneControl) { @@ -185,6 +204,7 @@ namespace SabreTools.Data.Extensions { cloneDevice.DeviceType = selfDevice.DeviceType; cloneDevice.Mandatory = selfDevice.Mandatory; + cloneDevice.Tag = selfDevice.Tag; } else if (self is DipLocation selfDipLocation && clone is DipLocation cloneDipLocation) { @@ -193,10 +213,13 @@ namespace SabreTools.Data.Extensions else if (self is DipSwitch selfDipSwitch && clone is DipSwitch cloneDipSwitch) { cloneDipSwitch.Default = selfDipSwitch.Default; + cloneDipSwitch.Mask = selfDipSwitch.Mask; + cloneDipSwitch.Tag = selfDipSwitch.Tag; } else if (self is DipValue selfDipValue && clone is DipValue cloneDipValue) { cloneDipValue.Default = selfDipValue.Default; + cloneDipValue.Value = selfDipValue.Value; } else if (self is Disk selfDisk && clone is Disk cloneDisk) { @@ -208,6 +231,7 @@ namespace SabreTools.Data.Extensions { cloneDisplay.DisplayType = selfDisplay.DisplayType; cloneDisplay.FlipX = selfDisplay.FlipX; + cloneDisplay.Tag = selfDisplay.Tag; } else if (self is Driver selfDriver && clone is Driver cloneDriver) { @@ -228,11 +252,13 @@ namespace SabreTools.Data.Extensions cloneFeature.FeatureType = selfFeature.FeatureType; cloneFeature.Overall = selfFeature.Overall; cloneFeature.Status = selfFeature.Status; + cloneFeature.Value = selfFeature.Value; } else if (self is Header selfHeader && clone is Header cloneHeader) { cloneHeader.BiosMode = selfHeader.BiosMode; cloneHeader.Debug = selfHeader.Debug; + cloneHeader.Description = selfHeader.Description; cloneHeader.ForceMerging = selfHeader.ForceMerging; cloneHeader.ForceNodump = selfHeader.ForceNodump; cloneHeader.ForcePacking = selfHeader.ForcePacking; @@ -243,6 +269,10 @@ namespace SabreTools.Data.Extensions cloneHeader.RomMode = selfHeader.RomMode; cloneHeader.SampleMode = selfHeader.SampleMode; } + else if (self is Info selfInfo && clone is Info cloneInfo) + { + cloneInfo.Value = selfInfo.Value; + } else if (self is Input selfInput && clone is Input cloneInput) { cloneInput.Service = selfInput.Service; @@ -250,12 +280,17 @@ namespace SabreTools.Data.Extensions } else if (self is Machine selfMachine && clone is Machine cloneMachine) { + cloneMachine.Description = selfMachine.Description; cloneMachine.IsBios = selfMachine.IsBios; cloneMachine.IsDevice = selfMachine.IsDevice; cloneMachine.IsMechanical = selfMachine.IsMechanical; cloneMachine.Runnable = selfMachine.Runnable; cloneMachine.Supported = selfMachine.Supported; } + else if (self is Port selfPort && clone is Port clonePort) + { + clonePort.Tag = selfPort.Tag; + } else if (self is RamOption selfRamOption && clone is RamOption cloneRamOption) { cloneRamOption.Default = selfRamOption.Default; @@ -275,6 +310,11 @@ namespace SabreTools.Data.Extensions cloneRom.Optional = selfRom.Optional; cloneRom.SoundOnly = selfRom.SoundOnly; cloneRom.Status = selfRom.Status; + cloneRom.Value = selfRom.Value; + } + else if (self is SharedFeat selfSharedFeat && clone is SharedFeat cloneSharedFeat) + { + cloneSharedFeat.Value = selfSharedFeat.Value; } else if (self is SlotOption selfSlotOption && clone is SlotOption cloneSlotOption) { @@ -282,11 +322,14 @@ namespace SabreTools.Data.Extensions } else if (self is Software selfSoftware && clone is Software cloneSoftware) { + cloneSoftware.Description = selfSoftware.Description; cloneSoftware.Supported = selfSoftware.Supported; } else if (self is SoftwareList selfSoftwareList && clone is SoftwareList cloneSoftwareList) { + cloneSoftwareList.Description = selfSoftwareList.Description; cloneSoftwareList.Status = selfSoftwareList.Status; + cloneSoftwareList.Tag = selfSoftwareList.Tag; } else if (self is Video selfVideo && clone is Video cloneVideo) { diff --git a/SabreTools.Data.Models/Metadata/Analog.cs b/SabreTools.Data.Models/Metadata/Analog.cs index 273d159e..4b274e21 100644 --- a/SabreTools.Data.Models/Metadata/Analog.cs +++ b/SabreTools.Data.Models/Metadata/Analog.cs @@ -6,10 +6,9 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("analog"), XmlRoot("analog")] public class Analog : DatItem { - #region Keys + #region Properties - /// string - public const string MaskKey = "mask"; + public string? Mask { get; set; } #endregion diff --git a/SabreTools.Data.Models/Metadata/Archive.cs b/SabreTools.Data.Models/Metadata/Archive.cs index 7217d9ba..35277983 100644 --- a/SabreTools.Data.Models/Metadata/Archive.cs +++ b/SabreTools.Data.Models/Metadata/Archive.cs @@ -8,6 +8,9 @@ namespace SabreTools.Data.Models.Metadata { #region Properties + /// No-Intro DB extension + public string? Description { get; set; } + public string? Name { get; set; } #endregion @@ -71,9 +74,6 @@ namespace SabreTools.Data.Models.Metadata /// string, No-Intro DB extension public const string GameId2Key = "gameid2"; - /// string, No-Intro DB extension - public const string DescriptionKey = "description"; - /// byte, No-Intro DB extension public const string BiosKey = "bios"; diff --git a/SabreTools.Data.Models/Metadata/BiosSet.cs b/SabreTools.Data.Models/Metadata/BiosSet.cs index d7187d2b..ecd1104f 100644 --- a/SabreTools.Data.Models/Metadata/BiosSet.cs +++ b/SabreTools.Data.Models/Metadata/BiosSet.cs @@ -11,17 +11,12 @@ namespace SabreTools.Data.Models.Metadata /// (yes|no) "no" public bool? Default { get; set; } + public string? Description { get; set; } + public string? Name { get; set; } #endregion - #region Keys - - /// string - public const string DescriptionKey = "description"; - - #endregion - public BiosSet() => ItemType = ItemType.BiosSet; } } diff --git a/SabreTools.Data.Models/Metadata/Chip.cs b/SabreTools.Data.Models/Metadata/Chip.cs index 155ed6d3..89f851c2 100644 --- a/SabreTools.Data.Models/Metadata/Chip.cs +++ b/SabreTools.Data.Models/Metadata/Chip.cs @@ -16,6 +16,8 @@ namespace SabreTools.Data.Models.Metadata /// (yes|no) "no" public bool? SoundOnly { get; set; } + public string? Tag { get; set; } + #endregion #region Keys @@ -26,9 +28,6 @@ namespace SabreTools.Data.Models.Metadata /// string public const string FlagsKey = "flags"; - /// string - public const string TagKey = "tag"; - #endregion public Chip() => ItemType = ItemType.Chip; diff --git a/SabreTools.Data.Models/Metadata/Condition.cs b/SabreTools.Data.Models/Metadata/Condition.cs index 8875796b..22cede77 100644 --- a/SabreTools.Data.Models/Metadata/Condition.cs +++ b/SabreTools.Data.Models/Metadata/Condition.cs @@ -8,21 +8,14 @@ namespace SabreTools.Data.Models.Metadata { #region Properties + public string? Mask { get; set; } + /// (eq|ne|gt|le|lt|ge) public Relation? Relation { get; set; } - #endregion + public string? Tag { get; set; } - #region Keys - - /// string - public const string ValueKey = "clock"; - - /// string - public const string MaskKey = "mask"; - - /// string - public const string TagKey = "tag"; + public string? Value { get; set; } #endregion diff --git a/SabreTools.Data.Models/Metadata/ConfSetting.cs b/SabreTools.Data.Models/Metadata/ConfSetting.cs index bd91065f..8e5657a5 100644 --- a/SabreTools.Data.Models/Metadata/ConfSetting.cs +++ b/SabreTools.Data.Models/Metadata/ConfSetting.cs @@ -13,6 +13,8 @@ namespace SabreTools.Data.Models.Metadata public string? Name { get; set; } + public string? Value { get; set; } + #endregion #region Keys @@ -21,9 +23,6 @@ namespace SabreTools.Data.Models.Metadata [NoFilter] public const string ConditionKey = "condition"; - /// string - public const string ValueKey = "value"; - #endregion public ConfSetting() => ItemType = ItemType.ConfSetting; diff --git a/SabreTools.Data.Models/Metadata/Configuration.cs b/SabreTools.Data.Models/Metadata/Configuration.cs index d261bb88..7af991b0 100644 --- a/SabreTools.Data.Models/Metadata/Configuration.cs +++ b/SabreTools.Data.Models/Metadata/Configuration.cs @@ -8,8 +8,12 @@ namespace SabreTools.Data.Models.Metadata { #region Properties + public string? Mask { get; set; } + public string? Name { get; set; } + public string? Tag { get; set; } + #endregion #region Keys @@ -26,12 +30,6 @@ namespace SabreTools.Data.Models.Metadata [NoFilter] public const string ConfSettingKey = "confsetting"; - /// string - public const string MaskKey = "mask"; - - /// string - public const string TagKey = "tag"; - #endregion public Configuration() => ItemType = ItemType.Configuration; diff --git a/SabreTools.Data.Models/Metadata/Device.cs b/SabreTools.Data.Models/Metadata/Device.cs index 6165eb4b..affebcc2 100644 --- a/SabreTools.Data.Models/Metadata/Device.cs +++ b/SabreTools.Data.Models/Metadata/Device.cs @@ -14,6 +14,8 @@ namespace SabreTools.Data.Models.Metadata /// (0|1) "0" public bool? Mandatory { get; set; } + public string? Tag { get; set; } + #endregion #region Keys @@ -32,9 +34,6 @@ namespace SabreTools.Data.Models.Metadata /// string public const string InterfaceKey = "interface"; - /// string - public const string TagKey = "tag"; - #endregion public Device() => ItemType = ItemType.Device; diff --git a/SabreTools.Data.Models/Metadata/DipSwitch.cs b/SabreTools.Data.Models/Metadata/DipSwitch.cs index 7207d926..bb893028 100644 --- a/SabreTools.Data.Models/Metadata/DipSwitch.cs +++ b/SabreTools.Data.Models/Metadata/DipSwitch.cs @@ -11,8 +11,12 @@ namespace SabreTools.Data.Models.Metadata /// (yes|no) "no" public bool? Default { get; set; } + public string? Mask { get; set; } + public string? Name { get; set; } + public string? Tag { get; set; } + #endregion #region Keys @@ -32,12 +36,6 @@ namespace SabreTools.Data.Models.Metadata /// string[] public const string EntryKey = "entry"; - /// string - public const string MaskKey = "mask"; - - /// string - public const string TagKey = "tag"; - #endregion public DipSwitch() => ItemType = ItemType.DipSwitch; diff --git a/SabreTools.Data.Models/Metadata/DipValue.cs b/SabreTools.Data.Models/Metadata/DipValue.cs index 99ab2c6b..cb928ba6 100644 --- a/SabreTools.Data.Models/Metadata/DipValue.cs +++ b/SabreTools.Data.Models/Metadata/DipValue.cs @@ -13,6 +13,8 @@ namespace SabreTools.Data.Models.Metadata public string? Name { get; set; } + public string? Value { get; set; } + #endregion #region Keys @@ -21,9 +23,6 @@ namespace SabreTools.Data.Models.Metadata [NoFilter] public const string ConditionKey = "condition"; - /// string - public const string ValueKey = "value"; - #endregion public DipValue() => ItemType = ItemType.DipValue; diff --git a/SabreTools.Data.Models/Metadata/Display.cs b/SabreTools.Data.Models/Metadata/Display.cs index 71dee49e..c9e8d06e 100644 --- a/SabreTools.Data.Models/Metadata/Display.cs +++ b/SabreTools.Data.Models/Metadata/Display.cs @@ -14,6 +14,8 @@ namespace SabreTools.Data.Models.Metadata /// (yes|no) "no" public bool? FlipX { get; set; } + public string? Tag { get; set; } + #endregion #region Keys @@ -40,9 +42,6 @@ namespace SabreTools.Data.Models.Metadata /// TODO: Convert to enum public const string RotateKey = "rotate"; - /// string - public const string TagKey = "tag"; - /// long public const string VBEndKey = "vbend"; diff --git a/SabreTools.Data.Models/Metadata/Feature.cs b/SabreTools.Data.Models/Metadata/Feature.cs index 0193ad78..ee62f094 100644 --- a/SabreTools.Data.Models/Metadata/Feature.cs +++ b/SabreTools.Data.Models/Metadata/Feature.cs @@ -19,12 +19,7 @@ namespace SabreTools.Data.Models.Metadata /// (unemulated|imperfect) public FeatureStatus? Status { get; set; } - #endregion - - #region Keys - - /// string - public const string ValueKey = "value"; + public string? Value { get; set; } #endregion diff --git a/SabreTools.Data.Models/Metadata/Header.cs b/SabreTools.Data.Models/Metadata/Header.cs index b1a6ca6a..e933e9a6 100644 --- a/SabreTools.Data.Models/Metadata/Header.cs +++ b/SabreTools.Data.Models/Metadata/Header.cs @@ -14,6 +14,8 @@ namespace SabreTools.Data.Models.Metadata /// (yes|no) "no" public bool? Debug { get; set; } + public string? Description { get; set; } + /// (none|split|merged|nonmerged|fullmerged|device|full) "split" public MergingFlag ForceMerging { get; set; } @@ -70,9 +72,6 @@ namespace SabreTools.Data.Models.Metadata /// string public const string DatVersionKey = "datversion"; - /// string - public const string DescriptionKey = "description"; - /// string public const string EmailKey = "email"; diff --git a/SabreTools.Data.Models/Metadata/Info.cs b/SabreTools.Data.Models/Metadata/Info.cs index 7adec396..70032b49 100644 --- a/SabreTools.Data.Models/Metadata/Info.cs +++ b/SabreTools.Data.Models/Metadata/Info.cs @@ -10,12 +10,7 @@ namespace SabreTools.Data.Models.Metadata public string? Name { get; set; } - #endregion - - #region Keys - - /// string - public const string ValueKey = "value"; + public string? Value { get; set; } #endregion diff --git a/SabreTools.Data.Models/Metadata/Machine.cs b/SabreTools.Data.Models/Metadata/Machine.cs index 2bdb8872..dcfd3c8a 100644 --- a/SabreTools.Data.Models/Metadata/Machine.cs +++ b/SabreTools.Data.Models/Metadata/Machine.cs @@ -8,6 +8,8 @@ namespace SabreTools.Data.Models.Metadata { #region Properties + public string? Description { get; set; } + /// (yes|no) "no" public bool? IsBios { get; set; } @@ -76,9 +78,6 @@ namespace SabreTools.Data.Models.Metadata /// string public const string CountryKey = "country"; - /// string - public const string DescriptionKey = "description"; - /// Device[] [NoFilter] public const string DeviceKey = "device"; diff --git a/SabreTools.Data.Models/Metadata/Port.cs b/SabreTools.Data.Models/Metadata/Port.cs index 9a017d7f..16c586ec 100644 --- a/SabreTools.Data.Models/Metadata/Port.cs +++ b/SabreTools.Data.Models/Metadata/Port.cs @@ -6,15 +6,18 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("port"), XmlRoot("port")] public class Port : DatItem { + #region Properties + + public string? Tag { get; set; } + + #endregion + #region Keys /// Analog[] [NoFilter] public const string AnalogKey = "analog"; - /// string - public const string TagKey = "tag"; - #endregion public Port() => ItemType = ItemType.Port; diff --git a/SabreTools.Data.Models/Metadata/Rom.cs b/SabreTools.Data.Models/Metadata/Rom.cs index d021dcc6..9217cfbd 100644 --- a/SabreTools.Data.Models/Metadata/Rom.cs +++ b/SabreTools.Data.Models/Metadata/Rom.cs @@ -37,6 +37,8 @@ namespace SabreTools.Data.Models.Metadata /// (baddump|nodump|good|verified) "good" public ItemStatus? Status { get; set; } + public string? Value { get; set; } + #endregion #region Keys @@ -245,9 +247,6 @@ namespace SabreTools.Data.Models.Metadata /// string; OpenMSX.RomBase public const string OpenMSXType = "type"; - /// string - public const string ValueKey = "value"; - /// string; ArchiveDotOrg.File public const string WhisperASRModuleVersionKey = "whisper_asr_module_version"; diff --git a/SabreTools.Data.Models/Metadata/SharedFeat.cs b/SabreTools.Data.Models/Metadata/SharedFeat.cs index 86df3931..b42c1967 100644 --- a/SabreTools.Data.Models/Metadata/SharedFeat.cs +++ b/SabreTools.Data.Models/Metadata/SharedFeat.cs @@ -10,12 +10,7 @@ namespace SabreTools.Data.Models.Metadata public string? Name { get; set; } - #endregion - - #region Keys - - /// string - public const string ValueKey = "value"; + public string? Value { get; set; } #endregion diff --git a/SabreTools.Data.Models/Metadata/Software.cs b/SabreTools.Data.Models/Metadata/Software.cs index 6819bc82..feb7d209 100644 --- a/SabreTools.Data.Models/Metadata/Software.cs +++ b/SabreTools.Data.Models/Metadata/Software.cs @@ -8,6 +8,8 @@ namespace SabreTools.Data.Models.Metadata { #region Properties + public string? Description { get; set; } + public string? Name { get; set; } /// (yes|partial|no) "yes" @@ -20,9 +22,6 @@ namespace SabreTools.Data.Models.Metadata /// string public const string CloneOfKey = "cloneof"; - /// string - public const string DescriptionKey = "description"; - /// Info[] [NoFilter] public const string InfoKey = "info"; diff --git a/SabreTools.Data.Models/Metadata/SoftwareList.cs b/SabreTools.Data.Models/Metadata/SoftwareList.cs index 9486f3d4..57944cf5 100644 --- a/SabreTools.Data.Models/Metadata/SoftwareList.cs +++ b/SabreTools.Data.Models/Metadata/SoftwareList.cs @@ -8,18 +8,19 @@ namespace SabreTools.Data.Models.Metadata { #region Properties + public string? Description { get; set; } + public string? Name { get; set; } /// (original|compatible) public SoftwareListStatus? Status { get; set; } + public string? Tag { get; set; } + #endregion #region Keys - /// string - public const string DescriptionKey = "description"; - /// string public const string FilterKey = "filter"; @@ -30,9 +31,6 @@ namespace SabreTools.Data.Models.Metadata [NoFilter] public const string SoftwareKey = "software"; - /// string - public const string TagKey = "tag"; - #endregion public SoftwareList() => ItemType = ItemType.SoftwareList; diff --git a/SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs b/SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs index cbe19e54..ac941294 100644 --- a/SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs +++ b/SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs @@ -80,7 +80,7 @@ namespace SabreTools.Metadata.DatFiles.Test Machine machine = new Machine(); machine.SetName("machine"); - machine.Write(Data.Models.Metadata.Machine.DescriptionKey, "description"); + machine.Description = "description"; DatItem datItem = new Rom(); datItem.Write(DatItem.MachineKey, machine); @@ -96,7 +96,7 @@ namespace SabreTools.Metadata.DatFiles.Test Machine? actualMachine = actual.GetMachine(); Assert.NotNull(actualMachine); Assert.Equal("description", actualMachine.GetName()); - Assert.Equal("description", actualMachine.ReadString(Data.Models.Metadata.Machine.DescriptionKey)); + Assert.Equal("description", actualMachine.Description); } [Fact] @@ -104,7 +104,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Machine machine = new Machine(); machine.SetName("machine"); - machine.Write(Data.Models.Metadata.Machine.DescriptionKey, "description"); + machine.Description = "description"; DatFile datFile = new Logiqx(datFile: null, useGame: false); _ = datFile.AddMachineDB(machine); @@ -113,7 +113,7 @@ namespace SabreTools.Metadata.DatFiles.Test Machine actualMachine = Assert.Single(datFile.GetMachinesDB()).Value; Assert.Equal("description", actualMachine.GetName()); - Assert.Equal("description", actualMachine.ReadString(Data.Models.Metadata.Machine.DescriptionKey)); + Assert.Equal("description", actualMachine.Description); } #endregion diff --git a/SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs b/SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs index 117109d3..fbcafd79 100644 --- a/SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs +++ b/SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs @@ -210,7 +210,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Header.DateKey] = "date", [Data.Models.Metadata.Header.DatVersionKey] = "datversion", Debug = true, - [Data.Models.Metadata.Header.DescriptionKey] = "description", + Description = "description", [Data.Models.Metadata.Header.EmailKey] = "email", [Data.Models.Metadata.Header.EmulatorVersionKey] = "emulatorversion", ForceMerging = Data.Models.Metadata.MergingFlag.Merged, @@ -266,7 +266,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Machine.ConfigurationKey] = new Data.Models.Metadata.Configuration[] { CreateMetadataConfiguration() }, [Data.Models.Metadata.Machine.ControlKey] = "control", [Data.Models.Metadata.Machine.CountryKey] = "country", - [Data.Models.Metadata.Machine.DescriptionKey] = "description", + Description = "description", [Data.Models.Metadata.Machine.DeviceKey] = new Data.Models.Metadata.Device[] { CreateMetadataDevice() }, [Data.Models.Metadata.Machine.DeviceRefKey] = new Data.Models.Metadata.DeviceRef[] { CreateMetadataDeviceRef() }, [Data.Models.Metadata.Machine.DipSwitchKey] = new Data.Models.Metadata.DipSwitch[] { CreateMetadataDipSwitch() }, @@ -346,7 +346,7 @@ namespace SabreTools.Metadata.DatFiles.Test { return new Data.Models.Metadata.Analog { - [Data.Models.Metadata.Analog.MaskKey] = "mask", + Mask = "mask", }; } @@ -374,7 +374,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Archive.AltKey] = "alt", [Data.Models.Metadata.Archive.GameId1Key] = "gameid1", [Data.Models.Metadata.Archive.GameId2Key] = "gameid2", - [Data.Models.Metadata.Archive.DescriptionKey] = "description", + Description = "description", [Data.Models.Metadata.Archive.BiosKey] = "bios", [Data.Models.Metadata.Archive.LicensedKey] = "licensed", [Data.Models.Metadata.Archive.PirateKey] = "pirate", @@ -395,7 +395,7 @@ namespace SabreTools.Metadata.DatFiles.Test return new Data.Models.Metadata.BiosSet { Default = true, - [Data.Models.Metadata.BiosSet.DescriptionKey] = "description", + Description = "description", Name = "name", }; } @@ -408,7 +408,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Chip.FlagsKey] = "flags", Name = "name", SoundOnly = true, - [Data.Models.Metadata.Chip.TagKey] = "tag", + Tag = "tag", ChipType = Data.Models.Metadata.ChipType.CPU, }; } @@ -420,9 +420,9 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Configuration.ConditionKey] = CreateMetadataCondition(), [Data.Models.Metadata.Configuration.ConfLocationKey] = new Data.Models.Metadata.ConfLocation[] { CreateMetadataConfLocation() }, [Data.Models.Metadata.Configuration.ConfSettingKey] = new Data.Models.Metadata.ConfSetting[] { CreateMetadataConfSetting() }, - [Data.Models.Metadata.Configuration.MaskKey] = "mask", + Mask = "mask", Name = "name", - [Data.Models.Metadata.Configuration.TagKey] = "tag", + Tag = "tag", }; } @@ -430,10 +430,10 @@ namespace SabreTools.Metadata.DatFiles.Test { return new Data.Models.Metadata.Condition { - [Data.Models.Metadata.Condition.ValueKey] = "value", - [Data.Models.Metadata.Condition.MaskKey] = "mask", + Value = "value", + Mask = "mask", Relation = Data.Models.Metadata.Relation.Equal, - [Data.Models.Metadata.Condition.TagKey] = "tag", + Tag = "tag", }; } @@ -454,7 +454,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.ConfSetting.ConditionKey] = CreateMetadataCondition(), Default = true, Name = "name", - [Data.Models.Metadata.ConfSetting.ValueKey] = "value", + Value = "value", }; } @@ -486,7 +486,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Device.InstanceKey] = CreateMetadataInstance(), [Data.Models.Metadata.Device.InterfaceKey] = "interface", Mandatory = true, - [Data.Models.Metadata.Device.TagKey] = "tag", + Tag = "tag", DeviceType = Data.Models.Metadata.DeviceType.PunchTape, }; } @@ -518,9 +518,9 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.DipSwitch.DipLocationKey] = new Data.Models.Metadata.DipLocation[] { CreateMetadataDipLocation() }, [Data.Models.Metadata.DipSwitch.DipValueKey] = new Data.Models.Metadata.DipValue[] { CreateMetadataDipValue() }, [Data.Models.Metadata.DipSwitch.EntryKey] = new string[] { "entry" }, - [Data.Models.Metadata.DipSwitch.MaskKey] = "mask", + Mask = "mask", Name = "name", - [Data.Models.Metadata.DipSwitch.TagKey] = "tag", + Tag = "tag", }; } @@ -531,7 +531,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.DipValue.ConditionKey] = CreateMetadataCondition(), Default = true, Name = "name", - [Data.Models.Metadata.DipValue.ValueKey] = "value", + Value = "value", }; } @@ -584,7 +584,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Display.PixClockKey] = 12345L, [Data.Models.Metadata.Display.RefreshKey] = 12345L, [Data.Models.Metadata.Display.RotateKey] = 90, - [Data.Models.Metadata.Display.TagKey] = "tag", + Tag = "tag", DisplayType = Data.Models.Metadata.DisplayType.Vector, [Data.Models.Metadata.Display.VBEndKey] = 12345L, [Data.Models.Metadata.Display.VBStartKey] = 12345L, @@ -643,7 +643,7 @@ namespace SabreTools.Metadata.DatFiles.Test Overall = Data.Models.Metadata.FeatureStatus.Imperfect, Status = Data.Models.Metadata.FeatureStatus.Imperfect, FeatureType = Data.Models.Metadata.FeatureType.Protection, - [Data.Models.Metadata.Feature.ValueKey] = "value", + Value = "value", }; } @@ -652,7 +652,7 @@ namespace SabreTools.Metadata.DatFiles.Test return new Data.Models.Metadata.Info { Name = "name", - [Data.Models.Metadata.Info.ValueKey] = "value", + Value = "value", }; } @@ -717,7 +717,7 @@ namespace SabreTools.Metadata.DatFiles.Test return new Data.Models.Metadata.Port { [Data.Models.Metadata.Port.AnalogKey] = new Data.Models.Metadata.Analog[] { CreateMetadataAnalog() }, - [Data.Models.Metadata.Port.TagKey] = "tag", + Tag = "tag", }; } @@ -848,7 +848,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Rom.TitleKey] = "title", [Data.Models.Metadata.Rom.TrackKey] = "track", [Data.Models.Metadata.Rom.OpenMSXType] = "type", - [Data.Models.Metadata.Rom.ValueKey] = "value", + Value = "value", [Data.Models.Metadata.Rom.WhisperASRModuleVersionKey] = "whisper_asr_module_version", [Data.Models.Metadata.Rom.WhisperModelHashKey] = "whisper_model_hash", [Data.Models.Metadata.Rom.WhisperModelNameKey] = "whisper_model_name", @@ -903,7 +903,7 @@ namespace SabreTools.Metadata.DatFiles.Test return new Data.Models.Metadata.SharedFeat { Name = "name", - [Data.Models.Metadata.SharedFeat.ValueKey] = "value", + Value = "value", }; } @@ -931,7 +931,7 @@ namespace SabreTools.Metadata.DatFiles.Test return new Data.Models.Metadata.Software { [Data.Models.Metadata.Software.CloneOfKey] = "cloneof", - [Data.Models.Metadata.Software.DescriptionKey] = "description", + Description = "description", [Data.Models.Metadata.Software.InfoKey] = new Data.Models.Metadata.Info[] { CreateMetadataInfo() }, Name = "name", [Data.Models.Metadata.Software.NotesKey] = "notes", @@ -947,13 +947,13 @@ namespace SabreTools.Metadata.DatFiles.Test { return new Data.Models.Metadata.SoftwareList { - [Data.Models.Metadata.SoftwareList.DescriptionKey] = "description", + Description = "description", [Data.Models.Metadata.SoftwareList.FilterKey] = "filter", Name = "name", [Data.Models.Metadata.SoftwareList.NotesKey] = "notes", [Data.Models.Metadata.SoftwareList.SoftwareKey] = new Data.Models.Metadata.Software[] { CreateMetadataSoftware() }, Status = Data.Models.Metadata.SoftwareListStatus.Original, - [Data.Models.Metadata.SoftwareList.TagKey] = "tag", + Tag = "tag", }; } @@ -1046,7 +1046,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("date", datHeader.ReadString(Data.Models.Metadata.Header.DateKey)); Assert.Equal("datversion", datHeader.ReadString(Data.Models.Metadata.Header.DatVersionKey)); Assert.True(datHeader.Debug); - Assert.Equal("description", datHeader.ReadString(Data.Models.Metadata.Header.DescriptionKey)); + Assert.Equal("description", datHeader.Description); Assert.Equal("email", datHeader.ReadString(Data.Models.Metadata.Header.EmailKey)); Assert.Equal("emulatorversion", datHeader.ReadString(Data.Models.Metadata.Header.EmulatorVersionKey)); Assert.Equal(Data.Models.Metadata.MergingFlag.Merged, datHeader.ForceMerging); @@ -1095,7 +1095,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("company", machine.ReadString(Data.Models.Metadata.Machine.CompanyKey)); Assert.Equal("control", machine.ReadString(Data.Models.Metadata.Machine.ControlKey)); Assert.Equal("country", machine.ReadString(Data.Models.Metadata.Machine.CountryKey)); - Assert.Equal("description", machine.ReadString(Data.Models.Metadata.Machine.DescriptionKey)); + Assert.Equal("description", machine.Description); Assert.Equal("dirname", machine.ReadString(Data.Models.Metadata.Machine.DirNameKey)); Assert.Equal("displaycount", machine.ReadString(Data.Models.Metadata.Machine.DisplayCountKey)); Assert.Equal("displaytype", machine.ReadString(Data.Models.Metadata.Machine.DisplayTypeKey)); @@ -1154,7 +1154,7 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateAnalog(Analog? analog) { Assert.NotNull(analog); - Assert.Equal("mask", analog.ReadString(Data.Models.Metadata.Analog.MaskKey)); + Assert.Equal("mask", analog.Mask); } private static void ValidateArchive(Archive? archive) @@ -1167,7 +1167,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(biosSet); Assert.True(biosSet.Default); - Assert.Equal("description", biosSet.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey)); + Assert.Equal("description", biosSet.Description); Assert.Equal("name", biosSet.GetName()); } @@ -1178,25 +1178,25 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("flags", chip.ReadString(Data.Models.Metadata.Chip.FlagsKey)); Assert.Equal("name", chip.GetName()); Assert.True(chip.SoundOnly); - Assert.Equal("tag", chip.ReadString(Data.Models.Metadata.Chip.TagKey)); + Assert.Equal("tag", chip.Tag); Assert.Equal(Data.Models.Metadata.ChipType.CPU, chip.ChipType); } private static void ValidateCondition(Condition? condition) { Assert.NotNull(condition); - Assert.Equal("value", condition.ReadString(Data.Models.Metadata.Condition.ValueKey)); - Assert.Equal("mask", condition.ReadString(Data.Models.Metadata.Condition.MaskKey)); + Assert.Equal("value", condition.Value); + Assert.Equal("mask", condition.Mask); Assert.Equal(Data.Models.Metadata.Relation.Equal, condition.Relation); - Assert.Equal("tag", condition.ReadString(Data.Models.Metadata.Condition.TagKey)); + Assert.Equal("tag", condition.Tag); } private static void ValidateConfiguration(Configuration? configuration) { Assert.NotNull(configuration); - Assert.Equal("mask", configuration.ReadString(Data.Models.Metadata.Configuration.MaskKey)); + Assert.Equal("mask", configuration.Mask); Assert.Equal("name", configuration.GetName()); - Assert.Equal("tag", configuration.ReadString(Data.Models.Metadata.Configuration.TagKey)); + Assert.Equal("tag", configuration.Tag); Condition? condition = configuration.Read(Data.Models.Metadata.Configuration.ConditionKey); ValidateCondition(condition); @@ -1225,7 +1225,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(confSetting); Assert.True(confSetting.Default); Assert.Equal("name", confSetting.GetName()); - Assert.Equal("value", confSetting.ReadString(Data.Models.Metadata.ConfSetting.ValueKey)); + Assert.Equal("value", confSetting.Value); Condition? condition = confSetting.Read(Data.Models.Metadata.ConfSetting.ConditionKey); ValidateCondition(condition); @@ -1263,7 +1263,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("fixedimage", device.ReadString(Data.Models.Metadata.Device.FixedImageKey)); Assert.Equal("interface", device.ReadString(Data.Models.Metadata.Device.InterfaceKey)); Assert.Equal(true, device.Mandatory); - Assert.Equal("tag", device.ReadString(Data.Models.Metadata.Device.TagKey)); + Assert.Equal("tag", device.Tag); Assert.Equal(Data.Models.Metadata.DeviceType.PunchTape, device.DeviceType); Extension[]? extensions = device.Read(Data.Models.Metadata.Device.ExtensionKey); @@ -1293,9 +1293,9 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(dipSwitch); Assert.True(dipSwitch.Default); - Assert.Equal("mask", dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.MaskKey)); + Assert.Equal("mask", dipSwitch.Mask); Assert.Equal("name", dipSwitch.GetName()); - Assert.Equal("tag", dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.TagKey)); + Assert.Equal("tag", dipSwitch.Tag); Condition? condition = dipSwitch.Read(Data.Models.Metadata.DipSwitch.ConditionKey); ValidateCondition(condition); @@ -1321,7 +1321,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(dipValue); Assert.True(dipValue.Default); Assert.Equal("name", dipValue.GetName()); - Assert.Equal("value", dipValue.ReadString(Data.Models.Metadata.DipValue.ValueKey)); + Assert.Equal("value", dipValue.Value); Condition? condition = dipValue.Read(Data.Models.Metadata.DipValue.ConditionKey); ValidateCondition(condition); @@ -1358,7 +1358,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal(12345L, display.ReadLong(Data.Models.Metadata.Display.PixClockKey)); Assert.Equal(12345L, display.ReadLong(Data.Models.Metadata.Display.RefreshKey)); Assert.Equal(90, display.ReadLong(Data.Models.Metadata.Display.RotateKey)); - Assert.Equal("tag", display.ReadString(Data.Models.Metadata.Display.TagKey)); + Assert.Equal("tag", display.Tag); Assert.Equal(Data.Models.Metadata.DisplayType.Vector, display.DisplayType); Assert.Equal(12345L, display.ReadLong(Data.Models.Metadata.Display.VBEndKey)); Assert.Equal(12345L, display.ReadLong(Data.Models.Metadata.Display.VBStartKey)); @@ -1396,14 +1396,14 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal(Data.Models.Metadata.FeatureStatus.Imperfect, feature.Overall); Assert.Equal(Data.Models.Metadata.FeatureStatus.Imperfect, feature.Status); Assert.Equal(Data.Models.Metadata.FeatureType.Protection, feature.FeatureType); - Assert.Equal("value", feature.ReadString(Data.Models.Metadata.Feature.ValueKey)); + Assert.Equal("value", feature.Value); } private static void ValidateInfo(Info? info) { Assert.NotNull(info); Assert.Equal("name", info.GetName()); - Assert.Equal("value", info.ReadString(Data.Models.Metadata.Info.ValueKey)); + Assert.Equal("value", info.Value); } private static void ValidateInput(Input? input) @@ -1452,7 +1452,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal(Data.Models.Metadata.FeatureStatus.Imperfect, partFeature.Overall); Assert.Equal(Data.Models.Metadata.FeatureStatus.Imperfect, partFeature.Status); Assert.Equal(Data.Models.Metadata.FeatureType.Protection, partFeature.FeatureType); - Assert.Equal("value", partFeature.ReadString(Data.Models.Metadata.Feature.ValueKey)); + Assert.Equal("value", partFeature.Value); Part? part = partFeature.Read(PartFeature.PartKey); ValidatePart(part); @@ -1461,7 +1461,7 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidatePort(Port? port) { Assert.NotNull(port); - Assert.Equal("tag", port.ReadString(Data.Models.Metadata.Port.TagKey)); + Assert.Equal("tag", port.Tag); Analog[]? dipValues = port.Read(Data.Models.Metadata.Port.AnalogKey); Assert.NotNull(dipValues); @@ -1568,7 +1568,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("title", rom.ReadString(Data.Models.Metadata.Rom.TitleKey)); Assert.Equal("track", rom.ReadString(Data.Models.Metadata.Rom.TrackKey)); Assert.Equal("type", rom.ReadString(Data.Models.Metadata.Rom.OpenMSXType)); - Assert.Equal("value", rom.ReadString(Data.Models.Metadata.Rom.ValueKey)); + Assert.Equal("value", rom.Value); Assert.Equal("whisper_asr_module_version", rom.ReadString(Data.Models.Metadata.Rom.WhisperASRModuleVersionKey)); Assert.Equal("whisper_model_hash", rom.ReadString(Data.Models.Metadata.Rom.WhisperModelHashKey)); Assert.Equal("whisper_model_name", rom.ReadString(Data.Models.Metadata.Rom.WhisperModelNameKey)); @@ -1598,7 +1598,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(sharedFeat); Assert.Equal("name", sharedFeat.GetName()); - Assert.Equal("value", sharedFeat.ReadString(Data.Models.Metadata.SharedFeat.ValueKey)); + Assert.Equal("value", sharedFeat.Value); } private static void ValidateSlot(Slot? slot) @@ -1623,13 +1623,13 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateSoftwareList(SoftwareList? softwareList) { Assert.NotNull(softwareList); - Assert.Equal("description", softwareList.ReadString(Data.Models.Metadata.SoftwareList.DescriptionKey)); + Assert.Equal("description", softwareList.Description); Assert.Equal("filter", softwareList.ReadString(Data.Models.Metadata.SoftwareList.FilterKey)); Assert.Equal("name", softwareList.GetName()); Assert.Equal("notes", softwareList.ReadString(Data.Models.Metadata.SoftwareList.NotesKey)); // TODO: Figure out why Data.Models.Metadata.SoftwareList.SoftwareKey doesn't get processed Assert.Equal(Data.Models.Metadata.SoftwareListStatus.Original, softwareList.Status); - Assert.Equal("tag", softwareList.ReadString(Data.Models.Metadata.SoftwareList.TagKey)); + Assert.Equal("tag", softwareList.Tag); } private static void ValidateSound(Sound? sound) diff --git a/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs b/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs index 7e7e06a2..8b1a63a1 100644 --- a/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs +++ b/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs @@ -382,7 +382,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("date", header.ReadString(Data.Models.Metadata.Header.DateKey)); Assert.Equal("datversion", header.ReadString(Data.Models.Metadata.Header.DatVersionKey)); Assert.True(header.Debug); - Assert.Equal("description", header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); + Assert.Equal("description", header.Description); Assert.Equal("email", header.ReadString(Data.Models.Metadata.Header.EmailKey)); Assert.Equal("emulatorversion", header.ReadString(Data.Models.Metadata.Header.EmulatorVersionKey)); Assert.Equal(Data.Models.Metadata.MergingFlag.Merged, header.ForceMerging); @@ -430,7 +430,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("company", machine.ReadString(Data.Models.Metadata.Machine.CompanyKey)); Assert.Equal("control", machine.ReadString(Data.Models.Metadata.Machine.ControlKey)); Assert.Equal("country", machine.ReadString(Data.Models.Metadata.Machine.CountryKey)); - Assert.Equal("description", machine.ReadString(Data.Models.Metadata.Machine.DescriptionKey)); + Assert.Equal("description", machine.Description); Assert.Equal("dirname", machine.ReadString(Data.Models.Metadata.Machine.DirNameKey)); Assert.Equal("displaycount", machine.ReadString(Data.Models.Metadata.Machine.DisplayCountKey)); Assert.Equal("displaytype", machine.ReadString(Data.Models.Metadata.Machine.DisplayTypeKey)); @@ -629,7 +629,7 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateMetadataAnalog(Data.Models.Metadata.Analog? analog) { Assert.NotNull(analog); - Assert.Equal("mask", analog.ReadString(Data.Models.Metadata.Analog.MaskKey)); + Assert.Equal("mask", analog.Mask); } private static void ValidateMetadataArchive(Data.Models.Metadata.Archive? archive) @@ -655,7 +655,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("alt", archive.ReadString(Data.Models.Metadata.Archive.AltKey)); Assert.Equal("gameid1", archive.ReadString(Data.Models.Metadata.Archive.GameId1Key)); Assert.Equal("gameid2", archive.ReadString(Data.Models.Metadata.Archive.GameId2Key)); - Assert.Equal("description", archive.ReadString(Data.Models.Metadata.Archive.DescriptionKey)); + Assert.Equal("description", archive.Description); Assert.Equal("bios", archive.ReadString(Data.Models.Metadata.Archive.BiosKey)); Assert.Equal("licensed", archive.ReadString(Data.Models.Metadata.Archive.LicensedKey)); Assert.Equal("pirate", archive.ReadString(Data.Models.Metadata.Archive.PirateKey)); @@ -674,7 +674,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(biosSet); Assert.True(biosSet.Default); - Assert.Equal("description", biosSet.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey)); + Assert.Equal("description", biosSet.Description); Assert.Equal("name", biosSet.Name); } @@ -685,25 +685,25 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("flags", chip.ReadString(Data.Models.Metadata.Chip.FlagsKey)); Assert.Equal("name", chip.Name); Assert.True(chip.SoundOnly); - Assert.Equal("tag", chip.ReadString(Data.Models.Metadata.Chip.TagKey)); + Assert.Equal("tag", chip.Tag); 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.ReadString(Data.Models.Metadata.Condition.ValueKey)); - Assert.Equal("mask", condition.ReadString(Data.Models.Metadata.Condition.MaskKey)); + Assert.Equal("value", condition.Value); + Assert.Equal("mask", condition.Mask); Assert.Equal(Data.Models.Metadata.Relation.Equal, condition.Relation); - Assert.Equal("tag", condition.ReadString(Data.Models.Metadata.Condition.TagKey)); + Assert.Equal("tag", condition.Tag); } private static void ValidateMetadataConfiguration(Data.Models.Metadata.Configuration? configuration) { Assert.NotNull(configuration); - Assert.Equal("mask", configuration.ReadString(Data.Models.Metadata.Configuration.MaskKey)); + Assert.Equal("mask", configuration.Mask); Assert.Equal("name", configuration.Name); - Assert.Equal("tag", configuration.ReadString(Data.Models.Metadata.Configuration.TagKey)); + Assert.Equal("tag", configuration.Tag); Data.Models.Metadata.Condition? condition = configuration.Read(Data.Models.Metadata.Configuration.ConditionKey); ValidateMetadataCondition(condition); @@ -732,7 +732,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(confSetting); Assert.True(confSetting.Default); Assert.Equal("name", confSetting.Name); - Assert.Equal("value", confSetting.ReadString(Data.Models.Metadata.ConfSetting.ValueKey)); + Assert.Equal("value", confSetting.Value); Data.Models.Metadata.Condition? condition = confSetting.Read(Data.Models.Metadata.ConfSetting.ConditionKey); ValidateMetadataCondition(condition); @@ -775,7 +775,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("fixedimage", device.ReadString(Data.Models.Metadata.Device.FixedImageKey)); Assert.Equal("interface", device.ReadString(Data.Models.Metadata.Device.InterfaceKey)); Assert.Equal(true, device.Mandatory); - Assert.Equal("tag", device.ReadString(Data.Models.Metadata.Device.TagKey)); + Assert.Equal("tag", device.Tag); Assert.Equal(Data.Models.Metadata.DeviceType.PunchTape, device.DeviceType); Data.Models.Metadata.Extension[]? extensions = device.ReadArray(Data.Models.Metadata.Device.ExtensionKey); @@ -805,9 +805,9 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(dipSwitch); Assert.True(dipSwitch.Default); - Assert.Equal("mask", dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.MaskKey)); + Assert.Equal("mask", dipSwitch.Mask); Assert.Equal("name", dipSwitch.Name); - Assert.Equal("tag", dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.TagKey)); + Assert.Equal("tag", dipSwitch.Tag); Data.Models.Metadata.Condition? condition = dipSwitch.Read(Data.Models.Metadata.DipSwitch.ConditionKey); ValidateMetadataCondition(condition); @@ -833,7 +833,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(dipValue); Assert.True(dipValue.Default); Assert.Equal("name", dipValue.Name); - Assert.Equal("value", dipValue.ReadString(Data.Models.Metadata.DipValue.ValueKey)); + Assert.Equal("value", dipValue.Value); Data.Models.Metadata.Condition? condition = dipValue.Read(Data.Models.Metadata.DipValue.ConditionKey); ValidateMetadataCondition(condition); @@ -875,7 +875,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal(12345, display.ReadLong(Data.Models.Metadata.Display.PixClockKey)); Assert.Equal(12345, display.ReadLong(Data.Models.Metadata.Display.RefreshKey)); Assert.Equal(90, display.ReadLong(Data.Models.Metadata.Display.RotateKey)); - Assert.Equal("tag", display.ReadString(Data.Models.Metadata.Display.TagKey)); + Assert.Equal("tag", display.Tag); Assert.Equal(Data.Models.Metadata.DisplayType.Vector, display.DisplayType); Assert.Equal(12345, display.ReadLong(Data.Models.Metadata.Display.VBEndKey)); Assert.Equal(12345, display.ReadLong(Data.Models.Metadata.Display.VBStartKey)); @@ -913,14 +913,14 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal(Data.Models.Metadata.FeatureStatus.Imperfect, feature.Overall); Assert.Equal(Data.Models.Metadata.FeatureStatus.Imperfect, feature.Status); Assert.Equal(Data.Models.Metadata.FeatureType.Protection, feature.FeatureType); - Assert.Equal("value", feature.ReadString(Data.Models.Metadata.Feature.ValueKey)); + Assert.Equal("value", feature.Value); } private static void ValidateMetadataInfo(Data.Models.Metadata.Info? info) { Assert.NotNull(info); Assert.Equal("name", info.Name); - Assert.Equal("value", info.ReadString(Data.Models.Metadata.Info.ValueKey)); + Assert.Equal("value", info.Value); } private static void ValidateMetadataInput(Data.Models.Metadata.Input? input) @@ -985,7 +985,7 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateMetadataPort(Data.Models.Metadata.Port? port) { Assert.NotNull(port); - Assert.Equal("tag", port.ReadString(Data.Models.Metadata.Port.TagKey)); + Assert.Equal("tag", port.Tag); Data.Models.Metadata.Analog[]? dipValues = port.ReadArray(Data.Models.Metadata.Port.AnalogKey); Assert.NotNull(dipValues); @@ -1113,7 +1113,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("title", rom.ReadString(Data.Models.Metadata.Rom.TitleKey)); Assert.Equal("track", rom.ReadString(Data.Models.Metadata.Rom.TrackKey)); Assert.Equal("type", rom.ReadString(Data.Models.Metadata.Rom.OpenMSXType)); - Assert.Equal("value", rom.ReadString(Data.Models.Metadata.Rom.ValueKey)); + Assert.Equal("value", rom.Value); Assert.Equal("whisper_asr_module_version", rom.ReadString(Data.Models.Metadata.Rom.WhisperASRModuleVersionKey)); Assert.Equal("whisper_model_hash", rom.ReadString(Data.Models.Metadata.Rom.WhisperModelHashKey)); Assert.Equal("whisper_model_name", rom.ReadString(Data.Models.Metadata.Rom.WhisperModelNameKey)); @@ -1162,7 +1162,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(sharedFeat); Assert.Equal("name", sharedFeat.Name); - Assert.Equal("value", sharedFeat.ReadString(Data.Models.Metadata.SharedFeat.ValueKey)); + Assert.Equal("value", sharedFeat.Value); } private static void ValidateMetadataSlot(Data.Models.Metadata.Slot? slot) @@ -1187,12 +1187,12 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateMetadataSoftwareList(Data.Models.Metadata.SoftwareList? softwareList) { Assert.NotNull(softwareList); - Assert.Equal("description", softwareList.ReadString(Data.Models.Metadata.SoftwareList.DescriptionKey)); + Assert.Equal("description", softwareList.Description); Assert.Equal("filter", softwareList.ReadString(Data.Models.Metadata.SoftwareList.FilterKey)); Assert.Equal("name", softwareList.Name); Assert.Equal("notes", softwareList.ReadString(Data.Models.Metadata.SoftwareList.NotesKey)); Assert.Equal(Data.Models.Metadata.SoftwareListStatus.Original, softwareList.Status); - Assert.Equal("tag", softwareList.ReadString(Data.Models.Metadata.SoftwareList.TagKey)); + Assert.Equal("tag", softwareList.Tag); // TODO: Figure out why Data.Models.Metadata.SoftwareList.SoftwareKey doesn't get processed } diff --git a/SabreTools.Metadata.DatFiles.Test/DatFileTests.cs b/SabreTools.Metadata.DatFiles.Test/DatFileTests.cs index a0cb87f8..feace456 100644 --- a/SabreTools.Metadata.DatFiles.Test/DatFileTests.cs +++ b/SabreTools.Metadata.DatFiles.Test/DatFileTests.cs @@ -114,14 +114,14 @@ namespace SabreTools.Metadata.DatFiles.Test { DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.Header.Name = string.Empty; - datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, string.Empty); + datFile.Header.Description = string.Empty; datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, false); Assert.Equal("Filename (1980-01-01)", datFile.Header.Name); - Assert.Equal("Filename (1980-01-01)", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); + Assert.Equal("Filename (1980-01-01)", datFile.Header.Description); } [Fact] @@ -129,14 +129,14 @@ namespace SabreTools.Metadata.DatFiles.Test { DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.Header.Name = string.Empty; - datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, string.Empty); + datFile.Header.Description = string.Empty; datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, true); Assert.Equal("Filename", datFile.Header.Name); - Assert.Equal("Filename", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); + Assert.Equal("Filename", datFile.Header.Description); } [Fact] @@ -144,14 +144,14 @@ namespace SabreTools.Metadata.DatFiles.Test { DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.Header.Name = string.Empty; - datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, "Description"); + datFile.Header.Description = "Description"; datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, false); Assert.Equal("Description (1980-01-01)", datFile.Header.Name); - Assert.Equal("Description", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); + Assert.Equal("Description", datFile.Header.Description); } [Fact] @@ -159,14 +159,14 @@ namespace SabreTools.Metadata.DatFiles.Test { DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.Header.Name = string.Empty; - datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, "Description"); + datFile.Header.Description = "Description"; datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, true); Assert.Equal("Description", datFile.Header.Name); - Assert.Equal("Description", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); + Assert.Equal("Description", datFile.Header.Description); } [Fact] @@ -174,14 +174,14 @@ namespace SabreTools.Metadata.DatFiles.Test { DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.Header.Name = "Name"; - datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, string.Empty); + datFile.Header.Description = string.Empty; datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, false); Assert.Equal("Name", datFile.Header.Name); - Assert.Equal("Name (1980-01-01)", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); + Assert.Equal("Name (1980-01-01)", datFile.Header.Description); } [Fact] @@ -189,14 +189,14 @@ namespace SabreTools.Metadata.DatFiles.Test { DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.Header.Name = "Name"; - datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, string.Empty); + datFile.Header.Description = string.Empty; datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, true); Assert.Equal("Name", datFile.Header.Name); - Assert.Equal("Name", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); + Assert.Equal("Name", datFile.Header.Description); } [Fact] @@ -204,14 +204,14 @@ namespace SabreTools.Metadata.DatFiles.Test { DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.Header.Name = "Name"; - datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, "Description"); + datFile.Header.Description = "Description"; datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, false); Assert.Equal("Name", datFile.Header.Name); - Assert.Equal("Description", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); + Assert.Equal("Description", datFile.Header.Description); } [Fact] @@ -219,14 +219,14 @@ namespace SabreTools.Metadata.DatFiles.Test { DatFile datFile = new Logiqx(datFile: null, useGame: false); datFile.Header.Name = "Name "; - datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, "Description "); + datFile.Header.Description = "Description "; datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, true); Assert.Equal("Name", datFile.Header.Name); - Assert.Equal("Description", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); + Assert.Equal("Description", datFile.Header.Description); } #endregion diff --git a/SabreTools.Metadata.DatFiles.Test/FormatsTests.cs b/SabreTools.Metadata.DatFiles.Test/FormatsTests.cs index 2e64dcb6..d1aa5ba8 100644 --- a/SabreTools.Metadata.DatFiles.Test/FormatsTests.cs +++ b/SabreTools.Metadata.DatFiles.Test/FormatsTests.cs @@ -112,7 +112,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(actual); Assert.True(actual.SequenceEqual([ nameof(Data.Models.Metadata.BiosSet.Name), - Data.Models.Metadata.BiosSet.DescriptionKey, + nameof(Data.Models.Metadata.BiosSet.Description), ])); } @@ -791,7 +791,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(actual); Assert.True(actual.SequenceEqual([ nameof(Data.Models.Metadata.BiosSet.Name), - Data.Models.Metadata.BiosSet.DescriptionKey, + nameof(Data.Models.Metadata.BiosSet.Description), ])); } @@ -923,7 +923,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(actual); Assert.True(actual.SequenceEqual([ nameof(Data.Models.Metadata.DipSwitch.Name), - Data.Models.Metadata.DipSwitch.TagKey, + nameof(Data.Models.Metadata.DipSwitch.Tag), ])); } @@ -938,7 +938,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(actual); Assert.True(actual.SequenceEqual([ nameof(Data.Models.Metadata.Configuration.Name), - Data.Models.Metadata.Configuration.TagKey, + nameof(Data.Models.Metadata.Configuration.Tag), ])); } @@ -952,7 +952,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(actual); Assert.True(actual.SequenceEqual([ - Data.Models.Metadata.Port.TagKey, + nameof(Data.Models.Metadata.Port.Tag), ])); } @@ -1039,7 +1039,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(actual); Assert.True(actual.SequenceEqual([ - Data.Models.Metadata.SoftwareList.TagKey, + nameof(Data.Models.Metadata.SoftwareList.Tag), nameof(Data.Models.Metadata.SoftwareList.Name), nameof(Data.Models.Metadata.SoftwareList.Status), ])); @@ -1108,7 +1108,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(actual); Assert.True(actual.SequenceEqual([ nameof(Data.Models.Metadata.BiosSet.Name), - Data.Models.Metadata.BiosSet.DescriptionKey, + nameof(Data.Models.Metadata.BiosSet.Description), ])); } @@ -1227,7 +1227,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(actual); Assert.True(actual.SequenceEqual([ - Data.Models.Metadata.SoftwareList.TagKey, + nameof(Data.Models.Metadata.SoftwareList.Tag), nameof(Data.Models.Metadata.SoftwareList.Name), nameof(Data.Models.Metadata.SoftwareList.Status), ])); @@ -1574,8 +1574,8 @@ namespace SabreTools.Metadata.DatFiles.Test nameof(Data.Models.Metadata.Part.Name), Data.Models.Metadata.Part.InterfaceKey, nameof(Data.Models.Metadata.DipSwitch.Name), - Data.Models.Metadata.DipSwitch.TagKey, - Data.Models.Metadata.DipSwitch.MaskKey, + nameof(Data.Models.Metadata.DipSwitch.Tag), + nameof(Data.Models.Metadata.DipSwitch.Mask), ])); } diff --git a/SabreTools.Metadata.DatFiles/DatFile.Filtering.cs b/SabreTools.Metadata.DatFiles/DatFile.Filtering.cs index 03721f99..644ee035 100644 --- a/SabreTools.Metadata.DatFiles/DatFile.Filtering.cs +++ b/SabreTools.Metadata.DatFiles/DatFile.Filtering.cs @@ -125,7 +125,7 @@ namespace SabreTools.Metadata.DatFiles // Get the values to check against string? machineName = machine.GetName(); - string? machineDesc = machine.ReadString(Data.Models.Metadata.Machine.DescriptionKey); + string? machineDesc = machine.Description; if (machineName is null || machineDesc is null) continue; @@ -166,7 +166,7 @@ namespace SabreTools.Metadata.DatFiles // Get the values to check against string? machineName = machine.Value.GetName(); - string? machineDesc = machine.Value.ReadString(Data.Models.Metadata.Machine.DescriptionKey); + string? machineDesc = machine.Value.Description; if (machineName is null || machineDesc is null) continue; @@ -652,13 +652,13 @@ namespace SabreTools.Metadata.DatFiles // Get the values to check against string? machineName = machine.GetName(); - string? machineDesc = machine.ReadString(Data.Models.Metadata.Machine.DescriptionKey); + string? machineDesc = machine.Description; if (machineName is not null && Regex.IsMatch(machineName, SceneNamePattern)) item.GetMachine()!.SetName(Regex.Replace(machineName, SceneNamePattern, "$2")); if (machineDesc is not null && Regex.IsMatch(machineDesc, SceneNamePattern)) - item.GetMachine()!.Write(Data.Models.Metadata.Machine.DescriptionKey, Regex.Replace(machineDesc, SceneNamePattern, "$2")); + item.GetMachine()!.Description = Regex.Replace(machineDesc, SceneNamePattern, "$2"); } #if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER }); @@ -690,13 +690,13 @@ namespace SabreTools.Metadata.DatFiles // Get the values to check against string? machineName = machine.Value.GetName(); - string? machineDesc = machine.Value.ReadString(Data.Models.Metadata.Machine.DescriptionKey); + string? machineDesc = machine.Value.Description; if (machineName is not null && Regex.IsMatch(machineName, SceneNamePattern)) machine.Value.SetName(Regex.Replace(machineName, SceneNamePattern, "$2")); if (machineDesc is not null && Regex.IsMatch(machineDesc, SceneNamePattern)) - machine.Value.Write(Data.Models.Metadata.Machine.DescriptionKey, Regex.Replace(machineDesc, SceneNamePattern, "$2")); + machine.Value.Description = Regex.Replace(machineDesc, SceneNamePattern, "$2"); #if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER }); #else diff --git a/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs b/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs index 25c241ac..d31a948a 100644 --- a/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs +++ b/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs @@ -106,8 +106,8 @@ namespace SabreTools.Metadata.DatFiles Header.Write(Data.Models.Metadata.Header.DatVersionKey, header.ReadString(Data.Models.Metadata.Header.DatVersionKey)); if (Header.Debug is null) Header.Debug = header.Debug; - if (Header.ReadString(Data.Models.Metadata.Header.DescriptionKey) is null) - Header.Write(Data.Models.Metadata.Header.DescriptionKey, header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); + if (Header.Description is null) + Header.Description = header.Description; if (Header.ReadString(Data.Models.Metadata.Header.EmailKey) is null) Header.Write(Data.Models.Metadata.Header.EmailKey, header.ReadString(Data.Models.Metadata.Header.EmailKey)); if (Header.ReadString(Data.Models.Metadata.Header.EmulatorVersionKey) is null) diff --git a/SabreTools.Metadata.DatFiles/DatFile.Splitting.cs b/SabreTools.Metadata.DatFiles/DatFile.Splitting.cs index 02f72357..bc7b21d8 100644 --- a/SabreTools.Metadata.DatFiles/DatFile.Splitting.cs +++ b/SabreTools.Metadata.DatFiles/DatFile.Splitting.cs @@ -284,7 +284,7 @@ namespace SabreTools.Metadata.DatFiles { copyFrom = new Rom(); copyFrom.GetMachine()!.SetName(cloneOf); - copyFrom.GetMachine()!.Write(Data.Models.Metadata.Machine.DescriptionKey, cloneOf); + copyFrom.GetMachine()!.Description = cloneOf; } else { diff --git a/SabreTools.Metadata.DatFiles/DatFile.cs b/SabreTools.Metadata.DatFiles/DatFile.cs index 908e108d..24aeed88 100644 --- a/SabreTools.Metadata.DatFiles/DatFile.cs +++ b/SabreTools.Metadata.DatFiles/DatFile.cs @@ -96,7 +96,7 @@ namespace SabreTools.Metadata.DatFiles { // Get the header strings string? name = Header.Name; - string? description = Header.ReadString(Data.Models.Metadata.Header.DescriptionKey); + string? description = Header.Description; string? date = Header.ReadString(Data.Models.Metadata.Header.DateKey); // If the description is defined but not the name, set the name from the description @@ -130,7 +130,7 @@ namespace SabreTools.Metadata.DatFiles // Set the fields back Header.Name = name; - Header.Write(Data.Models.Metadata.Header.DescriptionKey, description); + Header.Description = description; } #endregion diff --git a/SabreTools.Metadata.DatFiles/DatHeader.cs b/SabreTools.Metadata.DatFiles/DatHeader.cs index da81e620..0002b131 100644 --- a/SabreTools.Metadata.DatFiles/DatHeader.cs +++ b/SabreTools.Metadata.DatFiles/DatHeader.cs @@ -31,12 +31,6 @@ namespace SabreTools.Metadata.DatFiles #region Fields - public string? Name - { - get => _internal.Name; - set => _internal.Name = value; - } - public MergingFlag BiosMode { get => _internal.BiosMode; @@ -59,6 +53,12 @@ namespace SabreTools.Metadata.DatFiles set => _internal.Debug = value; } + public string? Description + { + get => _internal.Description; + set => _internal.Description = value; + } + public MergingFlag ForceMerging { get => _internal.ForceMerging; @@ -119,6 +119,12 @@ namespace SabreTools.Metadata.DatFiles set => _internal.LockSampleMode = value; } + public string? Name + { + get => _internal.Name; + set => _internal.Name = value; + } + [JsonIgnore] public bool NewDatSpecified { diff --git a/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs b/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs index 1da9a687..5a6e9561 100644 --- a/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs +++ b/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs @@ -83,8 +83,8 @@ namespace SabreTools.Metadata.DatFiles.Formats case BiosSet biosset: if (string.IsNullOrEmpty(biosset.GetName())) missingFields.Add(nameof(Data.Models.Metadata.BiosSet.Name)); - if (string.IsNullOrEmpty(biosset.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey))) - missingFields.Add(Data.Models.Metadata.BiosSet.DescriptionKey); + if (string.IsNullOrEmpty(biosset.Description)) + missingFields.Add(nameof(Data.Models.Metadata.BiosSet.Description)); break; case Rom rom: diff --git a/SabreTools.Metadata.DatFiles/Formats/Listxml.cs b/SabreTools.Metadata.DatFiles/Formats/Listxml.cs index 57f61836..858bc7d0 100644 --- a/SabreTools.Metadata.DatFiles/Formats/Listxml.cs +++ b/SabreTools.Metadata.DatFiles/Formats/Listxml.cs @@ -262,8 +262,8 @@ namespace SabreTools.Metadata.DatFiles.Formats case BiosSet biosset: if (string.IsNullOrEmpty(biosset.GetName())) missingFields.Add(nameof(Data.Models.Metadata.BiosSet.Name)); - if (string.IsNullOrEmpty(biosset.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey))) - missingFields.Add(Data.Models.Metadata.BiosSet.DescriptionKey); + if (string.IsNullOrEmpty(biosset.Description)) + missingFields.Add(nameof(Data.Models.Metadata.BiosSet.Description)); break; case Rom rom: @@ -327,20 +327,20 @@ namespace SabreTools.Metadata.DatFiles.Formats case DipSwitch dipswitch: if (string.IsNullOrEmpty(dipswitch.GetName())) missingFields.Add(nameof(Data.Models.Metadata.DipSwitch.Name)); - if (string.IsNullOrEmpty(dipswitch.ReadString(Data.Models.Metadata.DipSwitch.TagKey))) - missingFields.Add(Data.Models.Metadata.DipSwitch.TagKey); + if (string.IsNullOrEmpty(dipswitch.Tag)) + missingFields.Add(nameof(Data.Models.Metadata.DipSwitch.Tag)); break; case Configuration configuration: if (string.IsNullOrEmpty(configuration.GetName())) missingFields.Add(nameof(Data.Models.Metadata.Configuration.Name)); - if (string.IsNullOrEmpty(configuration.ReadString(Data.Models.Metadata.Configuration.TagKey))) - missingFields.Add(Data.Models.Metadata.Configuration.TagKey); + if (string.IsNullOrEmpty(configuration.Tag)) + missingFields.Add(nameof(Data.Models.Metadata.Configuration.Tag)); break; case Port port: - if (string.IsNullOrEmpty(port.ReadString(Data.Models.Metadata.Port.TagKey))) - missingFields.Add(Data.Models.Metadata.Port.TagKey); + if (string.IsNullOrEmpty(port.Tag)) + missingFields.Add(nameof(Data.Models.Metadata.Port.Tag)); break; case Adjuster adjuster: @@ -375,8 +375,8 @@ namespace SabreTools.Metadata.DatFiles.Formats break; case DatItems.Formats.SoftwareList softwarelist: - if (string.IsNullOrEmpty(softwarelist.ReadString(Data.Models.Metadata.SoftwareList.TagKey))) - missingFields.Add(Data.Models.Metadata.SoftwareList.TagKey); + if (string.IsNullOrEmpty(softwarelist.Tag)) + missingFields.Add(nameof(Data.Models.Metadata.SoftwareList.Tag)); if (string.IsNullOrEmpty(softwarelist.GetName())) missingFields.Add(nameof(Data.Models.Metadata.SoftwareList.Name)); if (softwarelist.Status == null) diff --git a/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs b/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs index 6282e4b3..da05bc38 100644 --- a/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs +++ b/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs @@ -275,8 +275,8 @@ namespace SabreTools.Metadata.DatFiles.Formats case BiosSet biosset: if (string.IsNullOrEmpty(biosset.GetName())) missingFields.Add(nameof(Data.Models.Metadata.BiosSet.Name)); - if (string.IsNullOrEmpty(biosset.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey))) - missingFields.Add(Data.Models.Metadata.BiosSet.DescriptionKey); + if (string.IsNullOrEmpty(biosset.Description)) + missingFields.Add(nameof(Data.Models.Metadata.BiosSet.Description)); break; case Rom rom: @@ -354,8 +354,8 @@ namespace SabreTools.Metadata.DatFiles.Formats break; case DatItems.Formats.SoftwareList softwarelist: - if (string.IsNullOrEmpty(softwarelist.ReadString(Data.Models.Metadata.SoftwareList.TagKey))) - missingFields.Add(Data.Models.Metadata.SoftwareList.TagKey); + if (string.IsNullOrEmpty(softwarelist.Tag)) + missingFields.Add(nameof(Data.Models.Metadata.SoftwareList.Tag)); if (string.IsNullOrEmpty(softwarelist.GetName())) missingFields.Add(nameof(Data.Models.Metadata.SoftwareList.Name)); if (softwarelist.Status == null) diff --git a/SabreTools.Metadata.DatFiles/Formats/SoftwareList.cs b/SabreTools.Metadata.DatFiles/Formats/SoftwareList.cs index c7488661..b802cca5 100644 --- a/SabreTools.Metadata.DatFiles/Formats/SoftwareList.cs +++ b/SabreTools.Metadata.DatFiles/Formats/SoftwareList.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using SabreTools.Metadata.DatItems; using SabreTools.Metadata.DatItems.Formats; @@ -122,17 +122,17 @@ namespace SabreTools.Metadata.DatFiles.Formats if (string.IsNullOrEmpty(dipSwitch.GetName())) missingFields.Add(nameof(Data.Models.Metadata.DipSwitch.Name)); - if (string.IsNullOrEmpty(dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.TagKey))) - missingFields.Add(Data.Models.Metadata.DipSwitch.TagKey); - if (string.IsNullOrEmpty(dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.MaskKey))) - missingFields.Add(Data.Models.Metadata.DipSwitch.MaskKey); + if (string.IsNullOrEmpty(dipSwitch.Tag)) + missingFields.Add(nameof(Data.Models.Metadata.DipSwitch.Tag)); + if (string.IsNullOrEmpty(dipSwitch.Mask)) + missingFields.Add(nameof(Data.Models.Metadata.DipSwitch.Mask)); if (dipSwitch.ValuesSpecified) { var dipValues = dipSwitch.Read(Data.Models.Metadata.DipSwitch.DipValueKey); if (Array.Find(dipValues!, dv => string.IsNullOrEmpty(dv.GetName())) is not null) missingFields.Add(nameof(Data.Models.Metadata.DipValue.Name)); - if (Array.Find(dipValues!, dv => string.IsNullOrEmpty(dv.ReadString(Data.Models.Metadata.DipValue.ValueKey))) is not null) - missingFields.Add(Data.Models.Metadata.DipValue.ValueKey); + if (Array.Find(dipValues!, dv => string.IsNullOrEmpty(dv.Value)) is not null) + missingFields.Add(nameof(Data.Models.Metadata.DipValue.Value)); } break; diff --git a/SabreTools.Metadata.DatItems/Formats/Analog.cs b/SabreTools.Metadata.DatItems/Formats/Analog.cs index 8338418d..0cdaa4d1 100644 --- a/SabreTools.Metadata.DatItems/Formats/Analog.cs +++ b/SabreTools.Metadata.DatItems/Formats/Analog.cs @@ -10,6 +10,16 @@ namespace SabreTools.Metadata.DatItems.Formats [JsonObject("analog"), XmlRoot("analog")] public sealed class Analog : DatItem { + #region Fields + + public string? Mask + { + get => (_internal as Data.Models.Metadata.Analog)?.Mask; + set => (_internal as Data.Models.Metadata.Analog)?.Mask = value; + } + + #endregion + #region Constructors public Analog() : base() { } diff --git a/SabreTools.Metadata.DatItems/Formats/BiosSet.cs b/SabreTools.Metadata.DatItems/Formats/BiosSet.cs index 884e5b53..03ed4598 100644 --- a/SabreTools.Metadata.DatItems/Formats/BiosSet.cs +++ b/SabreTools.Metadata.DatItems/Formats/BiosSet.cs @@ -12,13 +12,18 @@ namespace SabreTools.Metadata.DatItems.Formats { #region Properties - [JsonIgnore] public bool? Default { get => (_internal as Data.Models.Metadata.BiosSet)?.Default; set => (_internal as Data.Models.Metadata.BiosSet)?.Default = value; } + public string? Description + { + get => (_internal as Data.Models.Metadata.BiosSet)?.Description; + set => (_internal as Data.Models.Metadata.BiosSet)?.Description = value; + } + #endregion #region Constructors diff --git a/SabreTools.Metadata.DatItems/Formats/Chip.cs b/SabreTools.Metadata.DatItems/Formats/Chip.cs index 4546ef29..4e393f14 100644 --- a/SabreTools.Metadata.DatItems/Formats/Chip.cs +++ b/SabreTools.Metadata.DatItems/Formats/Chip.cs @@ -24,6 +24,12 @@ namespace SabreTools.Metadata.DatItems.Formats set => (_internal as Data.Models.Metadata.Chip)?.SoundOnly = value; } + public string? Tag + { + get => (_internal as Data.Models.Metadata.Chip)?.Tag; + set => (_internal as Data.Models.Metadata.Chip)?.Tag = value; + } + #endregion #region Constructors diff --git a/SabreTools.Metadata.DatItems/Formats/Condition.cs b/SabreTools.Metadata.DatItems/Formats/Condition.cs index d0d0da55..abcc6418 100644 --- a/SabreTools.Metadata.DatItems/Formats/Condition.cs +++ b/SabreTools.Metadata.DatItems/Formats/Condition.cs @@ -12,12 +12,30 @@ namespace SabreTools.Metadata.DatItems.Formats { #region Fields + public string? Mask + { + get => (_internal as Data.Models.Metadata.Condition)?.Mask; + set => (_internal as Data.Models.Metadata.Condition)?.Mask = value; + } + public Data.Models.Metadata.Relation? Relation { get => (_internal as Data.Models.Metadata.Condition)?.Relation; set => (_internal as Data.Models.Metadata.Condition)?.Relation = value; } + public string? Tag + { + get => (_internal as Data.Models.Metadata.Condition)?.Tag; + set => (_internal as Data.Models.Metadata.Condition)?.Tag = value; + } + + public string? Value + { + get => (_internal as Data.Models.Metadata.Condition)?.Value; + set => (_internal as Data.Models.Metadata.Condition)?.Value = value; + } + #endregion #region Constructors diff --git a/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs b/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs index 0e69bb27..6b8500eb 100644 --- a/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs +++ b/SabreTools.Metadata.DatItems/Formats/ConfSetting.cs @@ -22,13 +22,18 @@ namespace SabreTools.Metadata.DatItems.Formats } } - [JsonIgnore] public bool? Default { get => (_internal as Data.Models.Metadata.ConfSetting)?.Default; set => (_internal as Data.Models.Metadata.ConfSetting)?.Default = value; } + public string? Value + { + get => (_internal as Data.Models.Metadata.ConfSetting)?.Value; + set => (_internal as Data.Models.Metadata.ConfSetting)?.Value = value; + } + #endregion #region Constructors diff --git a/SabreTools.Metadata.DatItems/Formats/Configuration.cs b/SabreTools.Metadata.DatItems/Formats/Configuration.cs index 4d8e8525..fed13901 100644 --- a/SabreTools.Metadata.DatItems/Formats/Configuration.cs +++ b/SabreTools.Metadata.DatItems/Formats/Configuration.cs @@ -33,6 +33,12 @@ namespace SabreTools.Metadata.DatItems.Formats } } + public string? Mask + { + get => (_internal as Data.Models.Metadata.Configuration)?.Mask; + set => (_internal as Data.Models.Metadata.Configuration)?.Mask = value; + } + [JsonIgnore] public bool SettingsSpecified { @@ -43,6 +49,12 @@ namespace SabreTools.Metadata.DatItems.Formats } } + public string? Tag + { + get => (_internal as Data.Models.Metadata.Configuration)?.Tag; + set => (_internal as Data.Models.Metadata.Configuration)?.Tag = value; + } + #endregion #region Constructors diff --git a/SabreTools.Metadata.DatItems/Formats/Device.cs b/SabreTools.Metadata.DatItems/Formats/Device.cs index ff14ce51..fd24980b 100644 --- a/SabreTools.Metadata.DatItems/Formats/Device.cs +++ b/SabreTools.Metadata.DatItems/Formats/Device.cs @@ -45,6 +45,12 @@ namespace SabreTools.Metadata.DatItems.Formats set => (_internal as Data.Models.Metadata.Device)?.Mandatory = value; } + public string? Tag + { + get => (_internal as Data.Models.Metadata.Device)?.Tag; + set => (_internal as Data.Models.Metadata.Device)?.Tag = value; + } + #endregion #region Constructors diff --git a/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs b/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs index 48dbe9fb..82158346 100644 --- a/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs +++ b/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs @@ -49,6 +49,12 @@ namespace SabreTools.Metadata.DatItems.Formats } } + public string? Mask + { + get => (_internal as Data.Models.Metadata.DipSwitch)?.Mask; + set => (_internal as Data.Models.Metadata.DipSwitch)?.Mask = value; + } + [JsonIgnore] public bool ValuesSpecified { @@ -71,6 +77,12 @@ namespace SabreTools.Metadata.DatItems.Formats } } + public string? Tag + { + get => (_internal as Data.Models.Metadata.DipSwitch)?.Tag; + set => (_internal as Data.Models.Metadata.DipSwitch)?.Tag = value; + } + #endregion #region Constructors diff --git a/SabreTools.Metadata.DatItems/Formats/DipValue.cs b/SabreTools.Metadata.DatItems/Formats/DipValue.cs index 6b47e025..e227a8d5 100644 --- a/SabreTools.Metadata.DatItems/Formats/DipValue.cs +++ b/SabreTools.Metadata.DatItems/Formats/DipValue.cs @@ -22,13 +22,18 @@ namespace SabreTools.Metadata.DatItems.Formats } } - [JsonIgnore] public bool? Default { get => (_internal as Data.Models.Metadata.DipValue)?.Default; set => (_internal as Data.Models.Metadata.DipValue)?.Default = value; } + public string? Value + { + get => (_internal as Data.Models.Metadata.DipValue)?.Value; + set => (_internal as Data.Models.Metadata.DipValue)?.Value = value; + } + #endregion #region Constructors diff --git a/SabreTools.Metadata.DatItems/Formats/Display.cs b/SabreTools.Metadata.DatItems/Formats/Display.cs index 3cf87591..d3b29c67 100644 --- a/SabreTools.Metadata.DatItems/Formats/Display.cs +++ b/SabreTools.Metadata.DatItems/Formats/Display.cs @@ -25,6 +25,12 @@ namespace SabreTools.Metadata.DatItems.Formats set => (_internal as Data.Models.Metadata.Display)?.FlipX = value; } + public string? Tag + { + get => (_internal as Data.Models.Metadata.Display)?.Tag; + set => (_internal as Data.Models.Metadata.Display)?.Tag = value; + } + #endregion #region Constructors diff --git a/SabreTools.Metadata.DatItems/Formats/Feature.cs b/SabreTools.Metadata.DatItems/Formats/Feature.cs index 7f8cf288..c75b953e 100644 --- a/SabreTools.Metadata.DatItems/Formats/Feature.cs +++ b/SabreTools.Metadata.DatItems/Formats/Feature.cs @@ -30,6 +30,12 @@ namespace SabreTools.Metadata.DatItems.Formats set => (_internal as Data.Models.Metadata.Feature)?.Status = value; } + public string? Value + { + get => (_internal as Data.Models.Metadata.Feature)?.Value; + set => (_internal as Data.Models.Metadata.Feature)?.Value = value; + } + #endregion #region Constructors diff --git a/SabreTools.Metadata.DatItems/Formats/Info.cs b/SabreTools.Metadata.DatItems/Formats/Info.cs index 1908073a..8952d251 100644 --- a/SabreTools.Metadata.DatItems/Formats/Info.cs +++ b/SabreTools.Metadata.DatItems/Formats/Info.cs @@ -10,6 +10,16 @@ namespace SabreTools.Metadata.DatItems.Formats [JsonObject("info"), XmlRoot("info")] public sealed class Info : DatItem { + #region Fields + + public string? Value + { + get => (_internal as Data.Models.Metadata.Info)?.Value; + set => (_internal as Data.Models.Metadata.Info)?.Value = value; + } + + #endregion + #region Constructors public Info() : base() { } diff --git a/SabreTools.Metadata.DatItems/Formats/PartFeature.cs b/SabreTools.Metadata.DatItems/Formats/PartFeature.cs index efe4f9f0..f46cdf3f 100644 --- a/SabreTools.Metadata.DatItems/Formats/PartFeature.cs +++ b/SabreTools.Metadata.DatItems/Formats/PartFeature.cs @@ -43,6 +43,12 @@ namespace SabreTools.Metadata.DatItems.Formats /// This needs to be set to PartFeature because internally it uses Feature public override Data.Models.Metadata.ItemType ItemType => Data.Models.Metadata.ItemType.PartFeature; + public string? Value + { + get => (_internal as Data.Models.Metadata.Feature)?.Value; + set => (_internal as Data.Models.Metadata.Feature)?.Value = value; + } + #endregion #region Constructors diff --git a/SabreTools.Metadata.DatItems/Formats/Port.cs b/SabreTools.Metadata.DatItems/Formats/Port.cs index d98745e8..fb0f83e4 100644 --- a/SabreTools.Metadata.DatItems/Formats/Port.cs +++ b/SabreTools.Metadata.DatItems/Formats/Port.cs @@ -23,6 +23,12 @@ namespace SabreTools.Metadata.DatItems.Formats } } + public string? Tag + { + get => (_internal as Data.Models.Metadata.Port)?.Tag; + set => (_internal as Data.Models.Metadata.Port)?.Tag = value; + } + #endregion #region Constructors diff --git a/SabreTools.Metadata.DatItems/Formats/Rom.cs b/SabreTools.Metadata.DatItems/Formats/Rom.cs index c791986d..f677d6c5 100644 --- a/SabreTools.Metadata.DatItems/Formats/Rom.cs +++ b/SabreTools.Metadata.DatItems/Formats/Rom.cs @@ -118,6 +118,12 @@ namespace SabreTools.Metadata.DatItems.Formats set => (_internal as Data.Models.Metadata.Rom)?.Status = value; } + public string? Value + { + get => (_internal as Data.Models.Metadata.Rom)?.Value; + set => (_internal as Data.Models.Metadata.Rom)?.Value = value; + } + #endregion #region Constructors diff --git a/SabreTools.Metadata.DatItems/Formats/SharedFeat.cs b/SabreTools.Metadata.DatItems/Formats/SharedFeat.cs index 63ba7ae3..36a21d85 100644 --- a/SabreTools.Metadata.DatItems/Formats/SharedFeat.cs +++ b/SabreTools.Metadata.DatItems/Formats/SharedFeat.cs @@ -10,6 +10,16 @@ namespace SabreTools.Metadata.DatItems.Formats [JsonObject("sharedfeat"), XmlRoot("sharedfeat")] public sealed class SharedFeat : DatItem { + #region Fields + + public string? Value + { + get => (_internal as Data.Models.Metadata.SharedFeat)?.Value; + set => (_internal as Data.Models.Metadata.SharedFeat)?.Value = value; + } + + #endregion + #region Constructors public SharedFeat() : base() { } diff --git a/SabreTools.Metadata.DatItems/Formats/SoftwareList.cs b/SabreTools.Metadata.DatItems/Formats/SoftwareList.cs index ac3bedbe..dacf6d6d 100644 --- a/SabreTools.Metadata.DatItems/Formats/SoftwareList.cs +++ b/SabreTools.Metadata.DatItems/Formats/SoftwareList.cs @@ -12,12 +12,24 @@ namespace SabreTools.Metadata.DatItems.Formats { #region Fields + public string? Description + { + get => (_internal as Data.Models.Metadata.SoftwareList)?.Description; + set => (_internal as Data.Models.Metadata.SoftwareList)?.Description = value; + } + public Data.Models.Metadata.SoftwareListStatus? Status { get => (_internal as Data.Models.Metadata.SoftwareList)?.Status; set => (_internal as Data.Models.Metadata.SoftwareList)?.Status = value; } + public string? Tag + { + get => (_internal as Data.Models.Metadata.SoftwareList)?.Tag; + set => (_internal as Data.Models.Metadata.SoftwareList)?.Tag = value; + } + #endregion #region Constructors diff --git a/SabreTools.Metadata.DatItems/Machine.cs b/SabreTools.Metadata.DatItems/Machine.cs index 115a492b..d4769003 100644 --- a/SabreTools.Metadata.DatItems/Machine.cs +++ b/SabreTools.Metadata.DatItems/Machine.cs @@ -15,6 +15,12 @@ namespace SabreTools.Metadata.DatItems { #region Fields + public string? Description + { + get => _internal.Description; + set => _internal.Description = value; + } + public bool? IsBios { get => _internal.IsBios; diff --git a/SabreTools.Metadata.Filter.Test/FilterRunnerTests.cs b/SabreTools.Metadata.Filter.Test/FilterRunnerTests.cs index 23140ae1..f80ddb49 100644 --- a/SabreTools.Metadata.Filter.Test/FilterRunnerTests.cs +++ b/SabreTools.Metadata.Filter.Test/FilterRunnerTests.cs @@ -77,7 +77,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void Machine_Null_False() { - var machine = new Machine { [Machine.DescriptionKey] = null }; + var machine = new Machine { Description = null }; bool actual = _filterRunner.Run(machine); Assert.False(actual); } @@ -85,7 +85,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void Machine_Empty_False() { - var machine = new Machine { [Machine.DescriptionKey] = "" }; + var machine = new Machine { Description = "" }; bool actual = _filterRunner.Run(machine); Assert.False(actual); } @@ -93,7 +93,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void Machine_Incorrect_False() { - var machine = new Machine { [Machine.DescriptionKey] = "NO_MATCH" }; + var machine = new Machine { Description = "NO_MATCH" }; bool actual = _filterRunner.Run(machine); Assert.False(actual); } @@ -101,7 +101,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void Machine_Correct_True() { - var machine = new Machine { [Machine.DescriptionKey] = "desc" }; + var machine = new Machine { Description = "desc" }; bool actual = _filterRunner.Run(machine); Assert.True(actual); } diff --git a/SabreTools.Metadata.Filter/FilterObject.cs b/SabreTools.Metadata.Filter/FilterObject.cs index 7c624720..b9635d99 100644 --- a/SabreTools.Metadata.Filter/FilterObject.cs +++ b/SabreTools.Metadata.Filter/FilterObject.cs @@ -352,9 +352,20 @@ namespace SabreTools.Metadata.Filter checkValue = item.Default.FromYesNo(); return true; + case Analog item when fieldName == "mask": + checkValue = item.Mask; + return true; + + case Archive item when fieldName == "description": + checkValue = item.Description; + return true; + case BiosSet item when fieldName == "default": checkValue = item.Default.FromYesNo(); return true; + case BiosSet item when fieldName == "description": + checkValue = item.Description; + return true; case Chip item when fieldName == "type": checkValue = item.ChipType?.AsStringValue(); @@ -362,10 +373,29 @@ namespace SabreTools.Metadata.Filter case Chip item when fieldName == "soundonly": checkValue = item.SoundOnly.FromYesNo(); return true; + case Chip item when fieldName == "tag": + checkValue = item.Tag; + return true; + case Condition item when fieldName == "mask": + checkValue = item.Mask; + return true; case Condition item when fieldName == "relation": checkValue = item.Relation?.AsStringValue(); return true; + case Condition item when fieldName == "tag": + checkValue = item.Tag; + return true; + case Condition item when fieldName == "value": + checkValue = item.Value; + return true; + + case Configuration item when fieldName == "mask": + checkValue = item.Mask; + return true; + case Configuration item when fieldName == "tag": + checkValue = item.Tag; + return true; case ConfLocation item when fieldName == "inverted": checkValue = item.Inverted.FromYesNo(); @@ -374,6 +404,9 @@ namespace SabreTools.Metadata.Filter case ConfSetting item when fieldName == "default": checkValue = item.Default.FromYesNo(); return true; + case ConfSetting item when fieldName == "value": + checkValue = item.Value; + return true; case Control item when fieldName == "type": checkValue = item.ControlType?.AsStringValue(); @@ -392,22 +425,34 @@ namespace SabreTools.Metadata.Filter case Device item when fieldName == "mandatory": checkValue = item.Mandatory.FromYesNo(); return true; + case Device item when fieldName == "tag": + checkValue = item.Tag; + return true; case DipLocation item when fieldName == "inverted": checkValue = item.Inverted.FromYesNo(); return true; - case DipLocation item when fieldName == "inverted": + case DipLocation item when fieldName == "invertwed": checkValue = item.Inverted.FromYesNo(); return true; case DipSwitch item when fieldName == "default": checkValue = item.Default.FromYesNo(); return true; + case DipSwitch item when fieldName == "mask": + checkValue = item.Mask; + return true; + case DipSwitch item when fieldName == "tag": + checkValue = item.Tag; + return true; case DipValue item when fieldName == "default": checkValue = item.Default.FromYesNo(); return true; + case DipValue item when fieldName == "value": + checkValue = item.Value; + return true; case Disk item when fieldName == "optional": checkValue = item.Optional.FromYesNo(); @@ -425,6 +470,9 @@ namespace SabreTools.Metadata.Filter case Display item when fieldName == "type": checkValue = item.DisplayType?.AsStringValue(); return true; + case Display item when fieldName == "tag": + checkValue = item.Tag; + return true; case Driver item when fieldName == "blit": checkValue = item.Blit?.AsStringValue(); @@ -469,6 +517,9 @@ namespace SabreTools.Metadata.Filter case Feature item when fieldName == "type": checkValue = item.FeatureType?.AsStringValue(); return true; + case Feature item when fieldName == "value": + checkValue = item.Value; + return true; case Header item when fieldName == "biosmode": checkValue = item.BiosMode.AsStringValue(); @@ -476,6 +527,9 @@ namespace SabreTools.Metadata.Filter case Header item when fieldName == "debug": checkValue = item.Debug.FromYesNo(); return true; + case Header item when fieldName == "description": + checkValue = item.Description; + return true; case Header item when fieldName == "forcemerging": checkValue = item.ForceMerging.AsStringValue(); return true; @@ -504,6 +558,10 @@ namespace SabreTools.Metadata.Filter checkValue = item.SampleMode.AsStringValue(); return true; + case Info item when fieldName == "value": + checkValue = item.Value; + return true; + case Input item when fieldName == "service": checkValue = item.Service.FromYesNo(); return true; @@ -511,6 +569,9 @@ namespace SabreTools.Metadata.Filter checkValue = item.Tilt.FromYesNo(); return true; + case Machine item when fieldName == "description": + checkValue = item.Description; + return true; case Machine item when fieldName == "isbios": checkValue = item.IsBios.FromYesNo(); return true; @@ -527,6 +588,10 @@ namespace SabreTools.Metadata.Filter checkValue = item.Supported?.AsStringValue(); return true; + case Port item when fieldName == "tag": + checkValue = item.Tag; + return true; + case RamOption item when fieldName == "default": checkValue = item.Default.FromYesNo(); return true; @@ -562,18 +627,34 @@ namespace SabreTools.Metadata.Filter case Rom item when fieldName == "status": checkValue = item.Status?.AsStringValue(); return true; + case Rom item when fieldName == "value": + checkValue = item.Value; + return true; + + case SharedFeat item when fieldName == "value": + checkValue = item.Value; + return true; case SlotOption item when fieldName == "default": checkValue = item.Default.FromYesNo(); return true; + case Software item when fieldName == "description": + checkValue = item.Description; + return true; case Software item when fieldName == "supported": checkValue = item.Supported?.AsStringValue(); return true; + case SoftwareList item when fieldName == "description": + checkValue = item.Description; + return true; case SoftwareList item when fieldName == "status": checkValue = item.Status?.AsStringValue(); return true; + case SoftwareList item when fieldName == "tag": + checkValue = item.Tag; + return true; case Video item when fieldName == "screen": checkValue = item.Screen?.AsStringValue(); diff --git a/SabreTools.Serialization.CrossModel.Test/ClrMameProTests.cs b/SabreTools.Serialization.CrossModel.Test/ClrMameProTests.cs index 7949b0c6..7b94d582 100644 --- a/SabreTools.Serialization.CrossModel.Test/ClrMameProTests.cs +++ b/SabreTools.Serialization.CrossModel.Test/ClrMameProTests.cs @@ -62,7 +62,7 @@ namespace SabreTools.Serialization.CrossModel.Test var cmp = new Data.Models.ClrMamePro.ClrMamePro { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", RootDir = "XXXXXX", Category = "XXXXXX", Version = "XXXXXX", @@ -90,7 +90,7 @@ namespace SabreTools.Serialization.CrossModel.Test var biosset = new Data.Models.ClrMamePro.BiosSet { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", Default = true, }; @@ -209,7 +209,7 @@ namespace SabreTools.Serialization.CrossModel.Test ? new Data.Models.ClrMamePro.Game() : new Data.Models.ClrMamePro.Machine(); gameBase.Name = "XXXXXX"; - gameBase.Description = "XXXXXX"; + gameBase.Description = "description"; gameBase.DriverStatus = "XXXXXX"; gameBase.Year = "XXXXXX"; gameBase.Manufacturer = "XXXXXX"; @@ -251,7 +251,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(cmp); Assert.Equal("XXXXXX", cmp.Name); - Assert.Equal("XXXXXX", cmp.Description); + Assert.Equal("description", cmp.Description); Assert.Equal("XXXXXX", cmp.RootDir); Assert.Equal("XXXXXX", cmp.Category); Assert.Equal("XXXXXX", cmp.Version); @@ -274,7 +274,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(gb); Assert.Equal("XXXXXX", gb.Name); - Assert.Equal("XXXXXX", gb.Description); + Assert.Equal("description", gb.Description); // Assert.Equal("XXXXXX", gb.DriverStatus); // TODO: Needs metadata mapping Assert.Equal("XXXXXX", gb.Year); Assert.Equal("XXXXXX", gb.Manufacturer); @@ -349,7 +349,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(biosset); Assert.Equal("XXXXXX", biosset.Name); - Assert.Equal("XXXXXX", biosset.Description); + Assert.Equal("description", biosset.Description); Assert.Equal(true, biosset.Default); } diff --git a/SabreTools.Serialization.CrossModel.Test/DosCenterTests.cs b/SabreTools.Serialization.CrossModel.Test/DosCenterTests.cs index f1ec413b..b43a73e0 100644 --- a/SabreTools.Serialization.CrossModel.Test/DosCenterTests.cs +++ b/SabreTools.Serialization.CrossModel.Test/DosCenterTests.cs @@ -36,7 +36,7 @@ namespace SabreTools.Serialization.CrossModel.Test var dc = new Data.Models.DosCenter.DosCenter { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", Version = "XXXXXX", Date = "XXXXXX", Author = "XXXXXX", @@ -73,7 +73,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(cmp); Assert.Equal("XXXXXX", cmp.Name); - Assert.Equal("XXXXXX", cmp.Description); + Assert.Equal("description", cmp.Description); Assert.Equal("XXXXXX", cmp.Version); Assert.Equal("XXXXXX", cmp.Date); Assert.Equal("XXXXXX", cmp.Author); diff --git a/SabreTools.Serialization.CrossModel.Test/ListxmlTests.cs b/SabreTools.Serialization.CrossModel.Test/ListxmlTests.cs index 734cfa18..83a24b68 100644 --- a/SabreTools.Serialization.CrossModel.Test/ListxmlTests.cs +++ b/SabreTools.Serialization.CrossModel.Test/ListxmlTests.cs @@ -66,7 +66,7 @@ namespace SabreTools.Serialization.CrossModel.Test var biosset = new Data.Models.Listxml.BiosSet { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", Default = true, }; @@ -112,7 +112,7 @@ namespace SabreTools.Serialization.CrossModel.Test var chip = new Data.Models.Listxml.Chip { Name = "XXXXXX", - Tag = "XXXXXX", + Tag = "tag", Type = Data.Models.Metadata.ChipType.CPU, SoundOnly = true, Clock = "XXXXXX", @@ -120,7 +120,7 @@ namespace SabreTools.Serialization.CrossModel.Test var display = new Data.Models.Listxml.Display { - Tag = "XXXXXX", + Tag = "tag", Type = Data.Models.Metadata.DisplayType.Vector, Rotate = "XXXXXX", FlipX = true, @@ -181,10 +181,10 @@ namespace SabreTools.Serialization.CrossModel.Test var condition = new Data.Models.Listxml.Condition { - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Relation = Data.Models.Metadata.Relation.Equal, - Value = "XXXXXX", + Value = "value", }; var diplocation = new Data.Models.Listxml.DipLocation @@ -197,7 +197,7 @@ namespace SabreTools.Serialization.CrossModel.Test var dipvalue = new Data.Models.Listxml.DipValue { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", Default = true, Condition = condition, }; @@ -205,8 +205,8 @@ namespace SabreTools.Serialization.CrossModel.Test var dipswitch = new Data.Models.Listxml.DipSwitch { Name = "XXXXXX", - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Condition = condition, DipLocation = [diplocation], DipValue = [dipvalue], @@ -222,7 +222,7 @@ namespace SabreTools.Serialization.CrossModel.Test var confsetting = new Data.Models.Listxml.ConfSetting { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", Default = true, Condition = condition, }; @@ -230,8 +230,8 @@ namespace SabreTools.Serialization.CrossModel.Test var configuration = new Data.Models.Listxml.Configuration { Name = "XXXXXX", - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Condition = condition, ConfLocation = [conflocation], ConfSetting = [confsetting], @@ -239,12 +239,12 @@ namespace SabreTools.Serialization.CrossModel.Test var analog = new Data.Models.Listxml.Analog { - Mask = "XXXXXX", + Mask = "mask", }; var port = new Data.Models.Listxml.Port { - Tag = "XXXXXX", + Tag = "tag", Analog = [analog], }; @@ -291,7 +291,7 @@ namespace SabreTools.Serialization.CrossModel.Test var device = new Data.Models.Listxml.Device { Type = Data.Models.Metadata.DeviceType.PunchTape, - Tag = "XXXXXX", + Tag = "tag", FixedImage = "XXXXXX", Mandatory = true, Interface = "XXXXXX", @@ -314,7 +314,7 @@ namespace SabreTools.Serialization.CrossModel.Test var softwarelist = new Data.Models.Listxml.SoftwareList { - Tag = "XXXXXX", + Tag = "tag", Name = "XXXXXX", Status = Data.Models.Metadata.SoftwareListStatus.Original, Filter = "XXXXXX", @@ -339,7 +339,7 @@ namespace SabreTools.Serialization.CrossModel.Test gameBase.CloneOf = "XXXXXX"; gameBase.RomOf = "XXXXXX"; gameBase.SampleOf = "XXXXXX"; - gameBase.Description = "XXXXXX"; + gameBase.Description = "description"; gameBase.Year = "XXXXXX"; gameBase.Manufacturer = "XXXXXX"; gameBase.History = "XXXXXX"; @@ -388,7 +388,7 @@ namespace SabreTools.Serialization.CrossModel.Test Assert.Equal("XXXXXX", gb.CloneOf); Assert.Equal("XXXXXX", gb.RomOf); Assert.Equal("XXXXXX", gb.SampleOf); - Assert.Equal("XXXXXX", gb.Description); + Assert.Equal("description", gb.Description); Assert.Equal("XXXXXX", gb.Year); Assert.Equal("XXXXXX", gb.Manufacturer); Assert.Equal("XXXXXX", gb.History); @@ -474,7 +474,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(biosset); Assert.Equal("XXXXXX", biosset.Name); - Assert.Equal("XXXXXX", biosset.Description); + Assert.Equal("description", biosset.Description); Assert.Equal(true, biosset.Default); } @@ -540,7 +540,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(chip); Assert.Equal("XXXXXX", chip.Name); - Assert.Equal("XXXXXX", chip.Tag); + Assert.Equal("tag", chip.Tag); Assert.Equal(Data.Models.Metadata.ChipType.CPU, chip.Type); Assert.Equal(true, chip.SoundOnly); Assert.Equal("XXXXXX", chip.Clock); @@ -552,7 +552,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.Display? display) { Assert.NotNull(display); - Assert.Equal("XXXXXX", display.Tag); + Assert.Equal("tag", display.Tag); Assert.Equal(Data.Models.Metadata.DisplayType.Vector, display.Type); Assert.Equal("XXXXXX", display.Rotate); Assert.Equal(true, display.FlipX); @@ -637,8 +637,8 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(dipswitch); Assert.Equal("XXXXXX", dipswitch.Name); - Assert.Equal("XXXXXX", dipswitch.Tag); - Assert.Equal("XXXXXX", dipswitch.Mask); + Assert.Equal("tag", dipswitch.Tag); + Assert.Equal("mask", dipswitch.Mask); Validate(dipswitch.Condition); Assert.NotNull(dipswitch.DipLocation); @@ -656,10 +656,10 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.Condition? condition) { Assert.NotNull(condition); - Assert.Equal("XXXXXX", condition.Tag); - Assert.Equal("XXXXXX", condition.Mask); + Assert.Equal("tag", condition.Tag); + Assert.Equal("mask", condition.Mask); Assert.Equal(Data.Models.Metadata.Relation.Equal, condition.Relation); - Assert.Equal("XXXXXX", condition.Value); + Assert.Equal("value", condition.Value); } /// @@ -680,7 +680,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(dipvalue); Assert.Equal("XXXXXX", dipvalue.Name); - Assert.Equal("XXXXXX", dipvalue.Value); + Assert.Equal("value", dipvalue.Value); Assert.Equal(true, dipvalue.Default); Validate(dipvalue.Condition); } @@ -692,8 +692,8 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(configuration); Assert.Equal("XXXXXX", configuration.Name); - Assert.Equal("XXXXXX", configuration.Tag); - Assert.Equal("XXXXXX", configuration.Mask); + Assert.Equal("tag", configuration.Tag); + Assert.Equal("mask", configuration.Mask); Validate(configuration.Condition); Assert.NotNull(configuration.ConfLocation); @@ -723,7 +723,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(confsetting); Assert.Equal("XXXXXX", confsetting.Name); - Assert.Equal("XXXXXX", confsetting.Value); + Assert.Equal("value", confsetting.Value); Assert.Equal(true, confsetting.Default); Validate(confsetting.Condition); } @@ -734,7 +734,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.Port? port) { Assert.NotNull(port); - Assert.Equal("XXXXXX", port.Tag); + Assert.Equal("tag", port.Tag); Assert.NotNull(port.Analog); var analog = Assert.Single(port.Analog); @@ -747,7 +747,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.Analog? analog) { Assert.NotNull(analog); - Assert.Equal("XXXXXX", analog.Mask); + Assert.Equal("mask", analog.Mask); } /// @@ -798,7 +798,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(device); Assert.Equal(Data.Models.Metadata.DeviceType.PunchTape, device.Type); - Assert.Equal("XXXXXX", device.Tag); + Assert.Equal("tag", device.Tag); Assert.Equal("XXXXXX", device.FixedImage); Assert.Equal(true, device.Mandatory); Assert.Equal("XXXXXX", device.Interface); @@ -858,7 +858,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.SoftwareList? softwarelist) { Assert.NotNull(softwarelist); - Assert.Equal("XXXXXX", softwarelist.Tag); + Assert.Equal("tag", softwarelist.Tag); Assert.Equal("XXXXXX", softwarelist.Name); Assert.Equal(Data.Models.Metadata.SoftwareListStatus.Original, softwarelist.Status); Assert.Equal("XXXXXX", softwarelist.Filter); diff --git a/SabreTools.Serialization.CrossModel.Test/LogiqxTests.cs b/SabreTools.Serialization.CrossModel.Test/LogiqxTests.cs index d375ac28..a09eaa2f 100644 --- a/SabreTools.Serialization.CrossModel.Test/LogiqxTests.cs +++ b/SabreTools.Serialization.CrossModel.Test/LogiqxTests.cs @@ -96,7 +96,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Id = "XXXXXX", Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", RootDir = "XXXXXX", Category = "XXXXXX", Version = "XXXXXX", @@ -141,7 +141,7 @@ namespace SabreTools.Serialization.CrossModel.Test var biosset = new Data.Models.Logiqx.BiosSet { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", Default = true, }; @@ -221,7 +221,7 @@ namespace SabreTools.Serialization.CrossModel.Test var softwarelist = new Data.Models.Logiqx.SoftwareList { - Tag = "XXXXXX", + Tag = "tag", Name = "XXXXXX", Status = Data.Models.Metadata.SoftwareListStatus.Original, Filter = "XXXXXX", @@ -244,7 +244,7 @@ namespace SabreTools.Serialization.CrossModel.Test gameBase.CloneOfId = "XXXXXX"; gameBase.Runnable = Data.Models.Metadata.Runnable.Yes; gameBase.Comment = ["XXXXXX"]; - gameBase.Description = "XXXXXX"; + gameBase.Description = "description"; gameBase.Year = "XXXXXX"; gameBase.Manufacturer = "XXXXXX"; gameBase.Publisher = "XXXXXX"; @@ -292,7 +292,7 @@ namespace SabreTools.Serialization.CrossModel.Test Assert.NotNull(header); Assert.Equal("XXXXXX", header.Id); Assert.Equal("XXXXXX", header.Name); - Assert.Equal("XXXXXX", header.Description); + Assert.Equal("description", header.Description); Assert.Equal("XXXXXX", header.RootDir); Assert.Equal("XXXXXX", header.Category); Assert.Equal("XXXXXX", header.Version); @@ -361,7 +361,7 @@ namespace SabreTools.Serialization.CrossModel.Test string comment = Assert.Single(gb.Comment); Assert.Equal("XXXXXX", comment); - Assert.Equal("XXXXXX", gb.Description); + Assert.Equal("description", gb.Description); Assert.Equal("XXXXXX", gb.Year); Assert.Equal("XXXXXX", gb.Manufacturer); Assert.Equal("XXXXXX", gb.Publisher); @@ -453,7 +453,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(biosset); Assert.Equal("XXXXXX", biosset.Name); - Assert.Equal("XXXXXX", biosset.Description); + Assert.Equal("description", biosset.Description); Assert.Equal(true, biosset.Default); } @@ -565,7 +565,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Logiqx.SoftwareList? softwarelist) { Assert.NotNull(softwarelist); - Assert.Equal("XXXXXX", softwarelist.Tag); + Assert.Equal("tag", softwarelist.Tag); Assert.Equal("XXXXXX", softwarelist.Name); Assert.Equal(Data.Models.Metadata.SoftwareListStatus.Original, softwarelist.Status); Assert.Equal("XXXXXX", softwarelist.Filter); diff --git a/SabreTools.Serialization.CrossModel.Test/M1Tests.cs b/SabreTools.Serialization.CrossModel.Test/M1Tests.cs index 57fe2ba8..ac29d7b6 100644 --- a/SabreTools.Serialization.CrossModel.Test/M1Tests.cs +++ b/SabreTools.Serialization.CrossModel.Test/M1Tests.cs @@ -62,7 +62,7 @@ namespace SabreTools.Serialization.CrossModel.Test var biosset = new Data.Models.Listxml.BiosSet { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", Default = true, }; @@ -108,7 +108,7 @@ namespace SabreTools.Serialization.CrossModel.Test var chip = new Data.Models.Listxml.Chip { Name = "XXXXXX", - Tag = "XXXXXX", + Tag = "tag", Type = Data.Models.Metadata.ChipType.CPU, SoundOnly = true, Clock = "XXXXXX", @@ -116,7 +116,7 @@ namespace SabreTools.Serialization.CrossModel.Test var display = new Data.Models.Listxml.Display { - Tag = "XXXXXX", + Tag = "tag", Type = Data.Models.Metadata.DisplayType.Vector, Rotate = "XXXXXX", FlipX = true, @@ -177,10 +177,10 @@ namespace SabreTools.Serialization.CrossModel.Test var condition = new Data.Models.Listxml.Condition { - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Relation = Data.Models.Metadata.Relation.Equal, - Value = "XXXXXX", + Value = "value", }; var diplocation = new Data.Models.Listxml.DipLocation @@ -193,7 +193,7 @@ namespace SabreTools.Serialization.CrossModel.Test var dipvalue = new Data.Models.Listxml.DipValue { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", Default = true, Condition = condition, }; @@ -201,8 +201,8 @@ namespace SabreTools.Serialization.CrossModel.Test var dipswitch = new Data.Models.Listxml.DipSwitch { Name = "XXXXXX", - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Condition = condition, DipLocation = [diplocation], DipValue = [dipvalue], @@ -218,7 +218,7 @@ namespace SabreTools.Serialization.CrossModel.Test var confsetting = new Data.Models.Listxml.ConfSetting { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", Default = true, Condition = condition, }; @@ -226,8 +226,8 @@ namespace SabreTools.Serialization.CrossModel.Test var configuration = new Data.Models.Listxml.Configuration { Name = "XXXXXX", - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Condition = condition, ConfLocation = [conflocation], ConfSetting = [confsetting], @@ -235,12 +235,12 @@ namespace SabreTools.Serialization.CrossModel.Test var analog = new Data.Models.Listxml.Analog { - Mask = "XXXXXX", + Mask = "mask", }; var port = new Data.Models.Listxml.Port { - Tag = "XXXXXX", + Tag = "tag", Analog = [analog], }; @@ -287,7 +287,7 @@ namespace SabreTools.Serialization.CrossModel.Test var device = new Data.Models.Listxml.Device { Type = Data.Models.Metadata.DeviceType.PunchTape, - Tag = "XXXXXX", + Tag = "tag", FixedImage = "XXXXXX", Mandatory = true, Interface = "XXXXXX", @@ -310,7 +310,7 @@ namespace SabreTools.Serialization.CrossModel.Test var softwarelist = new Data.Models.Listxml.SoftwareList { - Tag = "XXXXXX", + Tag = "tag", Name = "XXXXXX", Status = Data.Models.Metadata.SoftwareListStatus.Original, Filter = "XXXXXX", @@ -335,7 +335,7 @@ namespace SabreTools.Serialization.CrossModel.Test gameBase.CloneOf = "XXXXXX"; gameBase.RomOf = "XXXXXX"; gameBase.SampleOf = "XXXXXX"; - gameBase.Description = "XXXXXX"; + gameBase.Description = "description"; gameBase.Year = "XXXXXX"; gameBase.Manufacturer = "XXXXXX"; gameBase.History = "XXXXXX"; @@ -382,7 +382,7 @@ namespace SabreTools.Serialization.CrossModel.Test Assert.Equal("XXXXXX", gb.CloneOf); Assert.Equal("XXXXXX", gb.RomOf); Assert.Equal("XXXXXX", gb.SampleOf); - Assert.Equal("XXXXXX", gb.Description); + Assert.Equal("description", gb.Description); Assert.Equal("XXXXXX", gb.Year); Assert.Equal("XXXXXX", gb.Manufacturer); Assert.Equal("XXXXXX", gb.History); @@ -468,7 +468,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(biosset); Assert.Equal("XXXXXX", biosset.Name); - Assert.Equal("XXXXXX", biosset.Description); + Assert.Equal("description", biosset.Description); Assert.Equal(true, biosset.Default); } @@ -534,7 +534,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(chip); Assert.Equal("XXXXXX", chip.Name); - Assert.Equal("XXXXXX", chip.Tag); + Assert.Equal("tag", chip.Tag); Assert.Equal(Data.Models.Metadata.ChipType.CPU, chip.Type); Assert.Equal(true, chip.SoundOnly); Assert.Equal("XXXXXX", chip.Clock); @@ -546,7 +546,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.Display? display) { Assert.NotNull(display); - Assert.Equal("XXXXXX", display.Tag); + Assert.Equal("tag", display.Tag); Assert.Equal(Data.Models.Metadata.DisplayType.Vector, display.Type); Assert.Equal("XXXXXX", display.Rotate); Assert.Equal(true, display.FlipX); @@ -631,8 +631,8 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(dipswitch); Assert.Equal("XXXXXX", dipswitch.Name); - Assert.Equal("XXXXXX", dipswitch.Tag); - Assert.Equal("XXXXXX", dipswitch.Mask); + Assert.Equal("tag", dipswitch.Tag); + Assert.Equal("mask", dipswitch.Mask); Validate(dipswitch.Condition); Assert.NotNull(dipswitch.DipLocation); @@ -650,10 +650,10 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.Condition? condition) { Assert.NotNull(condition); - Assert.Equal("XXXXXX", condition.Tag); - Assert.Equal("XXXXXX", condition.Mask); + Assert.Equal("tag", condition.Tag); + Assert.Equal("mask", condition.Mask); Assert.Equal(Data.Models.Metadata.Relation.Equal, condition.Relation); - Assert.Equal("XXXXXX", condition.Value); + Assert.Equal("value", condition.Value); } /// @@ -674,7 +674,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(dipvalue); Assert.Equal("XXXXXX", dipvalue.Name); - Assert.Equal("XXXXXX", dipvalue.Value); + Assert.Equal("value", dipvalue.Value); Assert.Equal(true, dipvalue.Default); Validate(dipvalue.Condition); } @@ -686,8 +686,8 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(configuration); Assert.Equal("XXXXXX", configuration.Name); - Assert.Equal("XXXXXX", configuration.Tag); - Assert.Equal("XXXXXX", configuration.Mask); + Assert.Equal("tag", configuration.Tag); + Assert.Equal("mask", configuration.Mask); Validate(configuration.Condition); Assert.NotNull(configuration.ConfLocation); @@ -717,7 +717,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(confsetting); Assert.Equal("XXXXXX", confsetting.Name); - Assert.Equal("XXXXXX", confsetting.Value); + Assert.Equal("value", confsetting.Value); Assert.Equal(true, confsetting.Default); Validate(confsetting.Condition); } @@ -728,7 +728,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.Port? port) { Assert.NotNull(port); - Assert.Equal("XXXXXX", port.Tag); + Assert.Equal("tag", port.Tag); Assert.NotNull(port.Analog); var analog = Assert.Single(port.Analog); @@ -741,7 +741,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.Analog? analog) { Assert.NotNull(analog); - Assert.Equal("XXXXXX", analog.Mask); + Assert.Equal("mask", analog.Mask); } /// @@ -792,7 +792,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(device); Assert.Equal(Data.Models.Metadata.DeviceType.PunchTape, device.Type); - Assert.Equal("XXXXXX", device.Tag); + Assert.Equal("tag", device.Tag); Assert.Equal("XXXXXX", device.FixedImage); Assert.Equal(true, device.Mandatory); Assert.Equal("XXXXXX", device.Interface); @@ -852,7 +852,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.SoftwareList? softwarelist) { Assert.NotNull(softwarelist); - Assert.Equal("XXXXXX", softwarelist.Tag); + Assert.Equal("tag", softwarelist.Tag); Assert.Equal("XXXXXX", softwarelist.Name); Assert.Equal(Data.Models.Metadata.SoftwareListStatus.Original, softwarelist.Status); Assert.Equal("XXXXXX", softwarelist.Filter); diff --git a/SabreTools.Serialization.CrossModel.Test/MessTests.cs b/SabreTools.Serialization.CrossModel.Test/MessTests.cs index 778266fa..0d3321cd 100644 --- a/SabreTools.Serialization.CrossModel.Test/MessTests.cs +++ b/SabreTools.Serialization.CrossModel.Test/MessTests.cs @@ -62,7 +62,7 @@ namespace SabreTools.Serialization.CrossModel.Test var biosset = new Data.Models.Listxml.BiosSet { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", Default = true, }; @@ -108,7 +108,7 @@ namespace SabreTools.Serialization.CrossModel.Test var chip = new Data.Models.Listxml.Chip { Name = "XXXXXX", - Tag = "XXXXXX", + Tag = "tag", Type = Data.Models.Metadata.ChipType.CPU, SoundOnly = true, Clock = "XXXXXX", @@ -116,7 +116,7 @@ namespace SabreTools.Serialization.CrossModel.Test var display = new Data.Models.Listxml.Display { - Tag = "XXXXXX", + Tag = "tag", Type = Data.Models.Metadata.DisplayType.Vector, Rotate = "XXXXXX", FlipX = true, @@ -177,10 +177,10 @@ namespace SabreTools.Serialization.CrossModel.Test var condition = new Data.Models.Listxml.Condition { - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Relation = Data.Models.Metadata.Relation.Equal, - Value = "XXXXXX", + Value = "value", }; var diplocation = new Data.Models.Listxml.DipLocation @@ -193,7 +193,7 @@ namespace SabreTools.Serialization.CrossModel.Test var dipvalue = new Data.Models.Listxml.DipValue { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", Default = true, Condition = condition, }; @@ -201,8 +201,8 @@ namespace SabreTools.Serialization.CrossModel.Test var dipswitch = new Data.Models.Listxml.DipSwitch { Name = "XXXXXX", - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Condition = condition, DipLocation = [diplocation], DipValue = [dipvalue], @@ -218,7 +218,7 @@ namespace SabreTools.Serialization.CrossModel.Test var confsetting = new Data.Models.Listxml.ConfSetting { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", Default = true, Condition = condition, }; @@ -226,8 +226,8 @@ namespace SabreTools.Serialization.CrossModel.Test var configuration = new Data.Models.Listxml.Configuration { Name = "XXXXXX", - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Condition = condition, ConfLocation = [conflocation], ConfSetting = [confsetting], @@ -235,12 +235,12 @@ namespace SabreTools.Serialization.CrossModel.Test var analog = new Data.Models.Listxml.Analog { - Mask = "XXXXXX", + Mask = "mask", }; var port = new Data.Models.Listxml.Port { - Tag = "XXXXXX", + Tag = "tag", Analog = [analog], }; @@ -287,7 +287,7 @@ namespace SabreTools.Serialization.CrossModel.Test var device = new Data.Models.Listxml.Device { Type = Data.Models.Metadata.DeviceType.PunchTape, - Tag = "XXXXXX", + Tag = "tag", FixedImage = "XXXXXX", Mandatory = true, Interface = "XXXXXX", @@ -310,7 +310,7 @@ namespace SabreTools.Serialization.CrossModel.Test var softwarelist = new Data.Models.Listxml.SoftwareList { - Tag = "XXXXXX", + Tag = "tag", Name = "XXXXXX", Status = Data.Models.Metadata.SoftwareListStatus.Original, Filter = "XXXXXX", @@ -335,7 +335,7 @@ namespace SabreTools.Serialization.CrossModel.Test gameBase.CloneOf = "XXXXXX"; gameBase.RomOf = "XXXXXX"; gameBase.SampleOf = "XXXXXX"; - gameBase.Description = "XXXXXX"; + gameBase.Description = "description"; gameBase.Year = "XXXXXX"; gameBase.Manufacturer = "XXXXXX"; gameBase.History = "XXXXXX"; @@ -382,7 +382,7 @@ namespace SabreTools.Serialization.CrossModel.Test Assert.Equal("XXXXXX", gb.CloneOf); Assert.Equal("XXXXXX", gb.RomOf); Assert.Equal("XXXXXX", gb.SampleOf); - Assert.Equal("XXXXXX", gb.Description); + Assert.Equal("description", gb.Description); Assert.Equal("XXXXXX", gb.Year); Assert.Equal("XXXXXX", gb.Manufacturer); Assert.Equal("XXXXXX", gb.History); @@ -468,7 +468,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(biosset); Assert.Equal("XXXXXX", biosset.Name); - Assert.Equal("XXXXXX", biosset.Description); + Assert.Equal("description", biosset.Description); Assert.Equal(true, biosset.Default); } @@ -534,7 +534,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(chip); Assert.Equal("XXXXXX", chip.Name); - Assert.Equal("XXXXXX", chip.Tag); + Assert.Equal("tag", chip.Tag); Assert.Equal(Data.Models.Metadata.ChipType.CPU, chip.Type); Assert.Equal(true, chip.SoundOnly); Assert.Equal("XXXXXX", chip.Clock); @@ -546,7 +546,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.Display? display) { Assert.NotNull(display); - Assert.Equal("XXXXXX", display.Tag); + Assert.Equal("tag", display.Tag); Assert.Equal(Data.Models.Metadata.DisplayType.Vector, display.Type); Assert.Equal("XXXXXX", display.Rotate); Assert.Equal(true, display.FlipX); @@ -631,8 +631,8 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(dipswitch); Assert.Equal("XXXXXX", dipswitch.Name); - Assert.Equal("XXXXXX", dipswitch.Tag); - Assert.Equal("XXXXXX", dipswitch.Mask); + Assert.Equal("tag", dipswitch.Tag); + Assert.Equal("mask", dipswitch.Mask); Validate(dipswitch.Condition); Assert.NotNull(dipswitch.DipLocation); @@ -650,10 +650,10 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.Condition? condition) { Assert.NotNull(condition); - Assert.Equal("XXXXXX", condition.Tag); - Assert.Equal("XXXXXX", condition.Mask); + Assert.Equal("tag", condition.Tag); + Assert.Equal("mask", condition.Mask); Assert.Equal(Data.Models.Metadata.Relation.Equal, condition.Relation); - Assert.Equal("XXXXXX", condition.Value); + Assert.Equal("value", condition.Value); } /// @@ -674,7 +674,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(dipvalue); Assert.Equal("XXXXXX", dipvalue.Name); - Assert.Equal("XXXXXX", dipvalue.Value); + Assert.Equal("value", dipvalue.Value); Assert.Equal(true, dipvalue.Default); Validate(dipvalue.Condition); } @@ -686,8 +686,8 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(configuration); Assert.Equal("XXXXXX", configuration.Name); - Assert.Equal("XXXXXX", configuration.Tag); - Assert.Equal("XXXXXX", configuration.Mask); + Assert.Equal("tag", configuration.Tag); + Assert.Equal("mask", configuration.Mask); Validate(configuration.Condition); Assert.NotNull(configuration.ConfLocation); @@ -717,7 +717,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(confsetting); Assert.Equal("XXXXXX", confsetting.Name); - Assert.Equal("XXXXXX", confsetting.Value); + Assert.Equal("value", confsetting.Value); Assert.Equal(true, confsetting.Default); Validate(confsetting.Condition); } @@ -728,7 +728,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.Port? port) { Assert.NotNull(port); - Assert.Equal("XXXXXX", port.Tag); + Assert.Equal("tag", port.Tag); Assert.NotNull(port.Analog); var analog = Assert.Single(port.Analog); @@ -741,7 +741,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.Analog? analog) { Assert.NotNull(analog); - Assert.Equal("XXXXXX", analog.Mask); + Assert.Equal("mask", analog.Mask); } /// @@ -792,7 +792,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(device); Assert.Equal(Data.Models.Metadata.DeviceType.PunchTape, device.Type); - Assert.Equal("XXXXXX", device.Tag); + Assert.Equal("tag", device.Tag); Assert.Equal("XXXXXX", device.FixedImage); Assert.Equal(true, device.Mandatory); Assert.Equal("XXXXXX", device.Interface); @@ -852,7 +852,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.Listxml.SoftwareList? softwarelist) { Assert.NotNull(softwarelist); - Assert.Equal("XXXXXX", softwarelist.Tag); + Assert.Equal("tag", softwarelist.Tag); Assert.Equal("XXXXXX", softwarelist.Name); Assert.Equal(Data.Models.Metadata.SoftwareListStatus.Original, softwarelist.Status); Assert.Equal("XXXXXX", softwarelist.Filter); diff --git a/SabreTools.Serialization.CrossModel.Test/OfflineListTests.cs b/SabreTools.Serialization.CrossModel.Test/OfflineListTests.cs index a24d3aac..b2d42112 100644 --- a/SabreTools.Serialization.CrossModel.Test/OfflineListTests.cs +++ b/SabreTools.Serialization.CrossModel.Test/OfflineListTests.cs @@ -142,13 +142,13 @@ namespace SabreTools.Serialization.CrossModel.Test var find = new Data.Models.OfflineList.Find { Operation = "XXXXXX", - Value = "XXXXXX", + Value = "value", Content = "XXXXXX", }; var to = new Data.Models.OfflineList.To { - Value = "XXXXXX", + Value = "value", Default = true, Auto = "XXXXXX", Find = [find], @@ -338,7 +338,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.OfflineList.To? to) { Assert.NotNull(to); - Assert.Equal("XXXXXX", to.Value); + Assert.Equal("value", to.Value); Assert.Equal(true, to.Default); Assert.Equal("XXXXXX", to.Auto); @@ -354,7 +354,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(find); Assert.Equal("XXXXXX", find.Operation); - Assert.Equal("XXXXXX", find.Value); + Assert.Equal("value", find.Value); Assert.Equal("XXXXXX", find.Content); } diff --git a/SabreTools.Serialization.CrossModel.Test/OpenMSXTests.cs b/SabreTools.Serialization.CrossModel.Test/OpenMSXTests.cs index 0dae26aa..10bb6445 100644 --- a/SabreTools.Serialization.CrossModel.Test/OpenMSXTests.cs +++ b/SabreTools.Serialization.CrossModel.Test/OpenMSXTests.cs @@ -36,7 +36,7 @@ namespace SabreTools.Serialization.CrossModel.Test { var original = new Data.Models.OpenMSX.Original { - Value = "XXXXXX", + Value = "value", Content = "XXXXXX", }; @@ -137,7 +137,7 @@ namespace SabreTools.Serialization.CrossModel.Test private static void Validate(Data.Models.OpenMSX.Original? original) { Assert.NotNull(original); - Assert.Equal("XXXXXX", original.Value); + Assert.Equal("value", original.Value); Assert.Equal("XXXXXX", original.Content); } diff --git a/SabreTools.Serialization.CrossModel.Test/RomCenterTests.cs b/SabreTools.Serialization.CrossModel.Test/RomCenterTests.cs index 7f2f0fb1..86bfa6c5 100644 --- a/SabreTools.Serialization.CrossModel.Test/RomCenterTests.cs +++ b/SabreTools.Serialization.CrossModel.Test/RomCenterTests.cs @@ -63,7 +63,7 @@ namespace SabreTools.Serialization.CrossModel.Test ParentName = "XXXXXX", ParentDescription = "XXXXXX", GameName = "XXXXXX", - GameDescription = "XXXXXX", + GameDescription = "description", RomName = "XXXXXX", RomCRC = "XXXXXX", RomSize = "XXXXXX", @@ -142,7 +142,7 @@ namespace SabreTools.Serialization.CrossModel.Test Assert.Equal("XXXXXX", rom.ParentName); Assert.Null(rom.ParentDescription); // This is unmappable Assert.Equal("XXXXXX", rom.GameName); - Assert.Equal("XXXXXX", rom.GameDescription); + Assert.Equal("description", rom.GameDescription); Assert.Equal("XXXXXX", rom.RomName); Assert.Equal("XXXXXX", rom.RomCRC); Assert.Equal("XXXXXX", rom.RomSize); diff --git a/SabreTools.Serialization.CrossModel.Test/SeparatedValueTests.cs b/SabreTools.Serialization.CrossModel.Test/SeparatedValueTests.cs index 8b1da955..c64a9ca1 100644 --- a/SabreTools.Serialization.CrossModel.Test/SeparatedValueTests.cs +++ b/SabreTools.Serialization.CrossModel.Test/SeparatedValueTests.cs @@ -42,9 +42,9 @@ namespace SabreTools.Serialization.CrossModel.Test { FileName = "XXXXXX", InternalName = "XXXXXX", - Description = "XXXXXX", + Description = "description", GameName = "XXXXXX", - GameDescription = "XXXXXX", + GameDescription = "description", Type = "disk", DiskName = "XXXXXX", MD5 = "XXXXXX", @@ -56,9 +56,9 @@ namespace SabreTools.Serialization.CrossModel.Test { FileName = "XXXXXX", InternalName = "XXXXXX", - Description = "XXXXXX", + Description = "description", GameName = "XXXXXX", - GameDescription = "XXXXXX", + GameDescription = "description", Type = "media", DiskName = "XXXXXX", MD5 = "XXXXXX", @@ -71,9 +71,9 @@ namespace SabreTools.Serialization.CrossModel.Test { FileName = "XXXXXX", InternalName = "XXXXXX", - Description = "XXXXXX", + Description = "description", GameName = "XXXXXX", - GameDescription = "XXXXXX", + GameDescription = "description", Type = "rom", RomName = "XXXXXX", Size = "XXXXXX", @@ -112,9 +112,9 @@ namespace SabreTools.Serialization.CrossModel.Test Assert.NotNull(row); Assert.Equal("XXXXXX", row.FileName); Assert.Equal("XXXXXX", row.InternalName); - Assert.Equal("XXXXXX", row.Description); + Assert.Equal("description", row.Description); Assert.Equal("XXXXXX", row.GameName); - Assert.Equal("XXXXXX", row.GameDescription); + Assert.Equal("description", row.GameDescription); Assert.Equal("disk", row.Type); Assert.Null(row.RomName); Assert.Equal("XXXXXX", row.DiskName); @@ -137,9 +137,9 @@ namespace SabreTools.Serialization.CrossModel.Test Assert.NotNull(row); Assert.Equal("XXXXXX", row.FileName); Assert.Equal("XXXXXX", row.InternalName); - Assert.Equal("XXXXXX", row.Description); + Assert.Equal("description", row.Description); Assert.Equal("XXXXXX", row.GameName); - Assert.Equal("XXXXXX", row.GameDescription); + Assert.Equal("description", row.GameDescription); Assert.Equal("media", row.Type); Assert.Null(row.RomName); Assert.Equal("XXXXXX", row.DiskName); @@ -162,9 +162,9 @@ namespace SabreTools.Serialization.CrossModel.Test Assert.NotNull(row); Assert.Equal("XXXXXX", row.FileName); Assert.Equal("XXXXXX", row.InternalName); - Assert.Equal("XXXXXX", row.Description); + Assert.Equal("description", row.Description); Assert.Equal("XXXXXX", row.GameName); - Assert.Equal("XXXXXX", row.GameDescription); + Assert.Equal("description", row.GameDescription); Assert.Equal("rom", row.Type); Assert.Equal("XXXXXX", row.RomName); Assert.Null(row.DiskName); diff --git a/SabreTools.Serialization.CrossModel.Test/SoftwareListTests.cs b/SabreTools.Serialization.CrossModel.Test/SoftwareListTests.cs index d6130c52..f2805167 100644 --- a/SabreTools.Serialization.CrossModel.Test/SoftwareListTests.cs +++ b/SabreTools.Serialization.CrossModel.Test/SoftwareListTests.cs @@ -23,7 +23,7 @@ namespace SabreTools.Serialization.CrossModel.Test // Validate the data Assert.NotNull(newSl); Assert.Equal("XXXXXX", newSl.Name); - Assert.Equal("XXXXXX", newSl.Description); + Assert.Equal("description", newSl.Description); Assert.Equal("XXXXXX", newSl.Notes); Assert.NotNull(newSl.Software); @@ -39,19 +39,19 @@ namespace SabreTools.Serialization.CrossModel.Test var info = new Data.Models.SoftwareList.Info { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", }; var sharedfeat = new Data.Models.SoftwareList.SharedFeat { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", }; var feature = new Data.Models.SoftwareList.Feature { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", }; var rom = new Data.Models.SoftwareList.Rom @@ -62,7 +62,7 @@ namespace SabreTools.Serialization.CrossModel.Test CRC = "XXXXXX", SHA1 = "XXXXXX", Offset = "XXXXXX", - Value = "XXXXXX", + Value = "value", Status = Data.Models.Metadata.ItemStatus.Good, LoadFlag = Data.Models.Metadata.LoadFlag.Load16Byte, }; @@ -94,15 +94,15 @@ namespace SabreTools.Serialization.CrossModel.Test var dipvalue = new Data.Models.SoftwareList.DipValue { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", Default = true, }; var dipswitch = new Data.Models.SoftwareList.DipSwitch { Name = "XXXXXX", - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", DipValue = [dipvalue], }; @@ -121,7 +121,7 @@ namespace SabreTools.Serialization.CrossModel.Test Name = "XXXXXX", CloneOf = "XXXXXX", Supported = Data.Models.Metadata.Supported.Yes, - Description = "XXXXXX", + Description = "description", Year = "XXXXXX", Publisher = "XXXXXX", Notes = "XXXXXX", @@ -133,7 +133,7 @@ namespace SabreTools.Serialization.CrossModel.Test return new Data.Models.SoftwareList.SoftwareList { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", Notes = "XXXXXX", Software = [software], }; @@ -148,7 +148,7 @@ namespace SabreTools.Serialization.CrossModel.Test Assert.Equal("XXXXXX", software.Name); Assert.Equal("XXXXXX", software.CloneOf); Assert.Equal(Data.Models.Metadata.Supported.Yes, software.Supported); - Assert.Equal("XXXXXX", software.Description); + Assert.Equal("description", software.Description); Assert.Equal("XXXXXX", software.Year); Assert.Equal("XXXXXX", software.Publisher); Assert.Equal("XXXXXX", software.Notes); @@ -173,7 +173,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(info); Assert.Equal("XXXXXX", info.Name); - Assert.Equal("XXXXXX", info.Value); + Assert.Equal("value", info.Value); } /// @@ -183,7 +183,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(sharedfeat); Assert.Equal("XXXXXX", sharedfeat.Name); - Assert.Equal("XXXXXX", sharedfeat.Value); + Assert.Equal("value", sharedfeat.Value); } /// @@ -219,7 +219,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(feature); Assert.Equal("XXXXXX", feature.Name); - Assert.Equal("XXXXXX", feature.Value); + Assert.Equal("value", feature.Value); } /// @@ -250,7 +250,7 @@ namespace SabreTools.Serialization.CrossModel.Test Assert.Equal("XXXXXX", rom.CRC); Assert.Equal("XXXXXX", rom.SHA1); Assert.Equal("XXXXXX", rom.Offset); - Assert.Equal("XXXXXX", rom.Value); + Assert.Equal("value", rom.Value); Assert.Equal(Data.Models.Metadata.ItemStatus.Good, rom.Status); Assert.Equal(Data.Models.Metadata.LoadFlag.Load16Byte, rom.LoadFlag); } @@ -288,8 +288,8 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(dipswitch); Assert.Equal("XXXXXX", dipswitch.Name); - Assert.Equal("XXXXXX", dipswitch.Tag); - Assert.Equal("XXXXXX", dipswitch.Mask); + Assert.Equal("tag", dipswitch.Tag); + Assert.Equal("mask", dipswitch.Mask); Assert.NotNull(dipswitch.DipValue); var dipvalue = Assert.Single(dipswitch.DipValue); @@ -303,7 +303,7 @@ namespace SabreTools.Serialization.CrossModel.Test { Assert.NotNull(dipvalue); Assert.Equal("XXXXXX", dipvalue.Name); - Assert.Equal("XXXXXX", dipvalue.Value); + Assert.Equal("value", dipvalue.Value); Assert.Equal(true, dipvalue.Default); } } diff --git a/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs b/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs index 6ceb389c..940c75f6 100644 --- a/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs @@ -44,7 +44,7 @@ namespace SabreTools.Serialization.CrossModel var clrMamePro = new Data.Models.ClrMamePro.ClrMamePro { Name = item.Name, - Description = item.ReadString(Data.Models.Metadata.Header.DescriptionKey), + Description = item.Description, RootDir = item.ReadString(Data.Models.Metadata.Header.RootDirKey), Category = item.ReadString(Data.Models.Metadata.Header.CategoryKey), Version = item.ReadString(Data.Models.Metadata.Header.VersionKey), @@ -70,7 +70,7 @@ namespace SabreTools.Serialization.CrossModel GameBase gameBase = game ? new Game() : new Machine(); gameBase.Name = item.Name; - gameBase.Description = item.ReadString(Data.Models.Metadata.Machine.DescriptionKey); + gameBase.Description = item.Description; // gameBase.DriverStatus = item.ReadString(Data.Models.Metadata.Machine.DriverKey); // TODO: Needs metadata mapping gameBase.Year = item.ReadString(Data.Models.Metadata.Machine.YearKey); gameBase.Manufacturer = item.ReadString(Data.Models.Metadata.Machine.ManufacturerKey); @@ -154,7 +154,7 @@ namespace SabreTools.Serialization.CrossModel var biosset = new BiosSet { Name = item.Name, - Description = item.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey), + Description = item.Description, Default = item.Default, }; return biosset; diff --git a/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs b/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs index a4291784..70807e57 100644 --- a/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs @@ -36,7 +36,7 @@ namespace SabreTools.Serialization.CrossModel var header = new Data.Models.Metadata.Header { Name = item.Name, - [Data.Models.Metadata.Header.DescriptionKey] = item.Description, + Description = item.Description, [Data.Models.Metadata.Header.RootDirKey] = item.RootDir, [Data.Models.Metadata.Header.CategoryKey] = item.Category, [Data.Models.Metadata.Header.VersionKey] = item.Version, @@ -65,7 +65,7 @@ namespace SabreTools.Serialization.CrossModel var machine = new Data.Models.Metadata.Machine { Name = item.Name, - [Data.Models.Metadata.Machine.DescriptionKey] = item.Description, + Description = item.Description, // [Data.Models.Metadata.Machine.DriverKey] = item.DriverStatus, // TODO: Needs metadata mapping [Data.Models.Metadata.Machine.YearKey] = item.Year, [Data.Models.Metadata.Machine.ManufacturerKey] = item.Manufacturer, @@ -167,7 +167,7 @@ namespace SabreTools.Serialization.CrossModel var biosset = new Data.Models.Metadata.BiosSet { Name = item.Name, - [Data.Models.Metadata.BiosSet.DescriptionKey] = item.Description, + Description = item.Description, Default = item.Default, }; return biosset; diff --git a/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs b/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs index 8e3f3259..9e949b31 100644 --- a/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs @@ -32,7 +32,7 @@ namespace SabreTools.Serialization.CrossModel var dosCenter = new Data.Models.DosCenter.DosCenter { Name = item.Name, - Description = item.ReadString(Data.Models.Metadata.Header.DescriptionKey), + Description = item.Description, Version = item.ReadString(Data.Models.Metadata.Header.VersionKey), Date = item.ReadString(Data.Models.Metadata.Header.DateKey), Author = item.ReadString(Data.Models.Metadata.Header.AuthorKey), diff --git a/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs b/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs index 1342d1ec..84fabfa2 100644 --- a/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs @@ -33,7 +33,7 @@ namespace SabreTools.Serialization.CrossModel var header = new Data.Models.Metadata.Header { Name = item.Name, - [Data.Models.Metadata.Header.DescriptionKey] = item.Description, + Description = item.Description, [Data.Models.Metadata.Header.VersionKey] = item.Version, [Data.Models.Metadata.Header.DateKey] = item.Date, [Data.Models.Metadata.Header.AuthorKey] = item.Author, diff --git a/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs b/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs index 4e17acd2..3ff69276 100644 --- a/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs @@ -52,7 +52,7 @@ namespace SabreTools.Serialization.CrossModel CloneOf = item.ReadString(Data.Models.Metadata.Machine.CloneOfKey), RomOf = item.ReadString(Data.Models.Metadata.Machine.RomOfKey), SampleOf = item.ReadString(Data.Models.Metadata.Machine.SampleOfKey), - Description = item.ReadString(Data.Models.Metadata.Machine.DescriptionKey), + Description = item.Description, Year = item.ReadString(Data.Models.Metadata.Machine.YearKey), Manufacturer = item.ReadString(Data.Models.Metadata.Machine.ManufacturerKey), History = item.ReadString(Data.Models.Metadata.Machine.HistoryKey), @@ -166,7 +166,7 @@ namespace SabreTools.Serialization.CrossModel { var analog = new Analog { - Mask = item.ReadString(Data.Models.Metadata.Analog.MaskKey), + Mask = item.Mask, }; return analog; } @@ -179,7 +179,7 @@ namespace SabreTools.Serialization.CrossModel var biosset = new BiosSet { Name = item.Name, - Description = item.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey), + Description = item.Description, Default = item.Default, }; return biosset; @@ -193,7 +193,7 @@ namespace SabreTools.Serialization.CrossModel var chip = new Chip { Name = item.Name, - Tag = item.ReadString(Data.Models.Metadata.Chip.TagKey), + Tag = item.Tag, Type = item.ChipType, SoundOnly = item.SoundOnly, Clock = item.ReadString(Data.Models.Metadata.Chip.ClockKey), @@ -208,10 +208,10 @@ namespace SabreTools.Serialization.CrossModel { var condition = new Condition { - Tag = item.ReadString(Data.Models.Metadata.Condition.TagKey), - Mask = item.ReadString(Data.Models.Metadata.Condition.MaskKey), + Tag = item.Tag, + Mask = item.Mask, Relation = item.Relation, - Value = item.ReadString(Data.Models.Metadata.Condition.ValueKey), + Value = item.Value, }; return condition; } @@ -224,8 +224,8 @@ namespace SabreTools.Serialization.CrossModel var configuration = new Configuration { Name = item.Name, - Tag = item.ReadString(Data.Models.Metadata.Configuration.TagKey), - Mask = item.ReadString(Data.Models.Metadata.Configuration.MaskKey), + Tag = item.Tag, + Mask = item.Mask, }; var condition = item.Read(Data.Models.Metadata.Configuration.ConditionKey); @@ -265,7 +265,7 @@ namespace SabreTools.Serialization.CrossModel var confSetting = new ConfSetting { Name = item.Name, - Value = item.ReadString(Data.Models.Metadata.ConfSetting.ValueKey), + Value = item.Value, Default = item.Default, }; @@ -307,7 +307,7 @@ namespace SabreTools.Serialization.CrossModel var device = new Device { Type = item.DeviceType, - Tag = item.ReadString(Data.Models.Metadata.Device.TagKey), + Tag = item.Tag, FixedImage = item.ReadString(Data.Models.Metadata.Device.FixedImageKey), Mandatory = item.Mandatory, Interface = item.ReadString(Data.Models.Metadata.Device.InterfaceKey), @@ -358,8 +358,8 @@ namespace SabreTools.Serialization.CrossModel var dipSwitch = new DipSwitch { Name = item.Name, - Tag = item.ReadString(Data.Models.Metadata.DipSwitch.TagKey), - Mask = item.ReadString(Data.Models.Metadata.DipSwitch.MaskKey), + Tag = item.Tag, + Mask = item.Mask, }; var condition = item.Read(Data.Models.Metadata.DipSwitch.ConditionKey); @@ -385,7 +385,7 @@ namespace SabreTools.Serialization.CrossModel var dipValue = new DipValue { Name = item.Name, - Value = item.ReadString(Data.Models.Metadata.DipValue.ValueKey), + Value = item.Value, Default = item.Default, }; @@ -423,7 +423,7 @@ namespace SabreTools.Serialization.CrossModel { var display = new Display { - Tag = item.ReadString(Data.Models.Metadata.Display.TagKey), + Tag = item.Tag, Type = item.DisplayType, Rotate = item.ReadString(Data.Models.Metadata.Display.RotateKey), FlipX = item.FlipX, @@ -534,7 +534,7 @@ namespace SabreTools.Serialization.CrossModel { var port = new Port { - Tag = item.ReadString(Data.Models.Metadata.Port.TagKey), + Tag = item.Tag, }; var analogs = item.Read(Data.Models.Metadata.Port.AnalogKey); @@ -631,7 +631,7 @@ namespace SabreTools.Serialization.CrossModel { var softwareList = new Data.Models.Listxml.SoftwareList { - Tag = item.ReadString(Data.Models.Metadata.SoftwareList.TagKey), + Tag = item.Tag, Name = item.Name, Status = item.Status, Filter = item.ReadString(Data.Models.Metadata.SoftwareList.FilterKey), diff --git a/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs b/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs index 01d8fa7e..f58abe2b 100644 --- a/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs @@ -55,7 +55,7 @@ namespace SabreTools.Serialization.CrossModel [Data.Models.Metadata.Machine.CloneOfKey] = item.CloneOf, [Data.Models.Metadata.Machine.RomOfKey] = item.RomOf, [Data.Models.Metadata.Machine.SampleOfKey] = item.SampleOf, - [Data.Models.Metadata.Machine.DescriptionKey] = item.Description, + Description = item.Description, [Data.Models.Metadata.Machine.YearKey] = item.Year, [Data.Models.Metadata.Machine.ManufacturerKey] = item.Manufacturer, [Data.Models.Metadata.Machine.HistoryKey] = item.History, @@ -199,7 +199,7 @@ namespace SabreTools.Serialization.CrossModel { var analog = new Data.Models.Metadata.Analog { - [Data.Models.Metadata.Analog.MaskKey] = item.Mask, + Mask = item.Mask, }; return analog; } @@ -212,7 +212,7 @@ namespace SabreTools.Serialization.CrossModel var biosset = new Data.Models.Metadata.BiosSet { Name = item.Name, - [Data.Models.Metadata.BiosSet.DescriptionKey] = item.Description, + Description = item.Description, Default = item.Default, }; return biosset; @@ -226,7 +226,7 @@ namespace SabreTools.Serialization.CrossModel var chip = new Data.Models.Metadata.Chip { Name = item.Name, - [Data.Models.Metadata.Chip.TagKey] = item.Tag, + Tag = item.Tag, ChipType = item.Type, SoundOnly = item.SoundOnly, [Data.Models.Metadata.Chip.ClockKey] = item.Clock, @@ -241,10 +241,10 @@ namespace SabreTools.Serialization.CrossModel { var condition = new Data.Models.Metadata.Condition { - [Data.Models.Metadata.Condition.TagKey] = item.Tag, - [Data.Models.Metadata.Condition.MaskKey] = item.Mask, + Tag = item.Tag, + Mask = item.Mask, Relation = item.Relation, - [Data.Models.Metadata.Condition.ValueKey] = item.Value, + Value = item.Value, }; return condition; } @@ -257,8 +257,8 @@ namespace SabreTools.Serialization.CrossModel var configuration = new Data.Models.Metadata.Configuration { Name = item.Name, - [Data.Models.Metadata.Configuration.TagKey] = item.Tag, - [Data.Models.Metadata.Configuration.MaskKey] = item.Mask, + Tag = item.Tag, + Mask = item.Mask, }; if (item.Condition is not null) @@ -301,7 +301,7 @@ namespace SabreTools.Serialization.CrossModel var confSetting = new Data.Models.Metadata.ConfSetting { Name = item.Name, - [Data.Models.Metadata.ConfSetting.ValueKey] = item.Value, + Value = item.Value, Default = item.Default, }; @@ -342,7 +342,7 @@ namespace SabreTools.Serialization.CrossModel var device = new Data.Models.Metadata.Device { DeviceType = item.Type, - [Data.Models.Metadata.Device.TagKey] = item.Tag, + Tag = item.Tag, [Data.Models.Metadata.Device.FixedImageKey] = item.FixedImage, Mandatory = item.Mandatory, [Data.Models.Metadata.Device.InterfaceKey] = item.Interface, @@ -394,8 +394,8 @@ namespace SabreTools.Serialization.CrossModel var dipSwitch = new Data.Models.Metadata.DipSwitch { Name = item.Name, - [Data.Models.Metadata.DipSwitch.TagKey] = item.Tag, - [Data.Models.Metadata.DipSwitch.MaskKey] = item.Mask, + Tag = item.Tag, + Mask = item.Mask, }; if (item.Condition is not null) @@ -424,7 +424,7 @@ namespace SabreTools.Serialization.CrossModel var dipValue = new Data.Models.Metadata.DipValue { Name = item.Name, - [Data.Models.Metadata.DipValue.ValueKey] = item.Value, + Value = item.Value, Default = item.Default, }; @@ -461,7 +461,7 @@ namespace SabreTools.Serialization.CrossModel { var display = new Data.Models.Metadata.Display { - [Data.Models.Metadata.Display.TagKey] = item.Tag, + Tag = item.Tag, DisplayType = item.Type, [Data.Models.Metadata.Display.RotateKey] = item.Rotate, FlipX = item.FlipX, @@ -571,7 +571,7 @@ namespace SabreTools.Serialization.CrossModel { var port = new Data.Models.Metadata.Port { - [Data.Models.Metadata.Port.TagKey] = item.Tag, + Tag = item.Tag, }; if (item.Analog is not null && item.Analog.Length > 0) @@ -672,7 +672,7 @@ namespace SabreTools.Serialization.CrossModel { var softwareList = new Data.Models.Metadata.SoftwareList { - [Data.Models.Metadata.SoftwareList.TagKey] = item.Tag, + Tag = item.Tag, Name = item.Name, Status = item.Status, [Data.Models.Metadata.SoftwareList.FilterKey] = item.Filter, diff --git a/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs b/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs index dbead2e5..baa62d3e 100644 --- a/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs @@ -43,7 +43,7 @@ namespace SabreTools.Serialization.CrossModel { Id = item.ReadString(Data.Models.Metadata.Header.IdKey), Name = item.Name, - Description = item.ReadString(Data.Models.Metadata.Header.DescriptionKey), + Description = item.Description, RootDir = item.ReadString(Data.Models.Metadata.Header.RootDirKey), Category = item.ReadString(Data.Models.Metadata.Header.CategoryKey), Version = item.ReadString(Data.Models.Metadata.Header.VersionKey), @@ -134,7 +134,7 @@ namespace SabreTools.Serialization.CrossModel gameBase.CloneOfId = item.ReadString(Data.Models.Metadata.Machine.CloneOfIdKey); gameBase.Runnable = item.Runnable; gameBase.Comment = item.ReadStringArray(Data.Models.Metadata.Machine.CommentKey); - gameBase.Description = item.ReadString(Data.Models.Metadata.Machine.DescriptionKey); + gameBase.Description = item.Description; gameBase.Year = item.ReadString(Data.Models.Metadata.Machine.YearKey); gameBase.Manufacturer = item.ReadString(Data.Models.Metadata.Machine.ManufacturerKey); gameBase.Publisher = item.ReadString(Data.Models.Metadata.Machine.PublisherKey); @@ -207,7 +207,7 @@ namespace SabreTools.Serialization.CrossModel var biosset = new BiosSet { Name = item.Name, - Description = item.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey), + Description = item.Description, Default = item.Default, }; return biosset; @@ -347,7 +347,7 @@ namespace SabreTools.Serialization.CrossModel { var softwareList = new Data.Models.Logiqx.SoftwareList { - Tag = item.ReadString(Data.Models.Metadata.SoftwareList.TagKey), + Tag = item.Tag, Name = item.Name, Status = item.Status, Filter = item.ReadString(Data.Models.Metadata.SoftwareList.FilterKey), diff --git a/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs b/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs index 631990fd..21cfb164 100644 --- a/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs @@ -55,7 +55,7 @@ namespace SabreTools.Serialization.CrossModel { [Data.Models.Metadata.Header.IdKey] = item.Id, Name = item.Name, - [Data.Models.Metadata.Header.DescriptionKey] = item.Description, + Description = item.Description, [Data.Models.Metadata.Header.RootDirKey] = item.RootDir, [Data.Models.Metadata.Header.CategoryKey] = item.Category, [Data.Models.Metadata.Header.VersionKey] = item.Version, @@ -140,7 +140,7 @@ namespace SabreTools.Serialization.CrossModel [Data.Models.Metadata.Machine.CloneOfIdKey] = item.CloneOfId, Runnable = item.Runnable, [Data.Models.Metadata.Machine.CommentKey] = item.Comment, - [Data.Models.Metadata.Machine.DescriptionKey] = item.Description, + Description = item.Description, [Data.Models.Metadata.Machine.YearKey] = item.Year, [Data.Models.Metadata.Machine.ManufacturerKey] = item.Manufacturer, [Data.Models.Metadata.Machine.PublisherKey] = item.Publisher, @@ -201,7 +201,7 @@ namespace SabreTools.Serialization.CrossModel var biosset = new Data.Models.Metadata.BiosSet { Name = item.Name, - [Data.Models.Metadata.BiosSet.DescriptionKey] = item.Description, + Description = item.Description, Default = item.Default, }; return biosset; @@ -341,7 +341,7 @@ namespace SabreTools.Serialization.CrossModel { var softwareList = new Data.Models.Metadata.SoftwareList { - [Data.Models.Metadata.SoftwareList.TagKey] = item.Tag, + Tag = item.Tag, Name = item.Name, Status = item.Status, [Data.Models.Metadata.SoftwareList.FilterKey] = item.Filter, diff --git a/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs b/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs index cf6ff86a..ddadc837 100644 --- a/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs @@ -101,7 +101,7 @@ namespace SabreTools.Serialization.CrossModel ParentName = parent.ReadString(Data.Models.Metadata.Machine.CloneOfKey), //ParentDescription = parent.ReadString(Data.Models.Metadata.Machine.ParentDescriptionKey), // This is unmappable GameName = parent.Name, - GameDescription = parent.ReadString(Data.Models.Metadata.Machine.DescriptionKey), + GameDescription = parent.Description, RomName = item.Name, RomCRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey), RomSize = item.ReadString(Data.Models.Metadata.Rom.SizeKey), diff --git a/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs b/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs index ef281c82..1de290bb 100644 --- a/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs @@ -74,7 +74,7 @@ namespace SabreTools.Serialization.CrossModel [Data.Models.Metadata.Machine.CloneOfKey] = item.ParentName, //[Data.Models.Metadata.Machine.ParentDescriptionKey] = item.ParentDescription, // This is unmappable Name = item.GameName, - [Data.Models.Metadata.Machine.DescriptionKey] = item.GameDescription, + Description = item.GameDescription, [Data.Models.Metadata.Machine.RomKey] = new Data.Models.Metadata.Rom[] { ConvertToInternalModel(item) }, }; diff --git a/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs b/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs index a5467b35..5f6c3d09 100644 --- a/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs @@ -78,9 +78,9 @@ namespace SabreTools.Serialization.CrossModel { FileName = header?.ReadString("FILENAME"), // TODO: Make this an actual key to retrieve InternalName = header?.Name, - Description = header?.ReadString(Data.Models.Metadata.Header.DescriptionKey), + Description = header?.Description, GameName = parent.Name, - GameDescription = parent.ReadString(Data.Models.Metadata.Machine.DescriptionKey), + GameDescription = parent.Description, Type = "disk", RomName = null, DiskName = item.Name, @@ -106,9 +106,9 @@ namespace SabreTools.Serialization.CrossModel { FileName = header?.ReadString("FILENAME"), // TODO: Make this an actual key to retrieve on an item -- OriginalFilename InternalName = header?.Name, - Description = header?.ReadString(Data.Models.Metadata.Header.DescriptionKey), + Description = header?.Description, GameName = parent.Name, - GameDescription = parent.ReadString(Data.Models.Metadata.Machine.DescriptionKey), + GameDescription = parent.Description, Type = "media", RomName = null, DiskName = item.Name, @@ -133,9 +133,9 @@ namespace SabreTools.Serialization.CrossModel { FileName = header?.ReadString("FILENAME"), // TODO: Make this an actual key to retrieve InternalName = header?.Name, - Description = header?.ReadString(Data.Models.Metadata.Header.DescriptionKey), + Description = header?.Description, GameName = parent.Name, - GameDescription = parent.ReadString(Data.Models.Metadata.Machine.DescriptionKey), + GameDescription = parent.Description, Type = "rom", RomName = item.Name, DiskName = null, diff --git a/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs b/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs index 04b4c421..6a9382e2 100644 --- a/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs @@ -40,7 +40,7 @@ namespace SabreTools.Serialization.CrossModel var first = item.Row[0]; header["FILENAME"] = first.FileName; // TODO: Make this an actual key to retrieve on an item -- OriginalFilename header.Name = first.FileName; - header[Data.Models.Metadata.Header.DescriptionKey] = first.Description; + header.Description = first.Description; } return header; @@ -54,7 +54,7 @@ namespace SabreTools.Serialization.CrossModel var machine = new Data.Models.Metadata.Machine { Name = item.GameName, - [Data.Models.Metadata.Machine.DescriptionKey] = item.GameDescription, + Description = item.GameDescription, }; var datItem = ConvertToInternalModel(item); diff --git a/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs b/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs index 4d0cc5b2..94a8a2be 100644 --- a/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs @@ -29,7 +29,7 @@ namespace SabreTools.Serialization.CrossModel var softwareList = new Data.Models.SoftwareList.SoftwareList { Name = item.Name, - Description = item.ReadString(Data.Models.Metadata.Header.DescriptionKey), + Description = item.Description, Notes = item.ReadString(Data.Models.Metadata.Header.NotesKey), }; return softwareList; @@ -45,7 +45,7 @@ namespace SabreTools.Serialization.CrossModel Name = item.Name, CloneOf = item.ReadString(Data.Models.Metadata.Machine.CloneOfKey), Supported = item.Supported, - Description = item.ReadString(Data.Models.Metadata.Machine.DescriptionKey), + Description = item.Description, Year = item.ReadString(Data.Models.Metadata.Machine.YearKey), Publisher = item.ReadString(Data.Models.Metadata.Machine.PublisherKey), Notes = item.ReadString(Data.Models.Metadata.Machine.NotesKey), @@ -94,8 +94,8 @@ namespace SabreTools.Serialization.CrossModel var dipSwitch = new DipSwitch { Name = item.Name, - Tag = item.ReadString(Data.Models.Metadata.DipSwitch.TagKey), - Mask = item.ReadString(Data.Models.Metadata.DipSwitch.MaskKey), + Tag = item.Tag, + Mask = item.Mask, }; var dipValues = item.Read(Data.Models.Metadata.DipSwitch.DipValueKey); @@ -113,7 +113,7 @@ namespace SabreTools.Serialization.CrossModel var dipValue = new DipValue { Name = item.Name, - Value = item.ReadString(Data.Models.Metadata.DipValue.ValueKey), + Value = item.Value, Default = item.Default, }; return dipValue; @@ -160,7 +160,7 @@ namespace SabreTools.Serialization.CrossModel var feature = new Feature { Name = item.Name, - Value = item.ReadString(Data.Models.Metadata.Feature.ValueKey), + Value = item.Value, }; return feature; } @@ -173,7 +173,7 @@ namespace SabreTools.Serialization.CrossModel var info = new Info { Name = item.Name, - Value = item.ReadString(Data.Models.Metadata.Info.ValueKey), + Value = item.Value, }; return info; } @@ -221,7 +221,7 @@ namespace SabreTools.Serialization.CrossModel CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey), SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key), Offset = item.ReadString(Data.Models.Metadata.Rom.OffsetKey), - Value = item.ReadString(Data.Models.Metadata.Rom.ValueKey), + Value = item.Value, Status = item.Status, LoadFlag = item.LoadFlag, }; @@ -236,7 +236,7 @@ namespace SabreTools.Serialization.CrossModel var sharedFeat = new SharedFeat { Name = item.Name, - Value = item.ReadString(Data.Models.Metadata.SharedFeat.ValueKey), + Value = item.Value, }; return sharedFeat; } diff --git a/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs b/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs index ec6a69f3..5fe9a284 100644 --- a/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs @@ -33,7 +33,7 @@ namespace SabreTools.Serialization.CrossModel var header = new Data.Models.Metadata.Header { Name = item.Name, - [Data.Models.Metadata.Header.DescriptionKey] = item.Description, + Description = item.Description, [Data.Models.Metadata.Header.NotesKey] = item.Notes, }; return header; @@ -49,7 +49,7 @@ namespace SabreTools.Serialization.CrossModel Name = item.Name, [Data.Models.Metadata.Machine.CloneOfKey] = item.CloneOf, Supported = item.Supported, - [Data.Models.Metadata.Machine.DescriptionKey] = item.Description, + Description = item.Description, [Data.Models.Metadata.Machine.YearKey] = item.Year, [Data.Models.Metadata.Machine.PublisherKey] = item.Publisher, [Data.Models.Metadata.Machine.NotesKey] = item.Notes, @@ -94,8 +94,8 @@ namespace SabreTools.Serialization.CrossModel var dipSwitch = new Data.Models.Metadata.DipSwitch { Name = item.Name, - [Data.Models.Metadata.DipSwitch.TagKey] = item.Tag, - [Data.Models.Metadata.DipSwitch.MaskKey] = item.Mask, + Tag = item.Tag, + Mask = item.Mask, }; if (item.DipValue is not null && item.DipValue.Length > 0) @@ -112,7 +112,7 @@ namespace SabreTools.Serialization.CrossModel var dipValue = new Data.Models.Metadata.DipValue { Name = item.Name, - [Data.Models.Metadata.DipValue.ValueKey] = item.Value, + Value = item.Value, Default = item.Default, }; return dipValue; @@ -158,7 +158,7 @@ namespace SabreTools.Serialization.CrossModel var feature = new Data.Models.Metadata.Feature { Name = item.Name, - [Data.Models.Metadata.Feature.ValueKey] = item.Value, + Value = item.Value, }; return feature; } @@ -171,7 +171,7 @@ namespace SabreTools.Serialization.CrossModel var info = new Data.Models.Metadata.Info { Name = item.Name, - [Data.Models.Metadata.Info.ValueKey] = item.Value, + Value = item.Value, }; return info; } @@ -215,7 +215,7 @@ namespace SabreTools.Serialization.CrossModel [Data.Models.Metadata.Rom.CRCKey] = item.CRC, [Data.Models.Metadata.Rom.SHA1Key] = item.SHA1, [Data.Models.Metadata.Rom.OffsetKey] = item.Offset, - [Data.Models.Metadata.Rom.ValueKey] = item.Value, + Value = item.Value, Status = item.Status, LoadFlag = item.LoadFlag, }; @@ -230,7 +230,7 @@ namespace SabreTools.Serialization.CrossModel var sharedFeat = new Data.Models.Metadata.SharedFeat { Name = item.Name, - [Data.Models.Metadata.SharedFeat.ValueKey] = item.Value, + Value = item.Value, }; return sharedFeat; } diff --git a/SabreTools.Serialization.Readers.Test/ClrMameProTests.cs b/SabreTools.Serialization.Readers.Test/ClrMameProTests.cs index d73828d0..e12bf623 100644 --- a/SabreTools.Serialization.Readers.Test/ClrMameProTests.cs +++ b/SabreTools.Serialization.Readers.Test/ClrMameProTests.cs @@ -179,7 +179,7 @@ namespace SabreTools.Serialization.Readers.Test var cmp = new Data.Models.ClrMamePro.ClrMamePro { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", RootDir = "XXXXXX", Category = "XXXXXX", Version = "XXXXXX", @@ -207,7 +207,7 @@ namespace SabreTools.Serialization.Readers.Test var biosset = new Data.Models.ClrMamePro.BiosSet { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", Default = true, }; @@ -326,7 +326,7 @@ namespace SabreTools.Serialization.Readers.Test ? new Data.Models.ClrMamePro.Game() : new Data.Models.ClrMamePro.Machine(); gameBase.Name = "XXXXXX"; - gameBase.Description = "XXXXXX"; + gameBase.Description = "description"; gameBase.DriverStatus = "XXXXXX"; gameBase.Year = "XXXXXX"; gameBase.Manufacturer = "XXXXXX"; @@ -368,7 +368,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(cmp); Assert.Equal("XXXXXX", cmp.Name); - Assert.Equal("XXXXXX", cmp.Description); + Assert.Equal("description", cmp.Description); Assert.Equal("XXXXXX", cmp.RootDir); Assert.Equal("XXXXXX", cmp.Category); Assert.Equal("XXXXXX", cmp.Version); @@ -391,7 +391,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(gb); Assert.Equal("XXXXXX", gb.Name); - Assert.Equal("XXXXXX", gb.Description); + Assert.Equal("description", gb.Description); // Assert.Equal("XXXXXX", gb.DriverStatus); // TODO: Needs metadata mapping Assert.Equal("XXXXXX", gb.Year); Assert.Equal("XXXXXX", gb.Manufacturer); @@ -466,7 +466,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(biosset); Assert.Equal("XXXXXX", biosset.Name); - Assert.Equal("XXXXXX", biosset.Description); + Assert.Equal("description", biosset.Description); Assert.Equal(true, biosset.Default); } diff --git a/SabreTools.Serialization.Readers.Test/DosCenterTests.cs b/SabreTools.Serialization.Readers.Test/DosCenterTests.cs index 219972c9..dd6a2db0 100644 --- a/SabreTools.Serialization.Readers.Test/DosCenterTests.cs +++ b/SabreTools.Serialization.Readers.Test/DosCenterTests.cs @@ -102,7 +102,7 @@ namespace SabreTools.Serialization.Readers.Test var dc = new Data.Models.DosCenter.DosCenter { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", Version = "XXXXXX", Date = "XXXXXX", Author = "XXXXXX", @@ -139,7 +139,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(cmp); Assert.Equal("XXXXXX", cmp.Name); - Assert.Equal("XXXXXX", cmp.Description); + Assert.Equal("description", cmp.Description); Assert.Equal("XXXXXX", cmp.Version); Assert.Equal("XXXXXX", cmp.Date); Assert.Equal("XXXXXX", cmp.Author); diff --git a/SabreTools.Serialization.Readers.Test/ListxmlTests.cs b/SabreTools.Serialization.Readers.Test/ListxmlTests.cs index 439b3a9e..69f944f4 100644 --- a/SabreTools.Serialization.Readers.Test/ListxmlTests.cs +++ b/SabreTools.Serialization.Readers.Test/ListxmlTests.cs @@ -133,7 +133,7 @@ namespace SabreTools.Serialization.Readers.Test var biosset = new Data.Models.Listxml.BiosSet { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", Default = true, }; @@ -179,7 +179,7 @@ namespace SabreTools.Serialization.Readers.Test var chip = new Data.Models.Listxml.Chip { Name = "XXXXXX", - Tag = "XXXXXX", + Tag = "tag", Type = Data.Models.Metadata.ChipType.CPU, SoundOnly = true, Clock = "XXXXXX", @@ -187,7 +187,7 @@ namespace SabreTools.Serialization.Readers.Test var display = new Data.Models.Listxml.Display { - Tag = "XXXXXX", + Tag = "tag", Type = Data.Models.Metadata.DisplayType.Vector, Rotate = "XXXXXX", FlipX = true, @@ -248,10 +248,10 @@ namespace SabreTools.Serialization.Readers.Test var condition = new Data.Models.Listxml.Condition { - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Relation = Data.Models.Metadata.Relation.Equal, - Value = "XXXXXX", + Value = "value", }; var diplocation = new Data.Models.Listxml.DipLocation @@ -264,7 +264,7 @@ namespace SabreTools.Serialization.Readers.Test var dipvalue = new Data.Models.Listxml.DipValue { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", Default = true, Condition = condition, }; @@ -272,8 +272,8 @@ namespace SabreTools.Serialization.Readers.Test var dipswitch = new Data.Models.Listxml.DipSwitch { Name = "XXXXXX", - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Condition = condition, DipLocation = [diplocation], DipValue = [dipvalue], @@ -289,7 +289,7 @@ namespace SabreTools.Serialization.Readers.Test var confsetting = new Data.Models.Listxml.ConfSetting { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", Default = true, Condition = condition, }; @@ -297,8 +297,8 @@ namespace SabreTools.Serialization.Readers.Test var configuration = new Data.Models.Listxml.Configuration { Name = "XXXXXX", - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Condition = condition, ConfLocation = [conflocation], ConfSetting = [confsetting], @@ -306,12 +306,12 @@ namespace SabreTools.Serialization.Readers.Test var analog = new Data.Models.Listxml.Analog { - Mask = "XXXXXX", + Mask = "mask", }; var port = new Data.Models.Listxml.Port { - Tag = "XXXXXX", + Tag = "tag", Analog = [analog], }; @@ -358,7 +358,7 @@ namespace SabreTools.Serialization.Readers.Test var device = new Data.Models.Listxml.Device { Type = Data.Models.Metadata.DeviceType.PunchTape, - Tag = "XXXXXX", + Tag = "tag", FixedImage = "XXXXXX", Mandatory = true, Interface = "XXXXXX", @@ -381,7 +381,7 @@ namespace SabreTools.Serialization.Readers.Test var softwarelist = new Data.Models.Listxml.SoftwareList { - Tag = "XXXXXX", + Tag = "tag", Name = "XXXXXX", Status = Data.Models.Metadata.SoftwareListStatus.Original, Filter = "XXXXXX", @@ -406,7 +406,7 @@ namespace SabreTools.Serialization.Readers.Test gameBase.CloneOf = "XXXXXX"; gameBase.RomOf = "XXXXXX"; gameBase.SampleOf = "XXXXXX"; - gameBase.Description = "XXXXXX"; + gameBase.Description = "description"; gameBase.Year = "XXXXXX"; gameBase.Manufacturer = "XXXXXX"; gameBase.History = "XXXXXX"; @@ -455,7 +455,7 @@ namespace SabreTools.Serialization.Readers.Test Assert.Equal("XXXXXX", gb.CloneOf); Assert.Equal("XXXXXX", gb.RomOf); Assert.Equal("XXXXXX", gb.SampleOf); - Assert.Equal("XXXXXX", gb.Description); + Assert.Equal("description", gb.Description); Assert.Equal("XXXXXX", gb.Year); Assert.Equal("XXXXXX", gb.Manufacturer); Assert.Equal("XXXXXX", gb.History); @@ -541,7 +541,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(biosset); Assert.Equal("XXXXXX", biosset.Name); - Assert.Equal("XXXXXX", biosset.Description); + Assert.Equal("description", biosset.Description); Assert.Equal(true, biosset.Default); } @@ -607,7 +607,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(chip); Assert.Equal("XXXXXX", chip.Name); - Assert.Equal("XXXXXX", chip.Tag); + Assert.Equal("tag", chip.Tag); Assert.Equal(Data.Models.Metadata.ChipType.CPU, chip.Type); Assert.Equal(true, chip.SoundOnly); Assert.Equal("XXXXXX", chip.Clock); @@ -619,7 +619,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.Display? display) { Assert.NotNull(display); - Assert.Equal("XXXXXX", display.Tag); + Assert.Equal("tag", display.Tag); Assert.Equal(Data.Models.Metadata.DisplayType.Vector, display.Type); Assert.Equal("XXXXXX", display.Rotate); Assert.Equal(true, display.FlipX); @@ -704,8 +704,8 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(dipswitch); Assert.Equal("XXXXXX", dipswitch.Name); - Assert.Equal("XXXXXX", dipswitch.Tag); - Assert.Equal("XXXXXX", dipswitch.Mask); + Assert.Equal("tag", dipswitch.Tag); + Assert.Equal("mask", dipswitch.Mask); Validate(dipswitch.Condition); Assert.NotNull(dipswitch.DipLocation); @@ -723,10 +723,10 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.Condition? condition) { Assert.NotNull(condition); - Assert.Equal("XXXXXX", condition.Tag); - Assert.Equal("XXXXXX", condition.Mask); + Assert.Equal("tag", condition.Tag); + Assert.Equal("mask", condition.Mask); Assert.Equal(Data.Models.Metadata.Relation.Equal, condition.Relation); - Assert.Equal("XXXXXX", condition.Value); + Assert.Equal("value", condition.Value); } /// @@ -747,7 +747,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(dipvalue); Assert.Equal("XXXXXX", dipvalue.Name); - Assert.Equal("XXXXXX", dipvalue.Value); + Assert.Equal("value", dipvalue.Value); Assert.Equal(true, dipvalue.Default); Validate(dipvalue.Condition); } @@ -759,8 +759,8 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(configuration); Assert.Equal("XXXXXX", configuration.Name); - Assert.Equal("XXXXXX", configuration.Tag); - Assert.Equal("XXXXXX", configuration.Mask); + Assert.Equal("tag", configuration.Tag); + Assert.Equal("mask", configuration.Mask); Validate(configuration.Condition); Assert.NotNull(configuration.ConfLocation); @@ -790,7 +790,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(confsetting); Assert.Equal("XXXXXX", confsetting.Name); - Assert.Equal("XXXXXX", confsetting.Value); + Assert.Equal("value", confsetting.Value); Assert.Equal(true, confsetting.Default); Validate(confsetting.Condition); } @@ -801,7 +801,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.Port? port) { Assert.NotNull(port); - Assert.Equal("XXXXXX", port.Tag); + Assert.Equal("tag", port.Tag); Assert.NotNull(port.Analog); var analog = Assert.Single(port.Analog); @@ -814,7 +814,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.Analog? analog) { Assert.NotNull(analog); - Assert.Equal("XXXXXX", analog.Mask); + Assert.Equal("mask", analog.Mask); } /// @@ -865,7 +865,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(device); Assert.Equal(Data.Models.Metadata.DeviceType.PunchTape, device.Type); - Assert.Equal("XXXXXX", device.Tag); + Assert.Equal("tag", device.Tag); Assert.Equal("XXXXXX", device.FixedImage); Assert.Equal(true, device.Mandatory); Assert.Equal("XXXXXX", device.Interface); @@ -925,7 +925,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.SoftwareList? softwarelist) { Assert.NotNull(softwarelist); - Assert.Equal("XXXXXX", softwarelist.Tag); + Assert.Equal("tag", softwarelist.Tag); Assert.Equal("XXXXXX", softwarelist.Name); Assert.Equal(Data.Models.Metadata.SoftwareListStatus.Original, softwarelist.Status); Assert.Equal("XXXXXX", softwarelist.Filter); diff --git a/SabreTools.Serialization.Readers.Test/LogiqxTests.cs b/SabreTools.Serialization.Readers.Test/LogiqxTests.cs index 1182957d..15719680 100644 --- a/SabreTools.Serialization.Readers.Test/LogiqxTests.cs +++ b/SabreTools.Serialization.Readers.Test/LogiqxTests.cs @@ -161,7 +161,7 @@ namespace SabreTools.Serialization.Readers.Test { Id = "XXXXXX", Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", RootDir = "XXXXXX", Category = "XXXXXX", Version = "XXXXXX", @@ -206,7 +206,7 @@ namespace SabreTools.Serialization.Readers.Test var biosset = new Data.Models.Logiqx.BiosSet { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", Default = true, }; @@ -286,7 +286,7 @@ namespace SabreTools.Serialization.Readers.Test var softwarelist = new Data.Models.Logiqx.SoftwareList { - Tag = "XXXXXX", + Tag = "tag", Name = "XXXXXX", Status = Data.Models.Metadata.SoftwareListStatus.Original, Filter = "XXXXXX", @@ -309,7 +309,7 @@ namespace SabreTools.Serialization.Readers.Test gameBase.CloneOfId = "XXXXXX"; gameBase.Runnable = Data.Models.Metadata.Runnable.Yes; gameBase.Comment = ["XXXXXX"]; - gameBase.Description = "XXXXXX"; + gameBase.Description = "description"; gameBase.Year = "XXXXXX"; gameBase.Manufacturer = "XXXXXX"; gameBase.Publisher = "XXXXXX"; @@ -345,7 +345,7 @@ namespace SabreTools.Serialization.Readers.Test Assert.NotNull(header); Assert.Equal("XXXXXX", header.Id); Assert.Equal("XXXXXX", header.Name); - Assert.Equal("XXXXXX", header.Description); + Assert.Equal("description", header.Description); Assert.Equal("XXXXXX", header.RootDir); Assert.Equal("XXXXXX", header.Category); Assert.Equal("XXXXXX", header.Version); @@ -411,7 +411,7 @@ namespace SabreTools.Serialization.Readers.Test string comment = Assert.Single(gb.Comment); Assert.Equal("XXXXXX", comment); - Assert.Equal("XXXXXX", gb.Description); + Assert.Equal("description", gb.Description); Assert.Equal("XXXXXX", gb.Year); Assert.Equal("XXXXXX", gb.Manufacturer); Assert.Equal("XXXXXX", gb.Publisher); @@ -503,7 +503,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(biosset); Assert.Equal("XXXXXX", biosset.Name); - Assert.Equal("XXXXXX", biosset.Description); + Assert.Equal("description", biosset.Description); Assert.Equal(true, biosset.Default); } @@ -613,7 +613,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Logiqx.SoftwareList? softwarelist) { Assert.NotNull(softwarelist); - Assert.Equal("XXXXXX", softwarelist.Tag); + Assert.Equal("tag", softwarelist.Tag); Assert.Equal("XXXXXX", softwarelist.Name); Assert.Equal(Data.Models.Metadata.SoftwareListStatus.Original, softwarelist.Status); Assert.Equal("XXXXXX", softwarelist.Filter); diff --git a/SabreTools.Serialization.Readers.Test/M1Tests.cs b/SabreTools.Serialization.Readers.Test/M1Tests.cs index 90be4b60..e637382b 100644 --- a/SabreTools.Serialization.Readers.Test/M1Tests.cs +++ b/SabreTools.Serialization.Readers.Test/M1Tests.cs @@ -129,7 +129,7 @@ namespace SabreTools.Serialization.Readers.Test var biosset = new Data.Models.Listxml.BiosSet { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", Default = true, }; @@ -175,7 +175,7 @@ namespace SabreTools.Serialization.Readers.Test var chip = new Data.Models.Listxml.Chip { Name = "XXXXXX", - Tag = "XXXXXX", + Tag = "tag", Type = Data.Models.Metadata.ChipType.CPU, SoundOnly = true, Clock = "XXXXXX", @@ -183,7 +183,7 @@ namespace SabreTools.Serialization.Readers.Test var display = new Data.Models.Listxml.Display { - Tag = "XXXXXX", + Tag = "tag", Type = Data.Models.Metadata.DisplayType.Vector, Rotate = "XXXXXX", FlipX = true, @@ -244,10 +244,10 @@ namespace SabreTools.Serialization.Readers.Test var condition = new Data.Models.Listxml.Condition { - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Relation = Data.Models.Metadata.Relation.Equal, - Value = "XXXXXX", + Value = "value", }; var diplocation = new Data.Models.Listxml.DipLocation @@ -260,7 +260,7 @@ namespace SabreTools.Serialization.Readers.Test var dipvalue = new Data.Models.Listxml.DipValue { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", Default = true, Condition = condition, }; @@ -268,8 +268,8 @@ namespace SabreTools.Serialization.Readers.Test var dipswitch = new Data.Models.Listxml.DipSwitch { Name = "XXXXXX", - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Condition = condition, DipLocation = [diplocation], DipValue = [dipvalue], @@ -285,7 +285,7 @@ namespace SabreTools.Serialization.Readers.Test var confsetting = new Data.Models.Listxml.ConfSetting { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", Default = true, Condition = condition, }; @@ -293,8 +293,8 @@ namespace SabreTools.Serialization.Readers.Test var configuration = new Data.Models.Listxml.Configuration { Name = "XXXXXX", - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Condition = condition, ConfLocation = [conflocation], ConfSetting = [confsetting], @@ -302,12 +302,12 @@ namespace SabreTools.Serialization.Readers.Test var analog = new Data.Models.Listxml.Analog { - Mask = "XXXXXX", + Mask = "mask", }; var port = new Data.Models.Listxml.Port { - Tag = "XXXXXX", + Tag = "tag", Analog = [analog], }; @@ -354,7 +354,7 @@ namespace SabreTools.Serialization.Readers.Test var device = new Data.Models.Listxml.Device { Type = Data.Models.Metadata.DeviceType.PunchTape, - Tag = "XXXXXX", + Tag = "tag", FixedImage = "XXXXXX", Mandatory = true, Interface = "XXXXXX", @@ -377,7 +377,7 @@ namespace SabreTools.Serialization.Readers.Test var softwarelist = new Data.Models.Listxml.SoftwareList { - Tag = "XXXXXX", + Tag = "tag", Name = "XXXXXX", Status = Data.Models.Metadata.SoftwareListStatus.Original, Filter = "XXXXXX", @@ -402,7 +402,7 @@ namespace SabreTools.Serialization.Readers.Test gameBase.CloneOf = "XXXXXX"; gameBase.RomOf = "XXXXXX"; gameBase.SampleOf = "XXXXXX"; - gameBase.Description = "XXXXXX"; + gameBase.Description = "description"; gameBase.Year = "XXXXXX"; gameBase.Manufacturer = "XXXXXX"; gameBase.History = "XXXXXX"; @@ -449,7 +449,7 @@ namespace SabreTools.Serialization.Readers.Test Assert.Equal("XXXXXX", gb.CloneOf); Assert.Equal("XXXXXX", gb.RomOf); Assert.Equal("XXXXXX", gb.SampleOf); - Assert.Equal("XXXXXX", gb.Description); + Assert.Equal("description", gb.Description); Assert.Equal("XXXXXX", gb.Year); Assert.Equal("XXXXXX", gb.Manufacturer); Assert.Equal("XXXXXX", gb.History); @@ -535,7 +535,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(biosset); Assert.Equal("XXXXXX", biosset.Name); - Assert.Equal("XXXXXX", biosset.Description); + Assert.Equal("description", biosset.Description); Assert.Equal(true, biosset.Default); } @@ -601,7 +601,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(chip); Assert.Equal("XXXXXX", chip.Name); - Assert.Equal("XXXXXX", chip.Tag); + Assert.Equal("tag", chip.Tag); Assert.Equal(Data.Models.Metadata.ChipType.CPU, chip.Type); Assert.Equal(true, chip.SoundOnly); Assert.Equal("XXXXXX", chip.Clock); @@ -613,7 +613,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.Display? display) { Assert.NotNull(display); - Assert.Equal("XXXXXX", display.Tag); + Assert.Equal("tag", display.Tag); Assert.Equal(Data.Models.Metadata.DisplayType.Vector, display.Type); Assert.Equal("XXXXXX", display.Rotate); Assert.Equal(true, display.FlipX); @@ -698,8 +698,8 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(dipswitch); Assert.Equal("XXXXXX", dipswitch.Name); - Assert.Equal("XXXXXX", dipswitch.Tag); - Assert.Equal("XXXXXX", dipswitch.Mask); + Assert.Equal("tag", dipswitch.Tag); + Assert.Equal("mask", dipswitch.Mask); Validate(dipswitch.Condition); Assert.NotNull(dipswitch.DipLocation); @@ -717,10 +717,10 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.Condition? condition) { Assert.NotNull(condition); - Assert.Equal("XXXXXX", condition.Tag); - Assert.Equal("XXXXXX", condition.Mask); + Assert.Equal("tag", condition.Tag); + Assert.Equal("mask", condition.Mask); Assert.Equal(Data.Models.Metadata.Relation.Equal, condition.Relation); - Assert.Equal("XXXXXX", condition.Value); + Assert.Equal("value", condition.Value); } /// @@ -741,7 +741,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(dipvalue); Assert.Equal("XXXXXX", dipvalue.Name); - Assert.Equal("XXXXXX", dipvalue.Value); + Assert.Equal("value", dipvalue.Value); Assert.Equal(true, dipvalue.Default); Validate(dipvalue.Condition); } @@ -753,8 +753,8 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(configuration); Assert.Equal("XXXXXX", configuration.Name); - Assert.Equal("XXXXXX", configuration.Tag); - Assert.Equal("XXXXXX", configuration.Mask); + Assert.Equal("tag", configuration.Tag); + Assert.Equal("mask", configuration.Mask); Validate(configuration.Condition); Assert.NotNull(configuration.ConfLocation); @@ -784,7 +784,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(confsetting); Assert.Equal("XXXXXX", confsetting.Name); - Assert.Equal("XXXXXX", confsetting.Value); + Assert.Equal("value", confsetting.Value); Assert.Equal(true, confsetting.Default); Validate(confsetting.Condition); } @@ -795,7 +795,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.Port? port) { Assert.NotNull(port); - Assert.Equal("XXXXXX", port.Tag); + Assert.Equal("tag", port.Tag); Assert.NotNull(port.Analog); var analog = Assert.Single(port.Analog); @@ -808,7 +808,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.Analog? analog) { Assert.NotNull(analog); - Assert.Equal("XXXXXX", analog.Mask); + Assert.Equal("mask", analog.Mask); } /// @@ -859,7 +859,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(device); Assert.Equal(Data.Models.Metadata.DeviceType.PunchTape, device.Type); - Assert.Equal("XXXXXX", device.Tag); + Assert.Equal("tag", device.Tag); Assert.Equal("XXXXXX", device.FixedImage); Assert.Equal(true, device.Mandatory); Assert.Equal("XXXXXX", device.Interface); @@ -919,7 +919,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.SoftwareList? softwarelist) { Assert.NotNull(softwarelist); - Assert.Equal("XXXXXX", softwarelist.Tag); + Assert.Equal("tag", softwarelist.Tag); Assert.Equal("XXXXXX", softwarelist.Name); Assert.Equal(Data.Models.Metadata.SoftwareListStatus.Original, softwarelist.Status); Assert.Equal("XXXXXX", softwarelist.Filter); diff --git a/SabreTools.Serialization.Readers.Test/MessTests.cs b/SabreTools.Serialization.Readers.Test/MessTests.cs index 3eee2b80..160a5e0c 100644 --- a/SabreTools.Serialization.Readers.Test/MessTests.cs +++ b/SabreTools.Serialization.Readers.Test/MessTests.cs @@ -129,7 +129,7 @@ namespace SabreTools.Serialization.Readers.Test var biosset = new Data.Models.Listxml.BiosSet { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", Default = true, }; @@ -175,7 +175,7 @@ namespace SabreTools.Serialization.Readers.Test var chip = new Data.Models.Listxml.Chip { Name = "XXXXXX", - Tag = "XXXXXX", + Tag = "tag", Type = Data.Models.Metadata.ChipType.CPU, SoundOnly = true, Clock = "XXXXXX", @@ -183,7 +183,7 @@ namespace SabreTools.Serialization.Readers.Test var display = new Data.Models.Listxml.Display { - Tag = "XXXXXX", + Tag = "tag", Type = Data.Models.Metadata.DisplayType.Vector, Rotate = "XXXXXX", FlipX = true, @@ -244,10 +244,10 @@ namespace SabreTools.Serialization.Readers.Test var condition = new Data.Models.Listxml.Condition { - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Relation = Data.Models.Metadata.Relation.Equal, - Value = "XXXXXX", + Value = "value", }; var diplocation = new Data.Models.Listxml.DipLocation @@ -260,7 +260,7 @@ namespace SabreTools.Serialization.Readers.Test var dipvalue = new Data.Models.Listxml.DipValue { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", Default = true, Condition = condition, }; @@ -268,8 +268,8 @@ namespace SabreTools.Serialization.Readers.Test var dipswitch = new Data.Models.Listxml.DipSwitch { Name = "XXXXXX", - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Condition = condition, DipLocation = [diplocation], DipValue = [dipvalue], @@ -285,7 +285,7 @@ namespace SabreTools.Serialization.Readers.Test var confsetting = new Data.Models.Listxml.ConfSetting { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", Default = true, Condition = condition, }; @@ -293,8 +293,8 @@ namespace SabreTools.Serialization.Readers.Test var configuration = new Data.Models.Listxml.Configuration { Name = "XXXXXX", - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", Condition = condition, ConfLocation = [conflocation], ConfSetting = [confsetting], @@ -302,12 +302,12 @@ namespace SabreTools.Serialization.Readers.Test var analog = new Data.Models.Listxml.Analog { - Mask = "XXXXXX", + Mask = "mask", }; var port = new Data.Models.Listxml.Port { - Tag = "XXXXXX", + Tag = "tag", Analog = [analog], }; @@ -354,7 +354,7 @@ namespace SabreTools.Serialization.Readers.Test var device = new Data.Models.Listxml.Device { Type = Data.Models.Metadata.DeviceType.PunchTape, - Tag = "XXXXXX", + Tag = "tag", FixedImage = "XXXXXX", Mandatory = true, Interface = "XXXXXX", @@ -377,7 +377,7 @@ namespace SabreTools.Serialization.Readers.Test var softwarelist = new Data.Models.Listxml.SoftwareList { - Tag = "XXXXXX", + Tag = "tag", Name = "XXXXXX", Status = Data.Models.Metadata.SoftwareListStatus.Original, Filter = "XXXXXX", @@ -402,7 +402,7 @@ namespace SabreTools.Serialization.Readers.Test gameBase.CloneOf = "XXXXXX"; gameBase.RomOf = "XXXXXX"; gameBase.SampleOf = "XXXXXX"; - gameBase.Description = "XXXXXX"; + gameBase.Description = "description"; gameBase.Year = "XXXXXX"; gameBase.Manufacturer = "XXXXXX"; gameBase.History = "XXXXXX"; @@ -449,7 +449,7 @@ namespace SabreTools.Serialization.Readers.Test Assert.Equal("XXXXXX", gb.CloneOf); Assert.Equal("XXXXXX", gb.RomOf); Assert.Equal("XXXXXX", gb.SampleOf); - Assert.Equal("XXXXXX", gb.Description); + Assert.Equal("description", gb.Description); Assert.Equal("XXXXXX", gb.Year); Assert.Equal("XXXXXX", gb.Manufacturer); Assert.Equal("XXXXXX", gb.History); @@ -535,7 +535,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(biosset); Assert.Equal("XXXXXX", biosset.Name); - Assert.Equal("XXXXXX", biosset.Description); + Assert.Equal("description", biosset.Description); Assert.Equal(true, biosset.Default); } @@ -601,7 +601,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(chip); Assert.Equal("XXXXXX", chip.Name); - Assert.Equal("XXXXXX", chip.Tag); + Assert.Equal("tag", chip.Tag); Assert.Equal(Data.Models.Metadata.ChipType.CPU, chip.Type); Assert.Equal(true, chip.SoundOnly); Assert.Equal("XXXXXX", chip.Clock); @@ -613,7 +613,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.Display? display) { Assert.NotNull(display); - Assert.Equal("XXXXXX", display.Tag); + Assert.Equal("tag", display.Tag); Assert.Equal(Data.Models.Metadata.DisplayType.Vector, display.Type); Assert.Equal("XXXXXX", display.Rotate); Assert.Equal(true, display.FlipX); @@ -698,8 +698,8 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(dipswitch); Assert.Equal("XXXXXX", dipswitch.Name); - Assert.Equal("XXXXXX", dipswitch.Tag); - Assert.Equal("XXXXXX", dipswitch.Mask); + Assert.Equal("tag", dipswitch.Tag); + Assert.Equal("mask", dipswitch.Mask); Validate(dipswitch.Condition); Assert.NotNull(dipswitch.DipLocation); @@ -717,10 +717,10 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.Condition? condition) { Assert.NotNull(condition); - Assert.Equal("XXXXXX", condition.Tag); - Assert.Equal("XXXXXX", condition.Mask); + Assert.Equal("tag", condition.Tag); + Assert.Equal("mask", condition.Mask); Assert.Equal(Data.Models.Metadata.Relation.Equal, condition.Relation); - Assert.Equal("XXXXXX", condition.Value); + Assert.Equal("value", condition.Value); } /// @@ -741,7 +741,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(dipvalue); Assert.Equal("XXXXXX", dipvalue.Name); - Assert.Equal("XXXXXX", dipvalue.Value); + Assert.Equal("value", dipvalue.Value); Assert.Equal(true, dipvalue.Default); Validate(dipvalue.Condition); } @@ -753,8 +753,8 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(configuration); Assert.Equal("XXXXXX", configuration.Name); - Assert.Equal("XXXXXX", configuration.Tag); - Assert.Equal("XXXXXX", configuration.Mask); + Assert.Equal("tag", configuration.Tag); + Assert.Equal("mask", configuration.Mask); Validate(configuration.Condition); Assert.NotNull(configuration.ConfLocation); @@ -784,7 +784,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(confsetting); Assert.Equal("XXXXXX", confsetting.Name); - Assert.Equal("XXXXXX", confsetting.Value); + Assert.Equal("value", confsetting.Value); Assert.Equal(true, confsetting.Default); Validate(confsetting.Condition); } @@ -795,7 +795,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.Port? port) { Assert.NotNull(port); - Assert.Equal("XXXXXX", port.Tag); + Assert.Equal("tag", port.Tag); Assert.NotNull(port.Analog); var analog = Assert.Single(port.Analog); @@ -808,7 +808,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.Analog? analog) { Assert.NotNull(analog); - Assert.Equal("XXXXXX", analog.Mask); + Assert.Equal("mask", analog.Mask); } /// @@ -859,7 +859,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(device); Assert.Equal(Data.Models.Metadata.DeviceType.PunchTape, device.Type); - Assert.Equal("XXXXXX", device.Tag); + Assert.Equal("tag", device.Tag); Assert.Equal("XXXXXX", device.FixedImage); Assert.Equal(true, device.Mandatory); Assert.Equal("XXXXXX", device.Interface); @@ -919,7 +919,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.Listxml.SoftwareList? softwarelist) { Assert.NotNull(softwarelist); - Assert.Equal("XXXXXX", softwarelist.Tag); + Assert.Equal("tag", softwarelist.Tag); Assert.Equal("XXXXXX", softwarelist.Name); Assert.Equal(Data.Models.Metadata.SoftwareListStatus.Original, softwarelist.Status); Assert.Equal("XXXXXX", softwarelist.Filter); diff --git a/SabreTools.Serialization.Readers.Test/NoIntroDatabaseTests.cs b/SabreTools.Serialization.Readers.Test/NoIntroDatabaseTests.cs index 58c29bf5..01b91108 100644 --- a/SabreTools.Serialization.Readers.Test/NoIntroDatabaseTests.cs +++ b/SabreTools.Serialization.Readers.Test/NoIntroDatabaseTests.cs @@ -121,7 +121,7 @@ namespace SabreTools.Serialization.Readers.Test Alt = "XXXXXX", GameId1 = "XXXXXX", GameId2 = "XXXXXX", - Description = "XXXXXX", + Description = "description", Bios = "XXXXXX", Licensed = "XXXXXX", Pirate = "XXXXXX", @@ -311,7 +311,7 @@ namespace SabreTools.Serialization.Readers.Test Assert.Equal("XXXXXX", archive.Alt); Assert.Equal("XXXXXX", archive.GameId1); Assert.Equal("XXXXXX", archive.GameId2); - Assert.Equal("XXXXXX", archive.Description); + Assert.Equal("description", archive.Description); Assert.Equal("XXXXXX", archive.Bios); Assert.Equal("XXXXXX", archive.Licensed); Assert.Equal("XXXXXX", archive.Pirate); diff --git a/SabreTools.Serialization.Readers.Test/OfflineListTests.cs b/SabreTools.Serialization.Readers.Test/OfflineListTests.cs index c283bf6e..ff8b557d 100644 --- a/SabreTools.Serialization.Readers.Test/OfflineListTests.cs +++ b/SabreTools.Serialization.Readers.Test/OfflineListTests.cs @@ -208,13 +208,13 @@ namespace SabreTools.Serialization.Readers.Test var find = new Data.Models.OfflineList.Find { Operation = "XXXXXX", - Value = "XXXXXX", + Value = "value", Content = "XXXXXX", }; var to = new Data.Models.OfflineList.To { - Value = "XXXXXX", + Value = "value", Default = true, Auto = "XXXXXX", Find = [find], @@ -404,7 +404,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.OfflineList.To? to) { Assert.NotNull(to); - Assert.Equal("XXXXXX", to.Value); + Assert.Equal("value", to.Value); Assert.Equal(true, to.Default); Assert.Equal("XXXXXX", to.Auto); @@ -420,7 +420,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(find); Assert.Equal("XXXXXX", find.Operation); - Assert.Equal("XXXXXX", find.Value); + Assert.Equal("value", find.Value); Assert.Equal("XXXXXX", find.Content); } diff --git a/SabreTools.Serialization.Readers.Test/OpenMSXTests.cs b/SabreTools.Serialization.Readers.Test/OpenMSXTests.cs index e2ef4d31..7b16e33a 100644 --- a/SabreTools.Serialization.Readers.Test/OpenMSXTests.cs +++ b/SabreTools.Serialization.Readers.Test/OpenMSXTests.cs @@ -102,7 +102,7 @@ namespace SabreTools.Serialization.Readers.Test { var original = new Data.Models.OpenMSX.Original { - Value = "XXXXXX", + Value = "value", Content = "XXXXXX", }; @@ -203,7 +203,7 @@ namespace SabreTools.Serialization.Readers.Test private static void Validate(Data.Models.OpenMSX.Original? original) { Assert.NotNull(original); - Assert.Equal("XXXXXX", original.Value); + Assert.Equal("value", original.Value); Assert.Equal("XXXXXX", original.Content); } diff --git a/SabreTools.Serialization.Readers.Test/RomCenterTests.cs b/SabreTools.Serialization.Readers.Test/RomCenterTests.cs index 2592ae54..40ebaaee 100644 --- a/SabreTools.Serialization.Readers.Test/RomCenterTests.cs +++ b/SabreTools.Serialization.Readers.Test/RomCenterTests.cs @@ -127,9 +127,9 @@ namespace SabreTools.Serialization.Readers.Test var rom = new Data.Models.RomCenter.Rom { ParentName = "XXXXXX", - ParentDescription = "XXXXXX", + ParentDescription = "description", GameName = "XXXXXX", - GameDescription = "XXXXXX", + GameDescription = "description", RomName = "XXXXXX", RomCRC = "XXXXXX", RomSize = "XXXXXX", @@ -206,9 +206,9 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(rom); Assert.Equal("XXXXXX", rom.ParentName); - Assert.Equal("XXXXXX", rom.ParentDescription); + Assert.Equal("description", rom.ParentDescription); Assert.Equal("XXXXXX", rom.GameName); - Assert.Equal("XXXXXX", rom.GameDescription); + Assert.Equal("description", rom.GameDescription); Assert.Equal("XXXXXX", rom.RomName); Assert.Equal("XXXXXX", rom.RomCRC); Assert.Equal("XXXXXX", rom.RomSize); diff --git a/SabreTools.Serialization.Readers.Test/SeparatedValueTests.cs b/SabreTools.Serialization.Readers.Test/SeparatedValueTests.cs index 0c4711bd..c1319527 100644 --- a/SabreTools.Serialization.Readers.Test/SeparatedValueTests.cs +++ b/SabreTools.Serialization.Readers.Test/SeparatedValueTests.cs @@ -137,9 +137,9 @@ namespace SabreTools.Serialization.Readers.Test { FileName = "XXXXXX", InternalName = "XXXXXX", - Description = "XXXXXX", + Description = "description", GameName = "XXXXXX", - GameDescription = "XXXXXX", + GameDescription = "description", Type = "disk", DiskName = "XXXXXX", MD5 = "XXXXXX", @@ -151,9 +151,9 @@ namespace SabreTools.Serialization.Readers.Test { FileName = "XXXXXX", InternalName = "XXXXXX", - Description = "XXXXXX", + Description = "description", GameName = "XXXXXX", - GameDescription = "XXXXXX", + GameDescription = "description", Type = "media", DiskName = "XXXXXX", MD5 = "XXXXXX", @@ -166,9 +166,9 @@ namespace SabreTools.Serialization.Readers.Test { FileName = "XXXXXX", InternalName = "XXXXXX", - Description = "XXXXXX", + Description = "description", GameName = "XXXXXX", - GameDescription = "XXXXXX", + GameDescription = "description", Type = "rom", RomName = "XXXXXX", Size = "XXXXXX", @@ -209,9 +209,9 @@ namespace SabreTools.Serialization.Readers.Test Assert.NotNull(row); Assert.Equal("XXXXXX", row.FileName); Assert.Equal("XXXXXX", row.InternalName); - Assert.Equal("XXXXXX", row.Description); + Assert.Equal("description", row.Description); Assert.Equal("XXXXXX", row.GameName); - Assert.Equal("XXXXXX", row.GameDescription); + Assert.Equal("description", row.GameDescription); Assert.Equal("disk", row.Type); Assert.NotNull(row.RomName); Assert.Empty(row.RomName); Assert.Equal("XXXXXX", row.DiskName); @@ -244,9 +244,9 @@ namespace SabreTools.Serialization.Readers.Test Assert.NotNull(row); Assert.Equal("XXXXXX", row.FileName); Assert.Equal("XXXXXX", row.InternalName); - Assert.Equal("XXXXXX", row.Description); + Assert.Equal("description", row.Description); Assert.Equal("XXXXXX", row.GameName); - Assert.Equal("XXXXXX", row.GameDescription); + Assert.Equal("description", row.GameDescription); Assert.Equal("media", row.Type); Assert.NotNull(row.RomName); Assert.Empty(row.RomName); Assert.Equal("XXXXXX", row.DiskName); @@ -279,9 +279,9 @@ namespace SabreTools.Serialization.Readers.Test Assert.NotNull(row); Assert.Equal("XXXXXX", row.FileName); Assert.Equal("XXXXXX", row.InternalName); - Assert.Equal("XXXXXX", row.Description); + Assert.Equal("description", row.Description); Assert.Equal("XXXXXX", row.GameName); - Assert.Equal("XXXXXX", row.GameDescription); + Assert.Equal("description", row.GameDescription); Assert.Equal("rom", row.Type); Assert.Equal("XXXXXX", row.RomName); Assert.NotNull(row.DiskName); diff --git a/SabreTools.Serialization.Readers.Test/SoftwareListTests.cs b/SabreTools.Serialization.Readers.Test/SoftwareListTests.cs index f3ccbab4..a20278ca 100644 --- a/SabreTools.Serialization.Readers.Test/SoftwareListTests.cs +++ b/SabreTools.Serialization.Readers.Test/SoftwareListTests.cs @@ -96,7 +96,7 @@ namespace SabreTools.Serialization.Readers.Test // Validate the data Assert.NotNull(newSl); Assert.Equal("XXXXXX", newSl.Name); - Assert.Equal("XXXXXX", newSl.Description); + Assert.Equal("description", newSl.Description); Assert.Equal("XXXXXX", newSl.Notes); Assert.NotNull(newSl.Software); @@ -112,19 +112,19 @@ namespace SabreTools.Serialization.Readers.Test var info = new Data.Models.SoftwareList.Info { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", }; var sharedfeat = new Data.Models.SoftwareList.SharedFeat { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", }; var feature = new Data.Models.SoftwareList.Feature { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", }; var rom = new Data.Models.SoftwareList.Rom @@ -135,7 +135,7 @@ namespace SabreTools.Serialization.Readers.Test CRC = "XXXXXX", SHA1 = "XXXXXX", Offset = "XXXXXX", - Value = "XXXXXX", + Value = "value", Status = Data.Models.Metadata.ItemStatus.Good, LoadFlag = Data.Models.Metadata.LoadFlag.Load16Byte, }; @@ -167,15 +167,15 @@ namespace SabreTools.Serialization.Readers.Test var dipvalue = new Data.Models.SoftwareList.DipValue { Name = "XXXXXX", - Value = "XXXXXX", + Value = "value", Default = true, }; var dipswitch = new Data.Models.SoftwareList.DipSwitch { Name = "XXXXXX", - Tag = "XXXXXX", - Mask = "XXXXXX", + Tag = "tag", + Mask = "mask", DipValue = [dipvalue], }; @@ -194,7 +194,7 @@ namespace SabreTools.Serialization.Readers.Test Name = "XXXXXX", CloneOf = "XXXXXX", Supported = Data.Models.Metadata.Supported.Yes, - Description = "XXXXXX", + Description = "description", Year = "XXXXXX", Publisher = "XXXXXX", Notes = "XXXXXX", @@ -206,7 +206,7 @@ namespace SabreTools.Serialization.Readers.Test return new Data.Models.SoftwareList.SoftwareList { Name = "XXXXXX", - Description = "XXXXXX", + Description = "description", Notes = "XXXXXX", Software = [software], }; @@ -221,7 +221,7 @@ namespace SabreTools.Serialization.Readers.Test Assert.Equal("XXXXXX", software.Name); Assert.Equal("XXXXXX", software.CloneOf); Assert.Equal(Data.Models.Metadata.Supported.Yes, software.Supported); - Assert.Equal("XXXXXX", software.Description); + Assert.Equal("description", software.Description); Assert.Equal("XXXXXX", software.Year); Assert.Equal("XXXXXX", software.Publisher); Assert.Equal("XXXXXX", software.Notes); @@ -246,7 +246,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(info); Assert.Equal("XXXXXX", info.Name); - Assert.Equal("XXXXXX", info.Value); + Assert.Equal("value", info.Value); } /// @@ -256,7 +256,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(sharedfeat); Assert.Equal("XXXXXX", sharedfeat.Name); - Assert.Equal("XXXXXX", sharedfeat.Value); + Assert.Equal("value", sharedfeat.Value); } /// @@ -292,7 +292,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(feature); Assert.Equal("XXXXXX", feature.Name); - Assert.Equal("XXXXXX", feature.Value); + Assert.Equal("value", feature.Value); } /// @@ -323,7 +323,7 @@ namespace SabreTools.Serialization.Readers.Test Assert.Equal("XXXXXX", rom.CRC); Assert.Equal("XXXXXX", rom.SHA1); Assert.Equal("XXXXXX", rom.Offset); - Assert.Equal("XXXXXX", rom.Value); + Assert.Equal("value", rom.Value); Assert.Equal(Data.Models.Metadata.ItemStatus.Good, rom.Status); Assert.Equal(Data.Models.Metadata.LoadFlag.Load16Byte, rom.LoadFlag); } @@ -361,8 +361,8 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(dipswitch); Assert.Equal("XXXXXX", dipswitch.Name); - Assert.Equal("XXXXXX", dipswitch.Tag); - Assert.Equal("XXXXXX", dipswitch.Mask); + Assert.Equal("tag", dipswitch.Tag); + Assert.Equal("mask", dipswitch.Mask); Assert.NotNull(dipswitch.DipValue); var dipvalue = Assert.Single(dipswitch.DipValue); @@ -376,7 +376,7 @@ namespace SabreTools.Serialization.Readers.Test { Assert.NotNull(dipvalue); Assert.Equal("XXXXXX", dipvalue.Name); - Assert.Equal("XXXXXX", dipvalue.Value); + Assert.Equal("value", dipvalue.Value); Assert.Equal(true, dipvalue.Default); } }