Skip to content

Commit beb8570

Browse files
NeonGraalNeonGraal
committed
Merge branch 'main' into new-operations
2 parents 4c2fe74 + 38aafd1 commit beb8570

File tree

1 file changed

+51
-46
lines changed

1 file changed

+51
-46
lines changed

‎test/GqlPlus.Parser.ClassTests/Merging/TestAliasedMerger.cs‎

Lines changed: 51 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,109 +4,114 @@
44
namespace GqlPlus.Merging;
55

66
public abstract class TestAliasedMerger<TAst>
7-
: TestDescriptionsMerger<TAst>
7+
: TestAliasedMerger<TAst, string>
8+
where TAst : IGqlpAliased
9+
{ }
10+
11+
public abstract class TestAliasedMerger<TAst, TInput>
12+
: TestDescriptionsMerger<TAst, TInput>
813
where TAst : IGqlpAliased
914
{
1015
[Theory, RepeatData]
11-
public void CanMerge_TwoAstsOneAlias_ReturnsGood(string name, string alias)
12-
=> CanMerge_Good([MakeAliased(name, []), MakeAliased(name, [alias])]);
16+
public void CanMerge_TwoAstsOneAlias_ReturnsGood(TInput input, string alias)
17+
=> CanMerge_Good([MakeAliased(input, []), MakeAliased(input, [alias])]);
1318

1419
[Theory, RepeatData]
15-
public void CanMerge_TwoAstsSameAlias_ReturnsGood(string name, string alias)
16-
=> CanMerge_Good([MakeAliased(name, [alias]), MakeAliased(name, [alias])]);
20+
public void CanMerge_TwoAstsSameAlias_ReturnsGood(TInput input, string alias)
21+
=> CanMerge_Good([MakeAliased(input, [alias]), MakeAliased(input, [alias])]);
1722

1823
[Theory, RepeatData]
19-
public void CanMerge_TwoAstsDifferentAliases_ReturnsGood(string name, string alias1, string alias2)
20-
=> CanMerge_Good([MakeAliased(name, [alias1]), MakeAliased(name, [alias2])]);
24+
public void CanMerge_TwoAstsDifferentAliases_ReturnsGood(TInput input, string alias1, string alias2)
25+
=> CanMerge_Good([MakeAliased(input, [alias1]), MakeAliased(input, [alias2])]);
2126

2227
[Theory, RepeatData]
23-
public void CanMerge_ThreeAstsOneAlias_ReturnsGood(string name1, string name2, string alias)
28+
public void CanMerge_ThreeAstsOneAlias_ReturnsGood(TInput input1, TInput input2, string alias)
2429
=> this
2530
.SkipIf(SkipDifferentInput)
26-
.CanMerge_Good([MakeAliased(name1, []), MakeAliased(name2, []), MakeAliased(name1, [alias])]);
31+
.CanMerge_Good([MakeAliased(input1, []), MakeAliased(input2, []), MakeAliased(input1, [alias])]);
2732

2833
[Theory, RepeatData]
29-
public void CanMerge_ThreeAstsSameAlias_ReturnsErrors(string name1, string name2, string alias)
34+
public void CanMerge_ThreeAstsSameAlias_ReturnsErrors(TInput input1, TInput input2, string alias)
3035
=> this
3136
.SkipIf(SkipDifferentInput)
32-
.SkipEqual(name1, name2)
33-
.CanMerge_Errors([MakeAliased(name1, []), MakeAliased(name2, [alias]), MakeAliased(name1, [alias])]);
37+
.SkipEqual(input1, input2)
38+
.CanMerge_Errors([MakeAliased(input1, []), MakeAliased(input2, [alias]), MakeAliased(input1, [alias])]);
3439

3540
[Theory, RepeatData]
36-
public void CanMerge_ThreeAstsDifferentAliases_ReturnsGood(string name1, string name2, string alias1, string alias2)
41+
public void CanMerge_ThreeAstsDifferentAliases_ReturnsGood(TInput input1, TInput input2, string alias1, string alias2)
3742
=> this
3843
.SkipIf(SkipDifferentInput)
39-
.SkipEqual(name1, name2)
44+
.SkipEqual(input1, input2)
4045
.SkipEqual(alias1, alias2)
41-
.CanMerge_Good([MakeAliased(name1, []), MakeAliased(name2, [alias1]), MakeAliased(name1, [alias2])]);
46+
.CanMerge_Good([MakeAliased(input1, []), MakeAliased(input2, [alias1]), MakeAliased(input1, [alias2])]);
4247

4348
[Theory, RepeatData]
44-
public void CanMerge_ThreeAstsTwoAliases_ReturnsGood(string name1, string name2, string alias1, string alias2)
49+
public void CanMerge_ThreeAstsTwoAliases_ReturnsGood(TInput input1, TInput input2, string alias1, string alias2)
4550
=> this
4651
.SkipIf(SkipDifferentInput)
47-
.SkipEqual(name1, name2)
48-
.CanMerge_Good([MakeAliased(name1, [alias1]), MakeAliased(name2, []), MakeAliased(name1, [alias2])]);
52+
.SkipEqual(input1, input2)
53+
.CanMerge_Good([MakeAliased(input1, [alias1]), MakeAliased(input2, []), MakeAliased(input1, [alias2])]);
4954

5055
[Theory, RepeatData]
51-
public void CanMerge_ThreeAstsMixedAliases_ReturnsErrors(string name1, string name2, string alias1, string alias2)
56+
public void CanMerge_ThreeAstsMixedAliases_ReturnsErrors(TInput input1, TInput input2, string alias1, string alias2)
5257
=> this
5358
.SkipIf(SkipDifferentInput)
54-
.SkipEqual(name1, name2)
55-
.CanMerge_Errors([MakeAliased(name1, [alias1]), MakeAliased(name2, [alias2]), MakeAliased(name1, [alias1, alias2])]);
59+
.SkipEqual(input1, input2)
60+
.CanMerge_Errors([MakeAliased(input1, [alias1]), MakeAliased(input2, [alias2]), MakeAliased(input1, [alias1, alias2])]);
5661

5762
[Theory, RepeatData]
58-
public void CanMerge_ThreeAstsManyAliases_ReturnsErrors(string name1, string name2, string alias1, string alias2)
63+
public void CanMerge_ThreeAstsManyAliases_ReturnsErrors(TInput input1, TInput input2, string alias1, string alias2)
5964
=> this
6065
.SkipIf(SkipDifferentInput)
61-
.SkipEqual(name1, name2)
62-
.CanMerge_Errors([MakeAliased(name1, [alias1]), MakeAliased(name2, [alias1, alias2]), MakeAliased(name1, [alias2])]);
66+
.SkipEqual(input1, input2)
67+
.CanMerge_Errors([MakeAliased(input1, [alias1]), MakeAliased(input2, [alias1, alias2]), MakeAliased(input1, [alias2])]);
6368

6469
[Theory, RepeatData]
65-
public void Merge_TwoAstsOneAlias_ReturnsExpected(string name, string alias)
66-
=> Merge_Expected([MakeAliased(name, []), MakeAliased(name, [alias])], MakeAliased(name, [alias]));
70+
public void Merge_TwoAstsOneAlias_ReturnsExpected(TInput input, string alias)
71+
=> Merge_Expected([MakeAliased(input, []), MakeAliased(input, [alias])], MakeAliased(input, [alias]));
6772

6873
[Theory, RepeatData]
69-
public void Merge_TwoAstsSameAlias_ReturnsExpected(string name, string alias)
70-
=> Merge_Expected([MakeAliased(name, [alias]), MakeAliased(name, [alias])], MakeAliased(name, [alias]));
74+
public void Merge_TwoAstsSameAlias_ReturnsExpected(TInput input, string alias)
75+
=> Merge_Expected([MakeAliased(input, [alias]), MakeAliased(input, [alias])], MakeAliased(input, [alias]));
7176

7277
[Theory, RepeatData]
73-
public void Merge_TwoAstsTwoAlias_ReturnsExpected(string name, string alias1, string alias2)
78+
public void Merge_TwoAstsTwoAlias_ReturnsExpected(TInput input, string alias1, string alias2)
7479
=> this
7580
.SkipEqual(alias1, alias2)
7681
.Merge_Expected(
77-
[MakeAliased(name, [alias1]), MakeAliased(name, [alias2])],
78-
MakeAliased(name, [alias1, alias2]));
82+
[MakeAliased(input, [alias1]), MakeAliased(input, [alias2])],
83+
MakeAliased(input, [alias1, alias2]));
7984

8085
[Theory, RepeatData]
81-
public void Merge_ThreeAstsOneAlias_ReturnsExpected(string name1, string name2, string alias)
86+
public void Merge_ThreeAstsOneAlias_ReturnsExpected(TInput input1, TInput input2, string alias)
8287
=> this
8388
.SkipIf(SkipDifferentInput)
84-
.SkipEqual(name1, name2)
89+
.SkipEqual(input1, input2)
8590
.Merge_Expected(
86-
[MakeAliased(name1, []), MakeAliased(name2, []), MakeAliased(name1, [alias])],
87-
MakeAliased(name1, [alias]), MakeAliased(name2, []));
91+
[MakeAliased(input1, []), MakeAliased(input2, []), MakeAliased(input1, [alias])],
92+
MakeAliased(input1, [alias]), MakeAliased(input2, []));
8893

8994
[Theory, RepeatData]
90-
public void Merge_ThreeAstsDifferentAliases_ReturnsExpected(string name1, string name2, string alias1, string alias2)
95+
public void Merge_ThreeAstsDifferentAliases_ReturnsExpected(TInput input1, TInput input2, string alias1, string alias2)
9196
=> this
9297
.SkipIf(SkipDifferentInput)
93-
.SkipEqual(name1, name2)
98+
.SkipEqual(input1, input2)
9499
.SkipEqual(alias1, alias2)
95100
.Merge_Expected(
96-
[MakeAliased(name1, []), MakeAliased(name2, [alias1]), MakeAliased(name1, [alias2])],
97-
MakeAliased(name1, [alias2]), MakeAliased(name2, [alias1]));
101+
[MakeAliased(input1, []), MakeAliased(input2, [alias1]), MakeAliased(input1, [alias2])],
102+
MakeAliased(input1, [alias2]), MakeAliased(input2, [alias1]));
98103

99104
[Theory, RepeatData]
100-
public void Merge_ThreeAstsTwoAliases_ReturnsExpected(string name1, string name2, string alias1, string alias2)
105+
public void Merge_ThreeAstsTwoAliases_ReturnsExpected(TInput input1, TInput input2, string alias1, string alias2)
101106
=> this
102107
.SkipIf(SkipDifferentInput)
103-
.SkipEqual(name1, name2)
108+
.SkipEqual(input1, input2)
104109
.SkipEqual(alias1, alias2)
105110
.Merge_Expected(
106-
[MakeAliased(name1, [alias1]), MakeAliased(name2, []), MakeAliased(name1, [alias2])],
107-
MakeAliased(name1, [alias1, alias2]), MakeAliased(name2, []));
111+
[MakeAliased(input1, [alias1]), MakeAliased(input2, []), MakeAliased(input1, [alias2])],
112+
MakeAliased(input1, [alias1, alias2]), MakeAliased(input2, []));
108113

109-
protected abstract TAst MakeAliased(string name, string[] aliases, string description = "");
110-
protected override TAst MakeDescribed(string name, string description = "")
111-
=> MakeAliased(name, [], description);
114+
protected abstract TAst MakeAliased(TInput input, string[] aliases, string description = "");
115+
protected override TAst MakeDescribed(TInput input, string description = "")
116+
=> MakeAliased(input, [], description);
112117
}

0 commit comments

Comments
 (0)