mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
Merge pull request #4749 from crobibero/guid-standard
This commit is contained in:
commit
933e7fa159
2 changed files with 20 additions and 2 deletions
|
@ -1,4 +1,5 @@
|
||||||
using System;
|
using System;
|
||||||
|
using System.Globalization;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
@ -19,7 +20,7 @@ namespace MediaBrowser.Common.Json.Converters
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override void Write(Utf8JsonWriter writer, Guid value, JsonSerializerOptions options)
|
public override void Write(Utf8JsonWriter writer, Guid value, JsonSerializerOptions options)
|
||||||
{
|
{
|
||||||
writer.WriteStringValue(value);
|
writer.WriteStringValue(value.ToString("N", CultureInfo.InvariantCulture));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
using System;
|
using System;
|
||||||
|
using System.Globalization;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using MediaBrowser.Common.Json.Converters;
|
using MediaBrowser.Common.Json.Converters;
|
||||||
using Xunit;
|
using Xunit;
|
||||||
|
@ -46,7 +47,23 @@ namespace Jellyfin.Common.Tests.Json
|
||||||
[Fact]
|
[Fact]
|
||||||
public void Serialize_EmptyGuid_EmptyGuid()
|
public void Serialize_EmptyGuid_EmptyGuid()
|
||||||
{
|
{
|
||||||
Assert.Equal($"\"{Guid.Empty}\"", JsonSerializer.Serialize(Guid.Empty, _options));
|
Assert.Equal($"\"{Guid.Empty:N}\"", JsonSerializer.Serialize(Guid.Empty, _options));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Serialize_Valid_NoDash_Success()
|
||||||
|
{
|
||||||
|
var guid = new Guid("531797E9-9457-40E0-88BC-B1D6D38752FA");
|
||||||
|
var str = JsonSerializer.Serialize(guid, _options);
|
||||||
|
Assert.Equal($"\"{guid:N}\"", str);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Serialize_Nullable_Success()
|
||||||
|
{
|
||||||
|
Guid? guid = new Guid("531797E9-9457-40E0-88BC-B1D6D38752FA");
|
||||||
|
var str = JsonSerializer.Serialize(guid, _options);
|
||||||
|
Assert.Equal($"\"{guid:N}\"", str);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue