14943290972

Committed 10 May 2025 07:39AM UTC coverage: 84.091% (-0.2%) from 84.281%

Build # 14943290972

Build Type

push

github

Committed by

web-flow

Commit Message

Fix crash in 2025.5 (#1309)

* Add test

* Add converter for arrays of arrays of strings, more test cases

* Remove testing workaroudn

---------

Co-authored-by: Frank Bakker <bakker.frank@gmail.com>
Co-authored-by: Frank Bakker <FrankBakkerNl@users.noreply.github.com>

Run Details

859 of 1145 branches covered (75.02%)

Branch coverage included in aggregate %.

12 of 23 new or added lines in 2 files covered. (52.17%)

1 existing line in 1 file now uncovered.

3359 of 3871 relevant lines covered (86.77%)

127.13 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

62.5

/src/Client/NetDaemon.HassClient/Internal/Json/EnsureArrayOfArrayOfStringConverter.cs

namespace NetDaemon.Client.Internal.Json;

using System.Text.Json;
using System.Text.Json.Serialization;

/// <summary>
/// Converts a Json element that can be an array of arrays of strings to a list of lists of strings.
/// </summary>
class EnsureArrayOfArrayOfStringConverter : JsonConverter<IReadOnlyList<IReadOnlyList<string>>>
{
    private readonly EnsureStringConverter _ensureStringConverter = new();

    public override IReadOnlyList<IReadOnlyList<string>> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
    {
        if (reader.TokenType == JsonTokenType.StartArray)
        {
            var list = new List<IReadOnlyList<string>>();
            while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)
            {
                if (reader.TokenType == JsonTokenType.StartArray)
                {
                    var innerList = new List<string>();
                    while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)
                    {
                        string? item = _ensureStringConverter.Read(ref reader, typeof(string), options);
                        if (item != null)
                        {
                            innerList.Add(item);
                        }
                    }
                    list.Add(innerList);
                }
            }
            return list;
        }

        reader.Skip();
        return [];
    }

    public override void Write(Utf8JsonWriter writer, IReadOnlyList<IReadOnlyList<string>> value, JsonSerializerOptions options)
    {
        writer.WriteStartArray();
        foreach (var innerList in value)
        {
            writer.WriteStartArray();
            foreach (var item in innerList)
            {
                writer.WriteStringValue(item);
            }
            writer.WriteEndArray();
        }
        writer.WriteEndArray();
    }
}

1	namespace NetDaemon.Client.Internal.Json;
2
3	using System.Text.Json;
4	using System.Text.Json.Serialization;
5
6	/// <summary>
7	/// Converts a Json element that can be an array of arrays of strings to a list of lists of strings.
8	/// </summary>
9	class EnsureArrayOfArrayOfStringConverter : JsonConverter<IReadOnlyList<IReadOnlyList<string>>>
10	{
11	private readonly EnsureStringConverter _ensureStringConverter = new();	5✔
12
13	public override IReadOnlyList<IReadOnlyList<string>> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
14	{
15	if (reader.TokenType == JsonTokenType.StartArray)	17!
16	{
17	var list = new List<IReadOnlyList<string>>();	17✔
18	while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)	38✔
19	{
20	if (reader.TokenType == JsonTokenType.StartArray)	21✔
21	{
22	var innerList = new List<string>();	21✔
23	while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)	62✔
24	{
25	string? item = _ensureStringConverter.Read(ref reader, typeof(string), options);	41✔
26	if (item != null)	41✔
27	{
28	innerList.Add(item);	41✔
29	}
30	}
31	list.Add(innerList);	21✔
32	}
33	}
34	return list;	17✔
35	}
36
NEW 37	reader.Skip();	×
NEW 38	return [];	×
39	}
40
41	public override void Write(Utf8JsonWriter writer, IReadOnlyList<IReadOnlyList<string>> value, JsonSerializerOptions options)
42	{
NEW 43	writer.WriteStartArray();	×
NEW 44	foreach (var innerList in value)	×
45	{
NEW 46	writer.WriteStartArray();	×
NEW 47	foreach (var item in innerList)	×
48	{
NEW 49	writer.WriteStringValue(item);	×
50	}
NEW 51	writer.WriteEndArray();	×
52	}
NEW 53	writer.WriteEndArray();	×
NEW 54	}	×
55	}

net-daemon / netdaemon / 14943290972

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous