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
23 changes: 23 additions & 0 deletions WheelWizard.Test/Features/MiiSerializerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,27 @@ public void Deserialize_InvalidLengthData_ShouldFail()
Assert.True(result.IsFailure);
Assert.Equal("Invalid Mii data length.", result.Error.Message);
}

[Fact]
public void Deserialize_InvalidCalendarDate_ShouldFailInsteadOfThrowing()
{
var data = Convert.FromBase64String(dataList[0]);
ushort header = (ushort)((data[0] << 8) | data[1]);
header = (ushort)((header & ~(0x0F << 10)) | (2 << 10));
header = (ushort)((header & ~(0x1F << 5)) | (31 << 5));
data[0] = (byte)(header >> 8);
data[1] = (byte)header;

var result = MiiSerializer.Deserialize(data);

Assert.True(result.IsFailure);
}

[Fact]
public void Deserialize_InvalidBase64_ShouldFailInsteadOfThrowing()
{
var result = MiiSerializer.Deserialize("not valid base64");

Assert.True(result.IsFailure);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,31 @@ public static OperationResult<byte[]> Serialize(Mii? mii)
return data;
}

public static OperationResult<Mii> Deserialize(string data) => Deserialize(Convert.FromBase64String(data));
public static OperationResult<Mii> Deserialize(string data)
{
try
{
return Deserialize(Convert.FromBase64String(data));
}
catch (Exception ex)
{
return InvalidDataExc(ex);
}
}

public static OperationResult<Mii> Deserialize(byte[]? data)
{
try
{
return DeserializeCore(data);
}
catch (Exception ex)
{
return InvalidDataExc(ex);
}
}

private static OperationResult<Mii> DeserializeCore(byte[]? data)
{
if (data == null || data.Length != 74)
return Fail("Invalid Mii data length.", MessageTranslation.Error_MiiSerializer_MiiDataLength);
Expand Down Expand Up @@ -342,4 +364,9 @@ private static OperationResult<Mii> InvalidDataExc(string data)
{
return Fail(new InvalidDataException($"Invalid {data}"), MessageTranslation.Error_MiiSerializer_InvalidMiiData, null, [data]);
}

private static OperationResult<Mii> InvalidDataExc(Exception exception)
{
return Fail(exception, MessageTranslation.Error_MiiSerializer_InvalidMiiData, null, [exception.Message]);
}
}
Loading