Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Moryx/Serialization/EntryConvert/EntryConvert.cs
Original file line number Diff line number Diff line change
Expand Up @@ -785,8 +785,9 @@ public static object UpdateInstance(object instance, Entry encoded, ICustomSeria
if (mapped.Entry?.Value.Type == EntryValueType.Exception || property.GetCustomAttribute<ReadOnlyAttribute>()?.IsReadOnly == true)
continue;

// Try to assign value to the property
var currentValue = mapped.Property.GetValue(instance);
// Try to read the current value, skip properties with faulty getters
if (!TryGetValue(property, instance, out var currentValue))
continue;

// Encoders decode the complete entry, members without entry keep their current value
var encoder = customSerialization.GetEncoder(propertyType, property);
Expand Down
15 changes: 15 additions & 0 deletions src/Tests/Moryx.Tests/Moryx.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,19 @@
<ProjectReference Include="..\..\Moryx\Moryx.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Update="Serialization\EntryConvert\Dummies\strings.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>strings.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Serialization\EntryConvert\Dummies\strings.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>strings.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>

</Project>
3 changes: 3 additions & 0 deletions src/Tests/Moryx.Tests/Moryx.Tests.csproj.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=extensions_005Cappdomain/@EntryIndexedValue">True</s:Boolean>

<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=serialization/@EntryIndexedValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=serialization_005Centryconvert/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=serialization_005Centryconvert_005Cdummies/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=serialization_005Centryserializeserialization/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=serialization_005Cpossiblevalues/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=statemachines/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=statemachines_005Ctestmachine/@EntryIndexedValue">True</s:Boolean>
Expand Down
14 changes: 0 additions & 14 deletions src/Tests/Moryx.Tests/Serialization/ArrayDummy.cs

This file was deleted.

84 changes: 0 additions & 84 deletions src/Tests/Moryx.Tests/Serialization/CloneTests.cs

This file was deleted.

23 changes: 0 additions & 23 deletions src/Tests/Moryx.Tests/Serialization/ConstructorDummy.cs

This file was deleted.

89 changes: 0 additions & 89 deletions src/Tests/Moryx.Tests/Serialization/DummyClass.cs

This file was deleted.

41 changes: 0 additions & 41 deletions src/Tests/Moryx.Tests/Serialization/DummyClassIList.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
// 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<SubClassDummy> SubList { get; set; }

public IEnumerable<SubClassDummy> SubEnumerable { get; set; }

public IDictionary<int, SubClassDummy> SubDictionary { get; set; }

public EnumDummy[] EnumArray { get; set; }

public List<EnumDummy> EnumList { get; set; }

public IEnumerable<EnumDummy> EnumEnumerable { get; set; }

public bool[] BoolArray { get; set; }

public List<bool> BoolList { get; set; }

public IEnumerable<EnumDummy> BoolEnumerable { get; set; }

public SubClassDummy GetterOnly { get; } = new();

public int? NullablePrimitive { get; set; } = 0;

#pragma warning disable CA2201 // Do not raise reserved exception types
public int ThrowsException => throw new Exception("BAM.");
#pragma warning restore CA2201 // Do not raise reserved exception types

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<int, SubClassDummy>
{
{ 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
};
}
Loading
Loading