Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Support Deserializing Geraetemerkmal "G2.5", not only "G2Period5" #584

Merged
merged 2 commits into from
Nov 14, 2024
Merged

fix: Support Deserializing Geraetemerkmal "G2.5", not only "G2Period5" #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ffc693
fix: Support Deserializing Geraetemerkmal`"G2.5"`, not only `"G2Perio…
Nov 14, 2024
6b97feb
Merge branch 'main' into g2.5
hf-kklein Nov 14, 2024
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
9 changes: 6 additions & 3 deletions BO4E/meta/LenientConverters/LenientGeraetemerkmalGasConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,14 @@ JsonSerializer serializer
}
catch (ArgumentException) when (rawValue.StartsWith("G"))
{
if (rawValue == "G2Period5")
switch (rawValue)
{
return Geraetemerkmal.GAS_G2P5;
case "G2Period5":
case "G2.5":
return Geraetemerkmal.GAS_G2P5;
default:
return Enums.Parse<Geraetemerkmal>("GAS_" + rawValue);
}
return Enums.Parse<Geraetemerkmal>("GAS_" + rawValue);
}
}

Expand Down
9 changes: 6 additions & 3 deletions BO4E/meta/LenientConverters/LenientSystemTextGeraetemerkmalGasConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,14 @@ JsonSerializerOptions options
}
catch (ArgumentException) when (rawString.StartsWith("G"))
{
if (rawString == "G2Period5")
switch (rawString)
{
return Geraetemerkmal.GAS_G2P5;
case "G2Period5":
case "G2.5":
return Geraetemerkmal.GAS_G2P5;
default:
return Enums.Parse<Geraetemerkmal>("GAS_" + rawString);
}
return Enums.Parse<Geraetemerkmal>("GAS_" + rawString);
}
}

Expand Down
41 changes: 41 additions & 0 deletions BO4ETestProject/TestGeraetemerkmalConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class TestGeraeteerkmalDeserialization
{
private const string JsonString = "{\"merkmal\":\"G4\"}";
private const string JsonStringWithPeriod = "{\"merkmal\":\"G2Period5\"}";
private const string JsonStringWithLiteralFullstop = "{\"merkmal\":\"G2.5\"}";
private const string JsonStringWasser = "{\"merkmal\":\"WASSER_MWZW\"}";

internal class SomethingWithAGeraetemerkmal
Expand Down Expand Up @@ -163,6 +164,46 @@ public void TestSystemText_Nullable_Success_GPointSomething()
result.Merkmal.Should().Be(Geraetemerkmal.GAS_G2P5);
}

[TestMethod]
public void TestNewtonsoft_Success_Nullable_With_Literal_Fullstop()
{
var result =
Newtonsoft.Json.JsonConvert.DeserializeObject<SomethingWithANullableGeraetemerkmal>(
JsonStringWithLiteralFullstop,
new LenientGeraetemerkmalGasConverter()
);
result.Merkmal.Should().Be(Geraetemerkmal.GAS_G2P5);
}

[TestMethod]
public void TestSystemText_Success_With_Literal_Fullstop()
{
var settings = new System.Text.Json.JsonSerializerOptions()
{
Converters = { new LenientSystemTextGeraetemerkmalGasConverter() },
};
var result = System.Text.Json.JsonSerializer.Deserialize<SomethingWithAGeraetemerkmal>(
JsonStringWithLiteralFullstop,
settings
);
result.Merkmal.Should().Be(Geraetemerkmal.GAS_G2P5);
}

[TestMethod]
public void TestSystemText_Success_With_Nullable_Literal_Fullstop()
{
var settings = new System.Text.Json.JsonSerializerOptions()
{
Converters = { new LenientSystemTextGeraetemerkmalGasConverter() },
};
var result =
System.Text.Json.JsonSerializer.Deserialize<SomethingWithANullableGeraetemerkmal>(
JsonStringWithLiteralFullstop,
settings
);
result.Merkmal.Should().Be(Geraetemerkmal.GAS_G2P5);
}

[TestMethod]
public void TestSystemText_Write_NonNullable()
{
Expand Down
Loading