Skip to content

Commit 3b1a64d

Browse files
committed
Further improve coverage
1 parent 097ed78 commit 3b1a64d

19 files changed

+31
-57
lines changed

Diff for: src/GqlPlus.Converter.Json/Convert/RenderJsonConverter.cs

-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ internal abstract class RenderJsonConverter<T>
55
{
66
protected void WriteValue(Utf8JsonWriter writer, StructureValue value)
77
{
8-
if (value is null || value.IsEmpty) {
9-
return;
10-
}
11-
128
if (value.Identifier is not null) {
139
writer.WriteStringValue(value.Identifier);
1410
} else if (value.Boolean is not null) {

Diff for: src/GqlPlus.Converter.Json/Convert/RenderStructureJsonConverter.cs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
namespace GqlPlus.Convert;
1+
using System.Diagnostics.CodeAnalysis;
2+
3+
namespace GqlPlus.Convert;
24
internal class RenderStructureJsonConverter
35
: RenderJsonConverter<Structured>
46
{
57
internal static RenderValueJsonConverter ValueConverter { get; } = new();
68

9+
[ExcludeFromCodeCoverage]
710
public override Structured? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => throw new NotImplementedException();
811
public override void Write(Utf8JsonWriter writer, Structured value, JsonSerializerOptions options)
912
{
10-
if (value is null || value.IsEmpty) {
11-
return;
12-
}
13-
1413
bool plain = string.IsNullOrWhiteSpace(value.Tag);
1514

1615
if (value.List.Count > 0) {

Diff for: src/GqlPlus.Converter.Json/Convert/RenderValueJsonConverter.cs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
namespace GqlPlus.Convert;
1+
using System.Diagnostics.CodeAnalysis;
2+
3+
namespace GqlPlus.Convert;
24

35
internal class RenderValueJsonConverter
46
: RenderJsonConverter<StructureValue>
57
{
8+
[ExcludeFromCodeCoverage]
69
public override StructureValue? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => throw new NotImplementedException();
710
public override void Write(Utf8JsonWriter writer, StructureValue value, JsonSerializerOptions options)
811
{
9-
if (value is null || value.IsEmpty) {
10-
return;
11-
}
12-
1312
if (string.IsNullOrWhiteSpace(value.Tag)) {
1413
WriteValue(writer, value);
1514
return;

Diff for: src/GqlPlus.Converter.Yaml/Convert/RenderYaml.cs

-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,4 @@ static RenderYaml()
3232

3333
public static string ToYaml(this Structured model, bool wrapped)
3434
=> (wrapped ? YamlWrapped : YamlFull).Serialize(model);
35-
36-
public static string YamlJoin(this IEnumerable<string> list, string start, string end)
37-
=> start + string.Join(", ", list ?? []) + end;
3835
}

Diff for: src/GqlPlus.Converter.Yaml/Convert/RenderYamlTypeConverter.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using YamlDotNet.Core.Events;
1+
using System.Diagnostics.CodeAnalysis;
2+
using YamlDotNet.Core.Events;
23

34
namespace GqlPlus.Convert;
45

@@ -24,8 +25,11 @@ internal class RenderYamlTypeConverter
2425
{
2526
public bool Accepts(Type type) => type == typeof(Structured);
2627

28+
[ExcludeFromCodeCoverage]
2729
public object? ReadYaml(IParser parser, Type type) => throw new NotImplementedException();
30+
[ExcludeFromCodeCoverage]
2831
public object? ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer) => throw new NotImplementedException();
32+
2933
public void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer serializer)
3034
{
3135
if (value is Structured model) {

Diff for: src/GqlPlus.Verifier/Verifying/Schema/UsageContext.cs

-4
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,6 @@ internal static TContext CheckType<TContext, TObjBase>(this TContext context, TO
110110
where TContext : UsageContext
111111
where TObjBase : IGqlpObjType
112112
{
113-
if (type is null) {
114-
return context;
115-
}
116-
117113
string typeName = (type.IsTypeParam ? "$" : "") + type.Name;
118114
if (context.GetType(typeName, out IGqlpDescribed? value)) {
119115
CheckTypeArgs(AddCheckError, type, check, value);

Diff for: test/GqlPlus.Converter.Yaml.ComponentTests/Sample/SampleYamlTests/Globals/category-output-dict.verified.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
!_Schema
22
categories: !_Map_Categories
33
!_Identifier ctgrOutpDict: !_Category
4-
modifiers: [!_ModifierDictionary {by: '*', modifierKind: !_ModifierKind Dict,
5-
typeKind: !_SimpleKind Basic}]
4+
modifiers: [!_ModifierDictionary {by: '*', modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Basic}]
65
name: ctgrOutpDict
76
output: !_TypeRef(_TypeKind)
87
name: CtgrOutpDict
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
!_Schema
22
types: !_Map_Type
33
!_Identifier DescrCmpl: !_TypeOutput
4-
description: >-
5-
A "more" 'Complicated' \ description
4+
description: "A \"more\" 'Complicated' \\ description"
65
name: DescrCmpl
76
typeKind: !_TypeKind Output

Diff for: test/GqlPlus.Converter.Yaml.ComponentTests/Sample/SampleYamlTests/Globals/directive-descr.verified.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
directives: !_Map_Directives
33
!_Identifier DrctDescr: !_Directive
44
description: 'A directive described'
5-
locations: !_Set(_Location) {Field: _, Fragment: _, Inline: _,
6-
Operation: _, Spread: _, Variable: _}
5+
locations: !_Set(_Location) {Field: _, Fragment: _, Inline: _, Operation: _, Spread: _, Variable: _}
76
name: DrctDescr
87
repeatable: false
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
!_Schema
22
directives: !_Map_Directives
33
!_Identifier DrctNoParam: !_Directive
4-
locations: !_Set(_Location) {Field: _, Fragment: _, Inline: _,
5-
Operation: _, Spread: _, Variable: _}
4+
locations: !_Set(_Location) {Field: _, Fragment: _, Inline: _, Operation: _, Spread: _, Variable: _}
65
name: DrctNoParam
76
repeatable: false

Diff for: test/GqlPlus.Converter.Yaml.ComponentTests/Sample/SampleYamlTests/Globals/directive-param-dict.verified.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
!_Schema
22
directives: !_Map_Directives
33
!_Identifier DrctParamDict: !_Directive
4-
locations: !_Set(_Location) {Field: _, Fragment: _, Inline: _,
5-
Operation: _, Spread: _, Variable: _}
4+
locations: !_Set(_Location) {Field: _, Fragment: _, Inline: _, Operation: _, Spread: _, Variable: _}
65
name: DrctParamDict
76
parameters:
87
- !_InputParam
98
input: InDrctParamDict
10-
modifiers: [!_ModifierDictionary {by: String, modifierKind: !_ModifierKind Dict,
11-
typeKind: !_SimpleKind Basic}]
9+
modifiers: [!_ModifierDictionary {by: String, modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Basic}]
1210
repeatable: false
1311
types: !_Map_Type
1412
!_Identifier InDrctParamDict: !_TypeInput

Diff for: test/GqlPlus.Converter.Yaml.ComponentTests/Sample/SampleYamlTests/Globals/directive-param-in.verified.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
!_Schema
22
directives: !_Map_Directives
33
!_Identifier DrctParamIn: !_Directive
4-
locations: !_Set(_Location) {Field: _, Fragment: _, Inline: _,
5-
Operation: _, Spread: _, Variable: _}
4+
locations: !_Set(_Location) {Field: _, Fragment: _, Inline: _, Operation: _, Spread: _, Variable: _}
65
name: DrctParamIn
76
parameters:
87
- !_InputParam

Diff for: test/GqlPlus.Converter.Yaml.ComponentTests/Sample/SampleYamlTests/Globals/directive-param-list.verified.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
!_Schema
22
directives: !_Map_Directives
33
!_Identifier DrctParamList: !_Directive
4-
locations: !_Set(_Location) {Field: _, Fragment: _, Inline: _,
5-
Operation: _, Spread: _, Variable: _}
4+
locations: !_Set(_Location) {Field: _, Fragment: _, Inline: _, Operation: _, Spread: _, Variable: _}
65
name: DrctParamList
76
parameters:
87
- !_InputParam

Diff for: test/GqlPlus.Converter.Yaml.ComponentTests/Sample/SampleYamlTests/Globals/directive-param-opt.verified.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
!_Schema
22
directives: !_Map_Directives
33
!_Identifier DrctParamOpt: !_Directive
4-
locations: !_Set(_Location) {Field: _, Fragment: _, Inline: _,
5-
Operation: _, Spread: _, Variable: _}
4+
locations: !_Set(_Location) {Field: _, Fragment: _, Inline: _, Operation: _, Spread: _, Variable: _}
65
name: DrctParamOpt
76
parameters:
87
- !_InputParam

Diff for: test/GqlPlus.Converter.Yaml.ComponentTests/Sample/SampleYamlTests/Objects/field-mod-Enum+dual.verified.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@ types: !_Map_Type
33
!_Identifier DualFieldModEnum: !_TypeDual
44
allFields:
55
- !_ObjectFor(_DualField)
6-
modifiers: [!_ModifierDictionary {by: EnumDualFieldModEnum,
7-
modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Enum}]
6+
modifiers: [!_ModifierDictionary {by: EnumDualFieldModEnum, modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Enum}]
87
name: field
98
object: DualFieldModEnum
109
type: !_DualBase
1110
dual: '*'
1211
fields:
1312
- !_DualField
14-
modifiers: [!_ModifierDictionary {by: EnumDualFieldModEnum,
15-
modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Enum}]
13+
modifiers: [!_ModifierDictionary {by: EnumDualFieldModEnum, modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Enum}]
1614
name: field
1715
type: !_DualBase
1816
dual: '*'

Diff for: test/GqlPlus.Converter.Yaml.ComponentTests/Sample/SampleYamlTests/Objects/field-mod-Enum+input.verified.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@ types: !_Map_Type
1313
!_Identifier InpFieldModEnum: !_TypeInput
1414
allFields:
1515
- !_ObjectFor(_InputField)
16-
modifiers: [!_ModifierDictionary {by: EnumInpFieldModEnum,
17-
modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Enum}]
16+
modifiers: [!_ModifierDictionary {by: EnumInpFieldModEnum, modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Enum}]
1817
name: field
1918
object: InpFieldModEnum
2019
type: !_InputBase
2120
input: '*'
2221
fields:
2322
- !_InputField
24-
modifiers: [!_ModifierDictionary {by: EnumInpFieldModEnum,
25-
modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Enum}]
23+
modifiers: [!_ModifierDictionary {by: EnumInpFieldModEnum, modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Enum}]
2624
name: field
2725
type: !_InputBase
2826
input: '*'

Diff for: test/GqlPlus.Converter.Yaml.ComponentTests/Sample/SampleYamlTests/Objects/field-mod-Enum+output.verified.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@ types: !_Map_Type
1313
!_Identifier OutpFieldModEnum: !_TypeOutput
1414
allFields:
1515
- !_ObjectFor(_OutputField)
16-
modifiers: [!_ModifierDictionary {by: EnumOutpFieldModEnum,
17-
modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Enum}]
16+
modifiers: [!_ModifierDictionary {by: EnumOutpFieldModEnum, modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Enum}]
1817
name: field
1918
object: OutpFieldModEnum
2019
type: !_OutputBase
2120
output: '*'
2221
fields:
2322
- !_OutputField
24-
modifiers: [!_ModifierDictionary {by: EnumOutpFieldModEnum,
25-
modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Enum}]
23+
modifiers: [!_ModifierDictionary {by: EnumOutpFieldModEnum, modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Enum}]
2624
name: field
2725
type: !_OutputBase
2826
output: '*'

Diff for: test/GqlPlus.Converter.Yaml.ComponentTests/Sample/SampleYamlTests/Objects/output-param-mod-Domain.verified.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ types: !_Map_Type
4444
parameters:
4545
- !_InputParam
4646
input: InOutpParamModDmn
47-
modifiers: [!_ModifierDictionary {by: DomOutpParamModDmn,
48-
modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Domain}]
47+
modifiers: [!_ModifierDictionary {by: DomOutpParamModDmn, modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Domain}]
4948
type: !_OutputBase
5049
output: DomOutpParamModDmn
5150
fields:
@@ -54,8 +53,7 @@ types: !_Map_Type
5453
parameters:
5554
- !_InputParam
5655
input: InOutpParamModDmn
57-
modifiers: [!_ModifierDictionary {by: DomOutpParamModDmn,
58-
modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Domain}]
56+
modifiers: [!_ModifierDictionary {by: DomOutpParamModDmn, modifierKind: !_ModifierKind Dict, typeKind: !_SimpleKind Domain}]
5957
type: !_OutputBase
6058
output: DomOutpParamModDmn
6159
name: OutpParamModDmn

Diff for: test/GqlPlus.Converter.Yaml.ComponentTests/Sample/YamlSchemaTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ ISchemaVerifyChecks checks
77
) : TestSchemaVerify(checks)
88
{
99
protected override Task VerifyResult(Structured result, string label, string test, string section)
10-
=> Verify(result.ToYaml(true), CustomSettings(label, "Yaml", test, section));
10+
=> Verify(result.ToYaml(string.IsNullOrWhiteSpace(section)), CustomSettings(label, "Yaml", test, section));
1111
}

0 commit comments

Comments
 (0)