From 350837c142f9f9a22d1769bdfaaa33a7727b7525 Mon Sep 17 00:00:00 2001 From: Marcel Vielhaus Date: Mon, 2 Nov 2026 08:39:51 +0100 Subject: [PATCH 1/3] Clean-up `EntryConvert` tests - Split type-conversion , ossible-values realted and pure `Entry` tests from general entry convert tests - Move method related validation tests to validation tests - Merge possible values and allowed/denied value tests - Merge `EntryConvertTests` and `SerializationTests` - Remove duplicated tests for clone, method parameter validation - Merge different static SubEntry methods, add a static method to create a sub-entry from prototype - Statically create possible values serialization - Merge some dummy classes into the `ClassDummy` - Apply one type per file for dummies as well - Move all dummies into a subfolder - Align names for dummies in this namespace - Replace index-based test arrange and assert with identifier based access - Add test fixture comments to draw attention to the fact that there exist multiple test fixtures for testing `EntryConvert` - Move missplaced `EntrySerializeSerialization` test cases into their test fixutre - Group all `EntryConvert` tests in a directory - Align mixed method name convention in NumericEntryConverterTests - Fix naming violations in `EntrySerializeSerializationDummies` - Fix missing renames from 'converter' to 'encoder' --- src/Tests/Moryx.Tests/Moryx.Tests.csproj | 15 + .../Moryx.Tests/Serialization/ArrayDummy.cs | 14 - .../Moryx.Tests/Serialization/CloneTests.cs | 84 -- .../Serialization/ConstructorDummy.cs | 23 - .../Moryx.Tests/Serialization/DummyClass.cs | 89 -- .../Serialization/DummyClassIList.cs | 41 - .../Dummies/AllowedDeniedValuesClassDummy.cs} | 10 +- .../EntryConvert/Dummies/ClassDummy.cs | 68 + .../Dummies/CollectionConverterDummy.cs | 23 + .../EntryConvert/Dummies/ConverterDummy.cs | 23 + .../Dummies/DictionaryClassDummy.cs} | 8 +- .../Dummies/EncoderMemberTargetsDummy.cs | 26 + .../Dummies/EncoderTypeTargetDummy.cs | 12 + .../EntryConvert/Dummies/EnumDummy.cs | 24 + .../Dummies/FileStreamClassDummy.cs} | 8 +- .../{ => EntryConvert/Dummies}/ListDummy.cs | 7 +- .../Dummies/LocalizedClassDummy.cs} | 7 +- .../Dummies/MemoryStreamClassDummy.cs} | 7 +- .../EntryConvert/Dummies/MethodClassDummy.cs | 72 + .../Dummies/NoEncoderSerializationDummy.cs | 12 + .../Dummies/NumericsDummy.cs} | 12 +- .../PossibleValuesWithContextClassDummy.cs | 19 + ...ossibleValuesWithContextDummyAttribute.cs} | 19 +- .../EntryConvert/Dummies/SubClassDummy.cs | 13 + .../EntryConvert/Dummies/TypesDummy.cs | 26 + .../Dummies}/ValidationDummy.cs | 7 + .../Dummies}/strings.Designer.cs | 7 +- .../Dummies}/strings.de.resx | 0 .../{ => EntryConvert/Dummies}/strings.resx | 13 +- .../EntryConvert/EntryConvertTestHelper.cs | 44 + .../EntryConvert/EntryConvertTests.cs | 1017 +++++++++++++ .../EntryConvert/EntryEncodererTests.cs | 233 +++ .../InvokeMethodTests.cs} | 52 +- .../LocalizationTests.cs} | 56 +- .../EntryConvert/NumericEntryEncoderTests.cs | 228 +++ .../EntryConvert/PossibleValuesTests.cs | 144 ++ .../EntryConvert/TransformTypeTests.cs | 82 ++ .../TypeEntryEncoderTests.cs} | 95 +- .../{ => EntryConvert}/ValidationTests.cs | 56 +- .../EntryConvertEntryConverterTests.cs | 310 ---- .../EntryConvertSerializationTests.cs | 522 ------- .../EntrySerializeDummies.cs | 118 +- .../EntrySerializeSerializationTests.cs | 72 +- .../Moryx.Tests/Serialization/EntryTests.cs | 178 +++ .../Serialization/ExceptionDummy.cs | 14 - .../Serialization/JsonConverterTests.cs | 1 - .../PossibleValuesAttributeTests.cs | 4 +- .../Serialization/SerializationTests.cs | 1310 ----------------- 48 files changed, 2524 insertions(+), 2701 deletions(-) delete mode 100644 src/Tests/Moryx.Tests/Serialization/ArrayDummy.cs delete mode 100644 src/Tests/Moryx.Tests/Serialization/CloneTests.cs delete mode 100644 src/Tests/Moryx.Tests/Serialization/ConstructorDummy.cs delete mode 100644 src/Tests/Moryx.Tests/Serialization/DummyClass.cs delete mode 100644 src/Tests/Moryx.Tests/Serialization/DummyClassIList.cs rename src/Tests/Moryx.Tests/Serialization/{AllowedDeniedValuesClass.cs => EntryConvert/Dummies/AllowedDeniedValuesClassDummy.cs} (53%) create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/ClassDummy.cs create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/CollectionConverterDummy.cs create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/ConverterDummy.cs rename src/Tests/Moryx.Tests/Serialization/{DictionaryClass.cs => EntryConvert/Dummies/DictionaryClassDummy.cs} (67%) create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/EncoderMemberTargetsDummy.cs create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/EncoderTypeTargetDummy.cs create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/EnumDummy.cs rename src/Tests/Moryx.Tests/Serialization/{FileStreamDummy.cs => EntryConvert/Dummies/FileStreamClassDummy.cs} (70%) rename src/Tests/Moryx.Tests/Serialization/{ => EntryConvert/Dummies}/ListDummy.cs (68%) rename src/Tests/Moryx.Tests/Serialization/{LocalizedClass.cs => EntryConvert/Dummies/LocalizedClassDummy.cs} (94%) rename src/Tests/Moryx.Tests/Serialization/{MemoryStreamDummy.cs => EntryConvert/Dummies/MemoryStreamClassDummy.cs} (75%) create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/MethodClassDummy.cs create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/NoEncoderSerializationDummy.cs rename src/Tests/Moryx.Tests/Serialization/{StructPropertiesClass.cs => EntryConvert/Dummies/NumericsDummy.cs} (51%) create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/PossibleValuesWithContextClassDummy.cs rename src/Tests/Moryx.Tests/Serialization/{InstanceAwareValuesClass.cs => EntryConvert/Dummies/PossibleValuesWithContextDummyAttribute.cs} (61%) create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/SubClassDummy.cs create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/TypesDummy.cs rename src/Tests/Moryx.Tests/Serialization/{ => EntryConvert/Dummies}/ValidationDummy.cs (78%) rename src/Tests/Moryx.Tests/Serialization/{ => EntryConvert/Dummies}/strings.Designer.cs (96%) rename src/Tests/Moryx.Tests/Serialization/{ => EntryConvert/Dummies}/strings.de.resx (100%) rename src/Tests/Moryx.Tests/Serialization/{ => EntryConvert/Dummies}/strings.resx (95%) create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/EntryConvertTestHelper.cs create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/EntryConvertTests.cs create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/EntryEncodererTests.cs rename src/Tests/Moryx.Tests/Serialization/{EntryConvertInvokeMethodTests.cs => EntryConvert/InvokeMethodTests.cs} (52%) rename src/Tests/Moryx.Tests/Serialization/{LocalizationSerializationTests.cs => EntryConvert/LocalizationTests.cs} (64%) create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/NumericEntryEncoderTests.cs create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/PossibleValuesTests.cs create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvert/TransformTypeTests.cs rename src/Tests/Moryx.Tests/Serialization/{EntryConvertTypeEntryConverterTests.cs => EntryConvert/TypeEntryEncoderTests.cs} (67%) rename src/Tests/Moryx.Tests/Serialization/{ => EntryConvert}/ValidationTests.cs (59%) delete mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvertEntryConverterTests.cs delete mode 100644 src/Tests/Moryx.Tests/Serialization/EntryConvertSerializationTests.cs rename src/Tests/Moryx.Tests/Serialization/{ => EntrySerializeSerialization}/EntrySerializeDummies.cs (52%) rename src/Tests/Moryx.Tests/Serialization/{ => EntrySerializeSerialization}/EntrySerializeSerializationTests.cs (67%) create mode 100644 src/Tests/Moryx.Tests/Serialization/EntryTests.cs delete mode 100644 src/Tests/Moryx.Tests/Serialization/ExceptionDummy.cs rename src/Tests/Moryx.Tests/Serialization/{PossibleValues => }/PossibleValuesAttributeTests.cs (98%) delete mode 100644 src/Tests/Moryx.Tests/Serialization/SerializationTests.cs diff --git a/src/Tests/Moryx.Tests/Moryx.Tests.csproj b/src/Tests/Moryx.Tests/Moryx.Tests.csproj index d84b2535c8..bf842cc58b 100644 --- a/src/Tests/Moryx.Tests/Moryx.Tests.csproj +++ b/src/Tests/Moryx.Tests/Moryx.Tests.csproj @@ -13,4 +13,19 @@ + + + True + True + strings.resx + + + + + + PublicResXFileCodeGenerator + strings.Designer.cs + + + diff --git a/src/Tests/Moryx.Tests/Serialization/ArrayDummy.cs b/src/Tests/Moryx.Tests/Serialization/ArrayDummy.cs deleted file mode 100644 index c09b6cb544..0000000000 --- a/src/Tests/Moryx.Tests/Serialization/ArrayDummy.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG -// Licensed under the Apache License, Version 2.0 - -namespace Moryx.Tests.Serialization; - -public class ArrayDummy -{ - public int[] Array { get; set; } - - public string[] Keys { get; set; } - - public DummyEnum[] Enums { get; set; } - -} \ No newline at end of file diff --git a/src/Tests/Moryx.Tests/Serialization/CloneTests.cs b/src/Tests/Moryx.Tests/Serialization/CloneTests.cs deleted file mode 100644 index 4594806fed..0000000000 --- a/src/Tests/Moryx.Tests/Serialization/CloneTests.cs +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG -// Licensed under the Apache License, Version 2.0 - -using System; -using System.Globalization; -using System.Linq; -using Moryx.Serialization; -using NUnit.Framework; - -namespace Moryx.Tests.Serialization; - -/// -/// Unit tests for different clone mechanism -/// -[TestFixture] -public class CloneTests -{ - [Test(Description = "Make sure generated clone method is complete")] - public void GeneratedClone() - { - // Arrange - var root = Create(1, 16); - - // Act - var clone = root.Clone(true); - - // Assert - Compare(root, clone); - } - - private static Entry Create(int id, int children) - { - var entry = new Entry - { - Description = "Some dummy entry", - Identifier = id.ToString("D5", CultureInfo.InvariantCulture), - DisplayName = string.Format(CultureInfo.InvariantCulture, "Entry-{0}", id), - Value = new EntryValue - { - Current = (id * 123).ToString("D", CultureInfo.InvariantCulture), - Default = "42", - Type = (EntryValueType)(id % 7), - UnitType = (EntryUnitType)(id % Enum.GetNames(typeof(EntryUnitType)).Length), - Possible = - [ - new EntryPossible { Key = "12334", DisplayName = "Option A", Description = "First possible value" }, - new EntryPossible { Key = "1123361", DisplayName = "Option B", Description = "Second possible value" }, - new EntryPossible { Key = "11236", DisplayName = "Option C", Description = "Third possible value" } - ] - } - }; - for (var i = 0; i < children; i++) - { - entry.SubEntries.Add(Create(id * 10 + i, children / 2)); - } - return entry; - } - - private static void Compare(Entry expected, Entry value) - { - // Compare all values - Assert.That(value.Description, Is.EqualTo(expected.Description)); - - // Compare key - Assert.That(value.Identifier, Is.EqualTo(expected.Identifier)); - Assert.That(expected.DisplayName, Is.EqualTo(expected.DisplayName)); - - // Compare value - Assert.That(value.Value.Current, Is.EqualTo(expected.Value.Current)); - Assert.That(value.Value.Default, Is.EqualTo(expected.Value.Default)); - Assert.That( - value.Value.Possible.Select(p => (p.Key, p.DisplayName, p.Description)), - Is.EqualTo(expected.Value.Possible.Select(p => (p.Key, p.DisplayName, p.Description)))); - Assert.That(value.Value.Type, Is.EqualTo(expected.Value.Type)); - Assert.That(value.Value.UnitType, Is.EqualTo(expected.Value.UnitType)); - - // Continue recursive - Assert.That(value.SubEntries.Count, Is.EqualTo(expected.SubEntries.Count)); - for (var i = 0; i < expected.SubEntries.Count; i++) - { - Compare(expected.SubEntries[i], value.SubEntries[i]); - } - } -} diff --git a/src/Tests/Moryx.Tests/Serialization/ConstructorDummy.cs b/src/Tests/Moryx.Tests/Serialization/ConstructorDummy.cs deleted file mode 100644 index 7b449b5609..0000000000 --- a/src/Tests/Moryx.Tests/Serialization/ConstructorDummy.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG -// Licensed under the Apache License, Version 2.0 - -using System; - -namespace Moryx.Tests.Serialization; - -public class ConstructorDummy -{ - public ConstructorDummy(int foo) : this(foo, String.Empty) - { - } - - public ConstructorDummy(int foo, string text) - { - Foo = foo; - Text = text; - } - - public int Foo { get; } - - public string Text { get; } -} \ No newline at end of file diff --git a/src/Tests/Moryx.Tests/Serialization/DummyClass.cs b/src/Tests/Moryx.Tests/Serialization/DummyClass.cs deleted file mode 100644 index 558485b694..0000000000 --- a/src/Tests/Moryx.Tests/Serialization/DummyClass.cs +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG -// Licensed under the Apache License, Version 2.0 - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace Moryx.Tests.Serialization; - -public class DummyClass -{ - public int Number { get; set; } - - public string Name { get; set; } - - public DateTime ModifiedAt { get; set; } - - public DateTimeOffset CreatedAt { get; set; } - - public int ReadOnly => 10; - - public SubClass SingleClass { get; set; } - - public SubClass[] SubArray { get; set; } - - public List SubList { get; set; } - - public IEnumerable SubEnumerable { get; set; } - - public IDictionary SubDictionary { get; set; } - - public DummyEnum[] EnumArray { get; set; } - - public List EnumList { get; set; } - - public IEnumerable EnumEnumerable { get; set; } - - public bool[] BoolArray { get; set; } - - public List BoolList { get; set; } - - public IEnumerable BoolEnumerable { get; set; } - - public SubClass SingleClassNonLocalized { get; set; } -} - -public class SubClass -{ - public float Foo { get; set; } - - public DummyEnum Enum { get; set; } - - public DummyEnum[] EnumArray { get; set; } -} - -public enum DummyEnum -{ - Unset, - ValueA, - ValueB -} - -public class NullablePropertiesClass -{ - public int? Value { get; set; } = 0; -} - -public enum DisplayNameEnum -{ - [Display(Name = DisplayNameEnumStrings.UnsetDisplayName, Description = DisplayNameEnumStrings.UnsetDescription)] - Unset, - - [Display(Name = DisplayNameEnumStrings.ValueADisplayName)] - ValueA, - - ValueB -} - -public static class DisplayNameEnumStrings -{ - public const string UnsetDisplayName = "No Value"; - public const string UnsetDescription = "Nothing selected"; - public const string ValueADisplayName = "First Value"; -} - -public class DisplayNameEnumClass -{ - public DisplayNameEnum EnumProperty { get; set; } -} \ No newline at end of file diff --git a/src/Tests/Moryx.Tests/Serialization/DummyClassIList.cs b/src/Tests/Moryx.Tests/Serialization/DummyClassIList.cs deleted file mode 100644 index 84fb42f446..0000000000 --- a/src/Tests/Moryx.Tests/Serialization/DummyClassIList.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG -// Licensed under the Apache License, Version 2.0 - -using System.Collections.Generic; - -namespace Moryx.Tests.Serialization; - -public class DummyClassIList -{ - public int Number { get; set; } - - public string Name { get; set; } - - public int ReadOnly => 10; - - public SubClass SingleClass { get; set; } - - public SubClass[] SubArray { get; set; } - - public List SubList { get; set; } - - public IList SubIList { get; set; } - - public IEnumerable SubEnumerable { get; set; } - - public IDictionary SubDictionary { get; set; } - - public DummyEnum[] EnumArray { get; set; } - - public List EnumList { get; set; } - - public IEnumerable EnumEnumerable { get; set; } - - public bool[] BoolArray { get; set; } - - public List BoolList { get; set; } - - public IEnumerable BoolEnumerable { get; set; } - - public SubClass SingleClassNonLocalized { get; set; } -} \ No newline at end of file diff --git a/src/Tests/Moryx.Tests/Serialization/AllowedDeniedValuesClass.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/AllowedDeniedValuesClassDummy.cs similarity index 53% rename from src/Tests/Moryx.Tests/Serialization/AllowedDeniedValuesClass.cs rename to src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/AllowedDeniedValuesClassDummy.cs index 9c4214dc7b..a8423e045d 100644 --- a/src/Tests/Moryx.Tests/Serialization/AllowedDeniedValuesClass.cs +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/AllowedDeniedValuesClassDummy.cs @@ -5,13 +5,13 @@ namespace Moryx.Tests.Serialization; -public class AllowedDeniedValuesClass +public class AllowedDeniedValuesClassDummy { - [AllowedValues(DummyEnum.ValueA, DummyEnum.ValueB)] - public DummyEnum AllowedValues { get; set; } + [AllowedValues(EnumDummy.ValueA, EnumDummy.ValueB)] + public EnumDummy AllowedValues { get; set; } - [DeniedValues(DummyEnum.Unset)] - public DummyEnum DeniedValues { get; set; } + [DeniedValues(EnumDummy.Unset)] + public EnumDummy DeniedValues { get; set; } [AllowedValues(1, 5, 20)] public int AllowedIntValues { get; set; } diff --git a/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/ClassDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/ClassDummy.cs new file mode 100644 index 0000000000..be2f1d69a7 --- /dev/null +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/ClassDummy.cs @@ -0,0 +1,68 @@ +// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG +// Licensed under the Apache License, Version 2.0 + +namespace Moryx.Tests.Serialization; + +public class ClassDummy +{ + public int Number { get; set; } + + public string Name { get; set; } + + public DateTime ModifiedAt { get; set; } + + public DateTimeOffset CreatedAt { get; set; } + + public SubClassDummy SingleClass { get; set; } + + public SubClassDummy[] SubArray { get; set; } + + public List SubList { get; set; } + + public IEnumerable SubEnumerable { get; set; } + + public IDictionary SubDictionary { get; set; } + + public EnumDummy[] EnumArray { get; set; } + + public List EnumList { get; set; } + + public IEnumerable EnumEnumerable { get; set; } + + public bool[] BoolArray { get; set; } + + public List BoolList { get; set; } + + public IEnumerable BoolEnumerable { get; set; } + + public SubClassDummy GetterOnly { get; } = new(); + + public int? NullablePrimitive { get; set; } = 0; + + // TODO: This actually shows a bug in EntryConvert in the existing tests + //public int ThrowsException => throw new Exception("BAM."); + + public static ClassDummy Populate() => new() + { + Number = 42, + Name = "TestName", + ModifiedAt = new DateTime(2024, 1, 1, 12, 0, 0, DateTimeKind.Utc), + CreatedAt = new DateTimeOffset(2024, 1, 1, 12, 0, 0, TimeSpan.Zero), + SingleClass = new SubClassDummy { Foo = 1.2f, Enum = EnumDummy.ValueA, EnumArray = [EnumDummy.ValueA, EnumDummy.ValueB] }, + SubArray = [new SubClassDummy { Foo = 1.2f, Enum = EnumDummy.ValueB }], + SubList = [new SubClassDummy { Foo = 3.4f, Enum = EnumDummy.ValueA }], + SubEnumerable = [new SubClassDummy { Foo = 5.6f, Enum = EnumDummy.ValueB }], + SubDictionary = new Dictionary + { + { 1, new SubClassDummy { Foo = 1.2f, Enum = EnumDummy.ValueA } }, + { 2, new SubClassDummy { Foo = 3.4f, Enum = EnumDummy.ValueB } } + }, + EnumArray = [EnumDummy.ValueA, EnumDummy.ValueB], + EnumList = [EnumDummy.ValueA, EnumDummy.ValueB], + EnumEnumerable = [EnumDummy.ValueA, EnumDummy.ValueB], + BoolArray = [true, false, true], + BoolList = [true, false], + BoolEnumerable = [EnumDummy.ValueA, EnumDummy.ValueB], + NullablePrimitive = 7 + }; +} diff --git a/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/CollectionConverterDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/CollectionConverterDummy.cs new file mode 100644 index 0000000000..84bc05270a --- /dev/null +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/CollectionConverterDummy.cs @@ -0,0 +1,23 @@ +// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG +// Licensed under the Apache License, Version 2.0 + +using Moryx.Serialization; + +namespace Moryx.Tests.Serialization; + +public class CollectionConverterDummy : EntryEncoderBase +{ + public override bool CanEncode(Type memberType) => memberType == typeof(List); + + public override Entry Encode(object value, EntryEncoderContext context) => new() + { + Value = new EntryValue + { + Type = EntryValueType.String, + Current = string.Join(",", ((List)value ?? []).Select(t => t.Tag)) + } + }; + + public override object Decode(Entry entry, object currentValue, EntryEncoderContext context) => + entry.Value.Current.Split(',').Select(tag => new EncoderTypeTargetDummy { Tag = tag }).ToList(); +} diff --git a/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/ConverterDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/ConverterDummy.cs new file mode 100644 index 0000000000..d2d5ac4af4 --- /dev/null +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/ConverterDummy.cs @@ -0,0 +1,23 @@ +// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG +// Licensed under the Apache License, Version 2.0 + +using Moryx.Serialization; + +namespace Moryx.Tests.Serialization; + +public abstract class ConverterDummy(string prefix) : EntryEncoderBase +{ + public override bool CanEncode(Type memberType) => memberType == typeof(EncoderTypeTargetDummy); + + public override Entry Encode(object value, EntryEncoderContext context) => new() + { + Value = new EntryValue { Type = EntryValueType.String, Current = prefix + (value as EncoderTypeTargetDummy)?.Tag } + }; + + public override object Decode(Entry entry, object currentValue, EntryEncoderContext context) => + new EncoderTypeTargetDummy { Tag = entry.Value.Current[prefix.Length..] }; +} + +public class TypeConverterDummy() : ConverterDummy("type:"); + +public class PropertyConverterDummy() : ConverterDummy("property:"); diff --git a/src/Tests/Moryx.Tests/Serialization/DictionaryClass.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/DictionaryClassDummy.cs similarity index 67% rename from src/Tests/Moryx.Tests/Serialization/DictionaryClass.cs rename to src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/DictionaryClassDummy.cs index 516f1ccaf3..4aa0c4da98 100644 --- a/src/Tests/Moryx.Tests/Serialization/DictionaryClass.cs +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/DictionaryClassDummy.cs @@ -1,15 +1,13 @@ // Copyright (c) 2026 Phoenix Contact GmbH & Co. KG // Licensed under the Apache License, Version 2.0 -using System.Collections.Generic; - namespace Moryx.Tests.Serialization; -class DictionaryClass +class DictionaryClassDummy { public string Name { get; set; } public IDictionary SubDictionary { get; set; } - public IDictionary EnumDictionary { get; set; } -} \ No newline at end of file + public IDictionary EnumDictionary { get; set; } +} diff --git a/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/EncoderMemberTargetsDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/EncoderMemberTargetsDummy.cs new file mode 100644 index 0000000000..705f06093a --- /dev/null +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/EncoderMemberTargetsDummy.cs @@ -0,0 +1,26 @@ +// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG +// Licensed under the Apache License, Version 2.0 + +using Moryx.Serialization; + +namespace Moryx.Tests.Serialization; + +public class EncoderMemberTargetsDummy +{ + public EncoderTypeTargetDummy ByType { get; set; } + + [EntrySerialize(EncoderType = typeof(PropertyConverterDummy))] + public EncoderTypeTargetDummy ByProperty { get; set; } + + public List ByItemType { get; set; } + + [EntrySerialize(EncoderType = typeof(PropertyConverterDummy), EncoderTarget = EntryEncoderTarget.Items)] + public List ByItemEncoder { get; set; } + + [EntrySerialize(EncoderType = typeof(CollectionConverterDummy))] + public List ByMemberEncoder { get; set; } + + public EncoderTypeTargetDummy Received { get; private set; } + + public void ByParameter([EntrySerialize(EncoderType = typeof(PropertyConverterDummy))] EncoderTypeTargetDummy tagged) => Received = tagged; +} diff --git a/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/EncoderTypeTargetDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/EncoderTypeTargetDummy.cs new file mode 100644 index 0000000000..d5626cafb9 --- /dev/null +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/EncoderTypeTargetDummy.cs @@ -0,0 +1,12 @@ +// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG +// Licensed under the Apache License, Version 2.0 + +using Moryx.Serialization; + +namespace Moryx.Tests.Serialization; + +[EntrySerialize(EncoderType = typeof(TypeConverterDummy))] +public class EncoderTypeTargetDummy +{ + public string Tag { get; set; } +} diff --git a/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/EnumDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/EnumDummy.cs new file mode 100644 index 0000000000..d2410e22da --- /dev/null +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/EnumDummy.cs @@ -0,0 +1,24 @@ +// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG +// Licensed under the Apache License, Version 2.0 + +using System.ComponentModel.DataAnnotations; + +namespace Moryx.Tests.Serialization; + +public enum EnumDummy +{ + [Display(Name = DisplayNameEnumStrings.UnsetDisplayName, Description = DisplayNameEnumStrings.UnsetDescription)] + Unset, + + [Display(Name = DisplayNameEnumStrings.ValueADisplayName)] + ValueA, + + ValueB +} + +public static class DisplayNameEnumStrings +{ + public const string UnsetDisplayName = "No Value"; + public const string UnsetDescription = "Nothing selected"; + public const string ValueADisplayName = "First Value"; +} diff --git a/src/Tests/Moryx.Tests/Serialization/FileStreamDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/FileStreamClassDummy.cs similarity index 70% rename from src/Tests/Moryx.Tests/Serialization/FileStreamDummy.cs rename to src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/FileStreamClassDummy.cs index e6659b2b5a..b096dd00a0 100644 --- a/src/Tests/Moryx.Tests/Serialization/FileStreamDummy.cs +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/FileStreamClassDummy.cs @@ -1,16 +1,14 @@ // Copyright (c) 2026 Phoenix Contact GmbH & Co. KG // Licensed under the Apache License, Version 2.0 -using System.IO; - namespace Moryx.Tests.Serialization; -public class FileStreamDummy +public class FileStreamClassDummy { - public FileStreamDummy(string filePath, FileMode mode) + public FileStreamClassDummy(string filePath, FileMode mode) { FileStream = new FileStream(filePath, mode); } public FileStream FileStream { get; set; } -} \ No newline at end of file +} diff --git a/src/Tests/Moryx.Tests/Serialization/ListDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/ListDummy.cs similarity index 68% rename from src/Tests/Moryx.Tests/Serialization/ListDummy.cs rename to src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/ListDummy.cs index 83e374fa8b..50103606f6 100644 --- a/src/Tests/Moryx.Tests/Serialization/ListDummy.cs +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/ListDummy.cs @@ -1,7 +1,6 @@ // Copyright (c) 2026 Phoenix Contact GmbH & Co. KG // Licensed under the Apache License, Version 2.0 -using System.Collections.Generic; using System.ComponentModel.DataAnnotations; namespace Moryx.Tests.Serialization; @@ -13,7 +12,7 @@ public class ListDummy [AllowedValues(1.0, 13.37, 42.0)] public List DoubleList { get; set; } - public List EnumList { get; set; } + public List EnumList { get; set; } - public List ReadOnly => [new SubClass { Foo = 4.2f }]; -} \ No newline at end of file + public List ReadOnly => [new SubClassDummy { Foo = 4.2f }]; +} diff --git a/src/Tests/Moryx.Tests/Serialization/LocalizedClass.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/LocalizedClassDummy.cs similarity index 94% rename from src/Tests/Moryx.Tests/Serialization/LocalizedClass.cs rename to src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/LocalizedClassDummy.cs index 8b016e8826..30b985fd88 100644 --- a/src/Tests/Moryx.Tests/Serialization/LocalizedClass.cs +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/LocalizedClassDummy.cs @@ -7,7 +7,7 @@ namespace Moryx.Tests.Serialization; [Display(Name = nameof(strings.ClassName), ResourceType = typeof(strings))] -public class LocalizedClass +public class LocalizedClassDummy { public const string PropDisplayNameAttributeDisplayName = "Display Name"; @@ -16,14 +16,11 @@ public class LocalizedClass [DisplayName(PropDisplayNameAttributeDisplayName)] public string PropDisplayNameAttribute { get; set; } -} -public class LocalizedMethodDummyClass -{ [Display(Name = nameof(strings.InitiateWorldTermination), Description = nameof(strings.InitiateWorldTerminationDescription), ResourceType = typeof(strings))] public bool InitiateWorldTermination([Display(Name = nameof(strings.EvacuatePeopleParam), Description = nameof(strings.EvacuatePeopleParamDescription), ResourceType = typeof(strings))] bool evacuatePeople, [Display(Name = nameof(strings.NameOfTerminatorParam), ResourceType = typeof(strings))] string nameOfTerminator) { return true; } -} \ No newline at end of file +} diff --git a/src/Tests/Moryx.Tests/Serialization/MemoryStreamDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/MemoryStreamClassDummy.cs similarity index 75% rename from src/Tests/Moryx.Tests/Serialization/MemoryStreamDummy.cs rename to src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/MemoryStreamClassDummy.cs index 9596c7e37c..0ca8a97e28 100644 --- a/src/Tests/Moryx.Tests/Serialization/MemoryStreamDummy.cs +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/MemoryStreamClassDummy.cs @@ -1,17 +1,16 @@ // Copyright (c) 2026 Phoenix Contact GmbH & Co. KG // Licensed under the Apache License, Version 2.0 -using System.IO; using System.Text; namespace Moryx.Tests.Serialization; -public class MemoryStreamDummy +public class MemoryStreamClassDummy { - public MemoryStreamDummy(string testString) + public MemoryStreamClassDummy(string testString) { MemoryStream = new MemoryStream(Encoding.UTF8.GetBytes(testString)); } public MemoryStream MemoryStream { get; set; } -} \ No newline at end of file +} diff --git a/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/MethodClassDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/MethodClassDummy.cs new file mode 100644 index 0000000000..b4d6d77a4f --- /dev/null +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/MethodClassDummy.cs @@ -0,0 +1,72 @@ +// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG +// Licensed under the Apache License, Version 2.0 + +using System.Xml.Linq; +using Moryx.Serialization; +using static System.Runtime.InteropServices.JavaScript.JSType; + +namespace Moryx.Tests.Serialization; + +public class MethodClassDummy +{ + public MethodClassDummy() + { + } + + public MethodClassDummy(int number) : this(number, string.Empty) + { + } + + public MethodClassDummy(int number, string name) + { + Number = number; + Name = name; + } + + public int Number { get; private set; } + + public string Name { get; private set; } + + [EntrySerialize] + public void InvocablePublic() + { + } + + [EntrySerialize] + public void InvocablePublic(int intValue, string stringValue1, string stringValue2 = "testing value") + { + } + + [EntrySerialize] +#pragma warning disable CA1822 // Mark members as static + internal void InvocableInternal() +#pragma warning restore CA1822 // Mark members as static + { + } + + [EntrySerialize] + protected void NonInvocableProtected() + { + } + + [EntrySerialize] +#pragma warning disable CA1822 // Mark members as static +#pragma warning disable IDE0051 // Remove unused private members + private void NonInvocablePrivate() +#pragma warning restore IDE0051 // Remove unused private members +#pragma warning restore CA1822 // Mark members as static + { + } + + [EntrySerialize] + public Task AsyncWithoutResult() + { + return Task.CompletedTask; + } + + [EntrySerialize] + public Task AsyncWithStringResult() + { + return Task.FromResult("Test"); + } +} diff --git a/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/NoEncoderSerializationDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/NoEncoderSerializationDummy.cs new file mode 100644 index 0000000000..b1ce46f88e --- /dev/null +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/NoEncoderSerializationDummy.cs @@ -0,0 +1,12 @@ +// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG +// Licensed under the Apache License, Version 2.0 + +using System.Reflection; +using Moryx.Serialization; + +namespace Moryx.Tests.Serialization; + +public class NoEncoderSerializationDummy : DefaultSerialization +{ + public override EntryEncoderBase GetEncoder(Type memberType, ICustomAttributeProvider attributeProvider) => null; +} diff --git a/src/Tests/Moryx.Tests/Serialization/StructPropertiesClass.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/NumericsDummy.cs similarity index 51% rename from src/Tests/Moryx.Tests/Serialization/StructPropertiesClass.cs rename to src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/NumericsDummy.cs index 573f77dbf9..defea252d5 100644 --- a/src/Tests/Moryx.Tests/Serialization/StructPropertiesClass.cs +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/NumericsDummy.cs @@ -5,7 +5,7 @@ namespace Moryx.Tests.Serialization; -public class StructPropertiesClass +public class NumericsDummy { public Vector2 Position2D { get; set; } @@ -16,4 +16,14 @@ public class StructPropertiesClass public Quaternion Rotation { get; set; } public Plane Surface { get; set; } + + public List Positions { get; set; } + + public Dictionary Named { get; set; } + + public Vector3 Position { get; private set; } + public void Move(Vector3 position) => Position = position; + + public List Path { get; private set; } + public void MoveAlong(List path) => Path = path; } diff --git a/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/PossibleValuesWithContextClassDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/PossibleValuesWithContextClassDummy.cs new file mode 100644 index 0000000000..a5fe0afba8 --- /dev/null +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/PossibleValuesWithContextClassDummy.cs @@ -0,0 +1,19 @@ +// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG +// Licensed under the Apache License, Version 2.0 + +using Moryx.Serialization; + +namespace Moryx.Tests.Serialization; + +public class PossibleValuesWithContextClassDummy +{ + public List AllowedValues { get; set; } + + [PossibleValuesWithContextDummy] + public string SelectedValue { get; set; } + + [EntrySerialize] + public void DoSomething([PossibleValuesWithContextDummy] string value) + { + } +} diff --git a/src/Tests/Moryx.Tests/Serialization/InstanceAwareValuesClass.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/PossibleValuesWithContextDummyAttribute.cs similarity index 61% rename from src/Tests/Moryx.Tests/Serialization/InstanceAwareValuesClass.cs rename to src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/PossibleValuesWithContextDummyAttribute.cs index 1323e20a81..673617e12f 100644 --- a/src/Tests/Moryx.Tests/Serialization/InstanceAwareValuesClass.cs +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/PossibleValuesWithContextDummyAttribute.cs @@ -6,26 +6,13 @@ namespace Moryx.Tests.Serialization; -public class InstanceAwareValuesClass -{ - public List AllowedValues { get; set; } - - [StringListPossibleValue] - public string SelectedValue { get; set; } - - [EntrySerialize] - public void DoSomething([StringListPossibleValue] string value) - { - } -} - -public class StringListPossibleValueAttribute : PossibleValuesAttribute +public class PossibleValuesWithContextDummyAttribute : PossibleValuesAttribute { public override bool OverridesConversion => false; public override bool UpdateFromPredecessor => false; - public StringListPossibleValueAttribute() + public PossibleValuesWithContextDummyAttribute() { RequiresPossibleValuesContext = true; } @@ -37,7 +24,7 @@ public override IEnumerable GetValues(IContainer localContainer, IServic public override IEnumerable GetValues(PossibleValuesContext context = null) { - if (context!.Instance is not InstanceAwareValuesClass value) + if (context!.Instance is not PossibleValuesWithContextClassDummy value) { throw new InvalidOperationException(); } diff --git a/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/SubClassDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/SubClassDummy.cs new file mode 100644 index 0000000000..f0c0f9f241 --- /dev/null +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/SubClassDummy.cs @@ -0,0 +1,13 @@ +// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG +// Licensed under the Apache License, Version 2.0 + +namespace Moryx.Tests.Serialization; + +public sealed class SubClassDummy +{ + public float Foo { get; set; } + + public EnumDummy Enum { get; set; } + + public EnumDummy[] EnumArray { get; set; } +} diff --git a/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/TypesDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/TypesDummy.cs new file mode 100644 index 0000000000..e68a67bc0f --- /dev/null +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/TypesDummy.cs @@ -0,0 +1,26 @@ +// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG +// Licensed under the Apache License, Version 2.0 + +using Moryx.Serialization; + +namespace Moryx.Tests.Serialization; + +public class TypesDummy +{ + public Type PlainType { get; set; } + + [PossibleTypes([typeof(string), typeof(int)], UseFullname = true)] + public Type SelectableType { get; set; } + + [PossibleTypes([typeof(string), typeof(int)], UseFullname = true)] + public string TypeName { get; set; } + + [PossibleTypes([typeof(string), typeof(int)], UseFullname = true)] + public List TypeList { get; set; } + + public Type ReceivedType { get; private set; } = typeof(object); + + public void Select([PossibleTypes([typeof(string), typeof(int)], UseFullname = true)] Type type) => ReceivedType = type; + + public void SelectAny(Type type) => ReceivedType = type; +} diff --git a/src/Tests/Moryx.Tests/Serialization/ValidationDummy.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/ValidationDummy.cs similarity index 78% rename from src/Tests/Moryx.Tests/Serialization/ValidationDummy.cs rename to src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/ValidationDummy.cs index 5c93d833fc..07e6258e28 100644 --- a/src/Tests/Moryx.Tests/Serialization/ValidationDummy.cs +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/ValidationDummy.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0 using System.ComponentModel.DataAnnotations; +using Moryx.Serialization; namespace Moryx.Tests.Serialization; @@ -34,4 +35,10 @@ public class ValidationDummy [Required] public bool RequiredBool { get; set; } + + [EntrySerialize] + public void MethodWithRequiredAndOptionalParameters(string plainParameter, + [Required] string requiredParameter, string nullableString = null, string defaultValueString = "Some test string") + { + } } diff --git a/src/Tests/Moryx.Tests/Serialization/strings.Designer.cs b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/strings.Designer.cs similarity index 96% rename from src/Tests/Moryx.Tests/Serialization/strings.Designer.cs rename to src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/strings.Designer.cs index 26f8fad46a..ecca4e8962 100644 --- a/src/Tests/Moryx.Tests/Serialization/strings.Designer.cs +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/strings.Designer.cs @@ -1,6 +1,3 @@ -// Copyright (c) 2026 Phoenix Contact GmbH & Co. KG -// Licensed under the Apache License, Version 2.0 - //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -22,7 +19,7 @@ namespace Moryx.Tests.Serialization { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class strings { @@ -42,7 +39,7 @@ internal strings() { public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Moryx.Tests.Serialization.strings", typeof(strings).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Moryx.Tests.Serialization.EntryConvert.Dummies.strings", typeof(strings).Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/Tests/Moryx.Tests/Serialization/strings.de.resx b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/strings.de.resx similarity index 100% rename from src/Tests/Moryx.Tests/Serialization/strings.de.resx rename to src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/strings.de.resx diff --git a/src/Tests/Moryx.Tests/Serialization/strings.resx b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/strings.resx similarity index 95% rename from src/Tests/Moryx.Tests/Serialization/strings.resx rename to src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/strings.resx index 565939929b..aa66d51531 100644 --- a/src/Tests/Moryx.Tests/Serialization/strings.resx +++ b/src/Tests/Moryx.Tests/Serialization/EntryConvert/Dummies/strings.resx @@ -1,4 +1,4 @@ - +