Skip to content

Commit a144bdd

Browse files
author
Bart Koelman
committed
AV1561: Do not return tuples with more than 2 parameters
1 parent 55534af commit a144bdd

10 files changed

+208
-48
lines changed

‎test/UnitTests/ResourceHooks/Executor/Delete/AfterDeleteTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void AfterDelete()
2020
{
2121
// Arrange
2222
IHooksDiscovery<TodoItem> discovery = SetDiscoverableHooks<TodoItem>(_targetHooks, DisableDbValues);
23-
(ResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<TodoItem>> resourceDefinitionMock) = CreateTestObjects(discovery);
23+
(IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<TodoItem>> resourceDefinitionMock) = CreateTestObjects(discovery);
2424
HashSet<TodoItem> todoList = CreateTodoWithOwner();
2525

2626
// Act
@@ -36,7 +36,7 @@ public void AfterDelete_Without_Any_Hook_Implemented()
3636
{
3737
// Arrange
3838
IHooksDiscovery<TodoItem> discovery = SetDiscoverableHooks<TodoItem>(NoHooks, DisableDbValues);
39-
(ResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<TodoItem>> resourceDefinitionMock) = CreateTestObjects(discovery);
39+
(IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<TodoItem>> resourceDefinitionMock) = CreateTestObjects(discovery);
4040
HashSet<TodoItem> todoList = CreateTodoWithOwner();
4141

4242
// Act

‎test/UnitTests/ResourceHooks/Executor/Delete/BeforeDeleteTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void BeforeDelete()
2020
{
2121
// Arrange
2222
IHooksDiscovery<TodoItem> discovery = SetDiscoverableHooks<TodoItem>(_targetHooks, DisableDbValues);
23-
(ResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<TodoItem>> resourceDefinitionMock) = CreateTestObjects(discovery);
23+
(IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<TodoItem>> resourceDefinitionMock) = CreateTestObjects(discovery);
2424

2525
HashSet<TodoItem> todoList = CreateTodoWithOwner();
2626
// Act
@@ -36,7 +36,7 @@ public void BeforeDelete_Without_Any_Hook_Implemented()
3636
{
3737
// Arrange
3838
IHooksDiscovery<TodoItem> discovery = SetDiscoverableHooks<TodoItem>(NoHooks, DisableDbValues);
39-
(ResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<TodoItem>> resourceDefinitionMock) = CreateTestObjects(discovery);
39+
(IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<TodoItem>> resourceDefinitionMock) = CreateTestObjects(discovery);
4040

4141
HashSet<TodoItem> todoList = CreateTodoWithOwner();
4242
// Act

‎test/UnitTests/ResourceHooks/Executor/Delete/BeforeDeleteWithDbValuesTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void BeforeDelete()
5858

5959
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Person>> personResourceMock,
6060
Mock<IResourceHookContainer<TodoItem>> todoResourceMock, Mock<IResourceHookContainer<Passport>> passportResourceMock) =
61-
CreateTestObjects(personDiscovery, todoDiscovery, passportDiscovery, _options);
61+
CreateTestObjectsC(personDiscovery, todoDiscovery, passportDiscovery, _options);
6262

6363
// Act
6464
hookExecutor.BeforeDelete(_person.AsList(), ResourcePipeline.Delete);
@@ -87,7 +87,7 @@ public void BeforeDelete_No_Parent_Hooks()
8787

8888
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Person>> personResourceMock,
8989
Mock<IResourceHookContainer<TodoItem>> todoResourceMock, Mock<IResourceHookContainer<Passport>> passportResourceMock) =
90-
CreateTestObjects(personDiscovery, todoDiscovery, passportDiscovery, _options);
90+
CreateTestObjectsC(personDiscovery, todoDiscovery, passportDiscovery, _options);
9191

9292
// Act
9393
hookExecutor.BeforeDelete(_person.AsList(), ResourcePipeline.Delete);
@@ -114,7 +114,7 @@ public void BeforeDelete_No_Children_Hooks()
114114

115115
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Person>> personResourceMock,
116116
Mock<IResourceHookContainer<TodoItem>> todoResourceMock, Mock<IResourceHookContainer<Passport>> passportResourceMock) =
117-
CreateTestObjects(personDiscovery, todoDiscovery, passportDiscovery, _options);
117+
CreateTestObjectsC(personDiscovery, todoDiscovery, passportDiscovery, _options);
118118

119119
// Act
120120
hookExecutor.BeforeDelete(_person.AsList(), ResourcePipeline.Delete);

‎test/UnitTests/ResourceHooks/Executor/IdentifiableManyToManyOnReturnTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void OnReturn()
2626

2727
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Article>> articleResourceMock,
2828
Mock<IResourceHookContainer<IdentifiableArticleTag>> joinResourceMock, Mock<IResourceHookContainer<Tag>> tagResourceMock) =
29-
CreateTestObjects(articleDiscovery, joinDiscovery, tagDiscovery);
29+
CreateTestObjectsC(articleDiscovery, joinDiscovery, tagDiscovery);
3030

3131
(List<Article> articles, List<IdentifiableArticleTag> joins, List<Tag> tags) = CreateIdentifiableManyToManyData();
3232

@@ -53,7 +53,7 @@ public void OnReturn_GetRelationship()
5353

5454
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Article>> articleResourceMock,
5555
Mock<IResourceHookContainer<IdentifiableArticleTag>> joinResourceMock, Mock<IResourceHookContainer<Tag>> tagResourceMock) =
56-
CreateTestObjects(articleDiscovery, joinDiscovery, tagDiscovery);
56+
CreateTestObjectsC(articleDiscovery, joinDiscovery, tagDiscovery);
5757

5858
(List<Article> articles, List<IdentifiableArticleTag> joins, List<Tag> tags) = CreateIdentifiableManyToManyData();
5959

@@ -84,7 +84,7 @@ public void OnReturn_Without_Parent_Hook_Implemented()
8484

8585
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Article>> articleResourceMock,
8686
Mock<IResourceHookContainer<IdentifiableArticleTag>> joinResourceMock, Mock<IResourceHookContainer<Tag>> tagResourceMock) =
87-
CreateTestObjects(articleDiscovery, joinDiscovery, tagDiscovery);
87+
CreateTestObjectsC(articleDiscovery, joinDiscovery, tagDiscovery);
8888

8989
(List<Article> articles, List<IdentifiableArticleTag> joins, List<Tag> tags) = CreateIdentifiableManyToManyData();
9090

@@ -109,7 +109,7 @@ public void OnReturn_Without_Children_Hooks_Implemented()
109109

110110
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Article>> articleResourceMock,
111111
Mock<IResourceHookContainer<IdentifiableArticleTag>> joinResourceMock, Mock<IResourceHookContainer<Tag>> tagResourceMock) =
112-
CreateTestObjects(articleDiscovery, joinDiscovery, tagDiscovery);
112+
CreateTestObjectsC(articleDiscovery, joinDiscovery, tagDiscovery);
113113

114114
(List<Article> articles, _, List<Tag> tags) = CreateIdentifiableManyToManyData();
115115

@@ -132,7 +132,7 @@ public void OnReturn_Without_Grand_Children_Hooks_Implemented()
132132

133133
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Article>> articleResourceMock,
134134
Mock<IResourceHookContainer<IdentifiableArticleTag>> joinResourceMock, Mock<IResourceHookContainer<Tag>> tagResourceMock) =
135-
CreateTestObjects(articleDiscovery, joinDiscovery, tagDiscovery);
135+
CreateTestObjectsC(articleDiscovery, joinDiscovery, tagDiscovery);
136136

137137
(List<Article> articles, List<IdentifiableArticleTag> joins, _) = CreateIdentifiableManyToManyData();
138138

@@ -158,7 +158,7 @@ public void OnReturn_Without_Any_Descendant_Hooks_Implemented()
158158

159159
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Article>> articleResourceMock,
160160
Mock<IResourceHookContainer<IdentifiableArticleTag>> joinResourceMock, Mock<IResourceHookContainer<Tag>> tagResourceMock) =
161-
CreateTestObjects(articleDiscovery, joinDiscovery, tagDiscovery);
161+
CreateTestObjectsC(articleDiscovery, joinDiscovery, tagDiscovery);
162162

163163
(List<Article> articles, _, _) = CreateIdentifiableManyToManyData();
164164

@@ -180,7 +180,7 @@ public void OnReturn_Without_Any_Hook_Implemented()
180180

181181
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Article>> articleResourceMock,
182182
Mock<IResourceHookContainer<IdentifiableArticleTag>> joinResourceMock, Mock<IResourceHookContainer<Tag>> tagResourceMock) =
183-
CreateTestObjects(articleDiscovery, joinDiscovery, tagDiscovery);
183+
CreateTestObjectsC(articleDiscovery, joinDiscovery, tagDiscovery);
184184

185185
(List<Article> articles, _, _) = CreateIdentifiableManyToManyData();
186186

‎test/UnitTests/ResourceHooks/Executor/Read/BeforeReadTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void BeforeRead()
2222
{
2323
// Arrange
2424
IHooksDiscovery<TodoItem> todoDiscovery = SetDiscoverableHooks<TodoItem>(_targetHooks, DisableDbValues);
25-
(ResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<TodoItem>> todoResourceMock) = CreateTestObjects(todoDiscovery);
25+
(IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<TodoItem>> todoResourceMock) = CreateTestObjects(todoDiscovery);
2626

2727
// Act
2828
hookExecutor.BeforeRead<TodoItem>(ResourcePipeline.Get);
@@ -66,7 +66,7 @@ public void BeforeReadWithNestedInclusion()
6666

6767
(Mock<IEnumerable<IQueryConstraintProvider>> constraintsMock, IResourceHookExecutor hookExecutor,
6868
Mock<IResourceHookContainer<TodoItem>> todoResourceMock, Mock<IResourceHookContainer<Person>> ownerResourceMock,
69-
Mock<IResourceHookContainer<Passport>> passportResourceMock) = CreateTestObjects(todoDiscovery, personDiscovery, passportDiscovery);
69+
Mock<IResourceHookContainer<Passport>> passportResourceMock) = CreateTestObjectsC(todoDiscovery, personDiscovery, passportDiscovery);
7070

7171
// eg a call on api/todoItems?include=owner.passport,assignee,stakeHolders
7272
List<List<RelationshipAttribute>> relationshipsChains = GetIncludedRelationshipsChains("owner.passport", "assignee", "stakeHolders");
@@ -92,7 +92,7 @@ public void BeforeReadWithNestedInclusion_No_Parent_Hook_Implemented()
9292

9393
(Mock<IEnumerable<IQueryConstraintProvider>> constraintsMock, IResourceHookExecutor hookExecutor,
9494
Mock<IResourceHookContainer<TodoItem>> todoResourceMock, Mock<IResourceHookContainer<Person>> ownerResourceMock,
95-
Mock<IResourceHookContainer<Passport>> passportResourceMock) = CreateTestObjects(todoDiscovery, personDiscovery, passportDiscovery);
95+
Mock<IResourceHookContainer<Passport>> passportResourceMock) = CreateTestObjectsC(todoDiscovery, personDiscovery, passportDiscovery);
9696

9797
// eg a call on api/todoItems?include=owner.passport,assignee,stakeHolders
9898
List<List<RelationshipAttribute>> relationshipsChains = GetIncludedRelationshipsChains("owner.passport", "assignee", "stakeHolders");
@@ -117,7 +117,7 @@ public void BeforeReadWithNestedInclusion_No_Child_Hook_Implemented()
117117

118118
(Mock<IEnumerable<IQueryConstraintProvider>> constraintsMock, IResourceHookExecutor hookExecutor,
119119
Mock<IResourceHookContainer<TodoItem>> todoResourceMock, Mock<IResourceHookContainer<Person>> ownerResourceMock,
120-
Mock<IResourceHookContainer<Passport>> passportResourceMock) = CreateTestObjects(todoDiscovery, personDiscovery, passportDiscovery);
120+
Mock<IResourceHookContainer<Passport>> passportResourceMock) = CreateTestObjectsC(todoDiscovery, personDiscovery, passportDiscovery);
121121

122122
// eg a call on api/todoItems?include=owner.passport,assignee,stakeHolders
123123
List<List<RelationshipAttribute>> relationshipsChains = GetIncludedRelationshipsChains("owner.passport", "assignee", "stakeHolders");
@@ -142,7 +142,7 @@ public void BeforeReadWithNestedInclusion_No_Grandchild_Hook_Implemented()
142142

143143
(Mock<IEnumerable<IQueryConstraintProvider>> constraintsMock, IResourceHookExecutor hookExecutor,
144144
Mock<IResourceHookContainer<TodoItem>> todoResourceMock, Mock<IResourceHookContainer<Person>> ownerResourceMock,
145-
Mock<IResourceHookContainer<Passport>> passportResourceMock) = CreateTestObjects(todoDiscovery, personDiscovery, passportDiscovery);
145+
Mock<IResourceHookContainer<Passport>> passportResourceMock) = CreateTestObjectsC(todoDiscovery, personDiscovery, passportDiscovery);
146146

147147
// eg a call on api/todoItems?include=owner.passport,assignee,stakeHolders
148148
List<List<RelationshipAttribute>> relationshipsChains = GetIncludedRelationshipsChains("owner.passport", "assignee", "stakeHolders");
@@ -167,7 +167,7 @@ public void BeforeReadWithNestedInclusion_Without_Any_Hook_Implemented()
167167

168168
(Mock<IEnumerable<IQueryConstraintProvider>> constraintsMock, IResourceHookExecutor hookExecutor,
169169
Mock<IResourceHookContainer<TodoItem>> todoResourceMock, Mock<IResourceHookContainer<Person>> ownerResourceMock,
170-
Mock<IResourceHookContainer<Passport>> passportResourceMock) = CreateTestObjects(todoDiscovery, personDiscovery, passportDiscovery);
170+
Mock<IResourceHookContainer<Passport>> passportResourceMock) = CreateTestObjectsC(todoDiscovery, personDiscovery, passportDiscovery);
171171

172172
// eg a call on api/todoItems?include=owner.passport,assignee,stakeHolders
173173
List<List<RelationshipAttribute>> relationshipsChains = GetIncludedRelationshipsChains("owner.passport", "assignee", "stakeHolders");

‎test/UnitTests/ResourceHooks/Executor/Read/IdentifiableManyToManyAfterReadTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void AfterRead()
2626

2727
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Article>> articleResourceMock,
2828
Mock<IResourceHookContainer<IdentifiableArticleTag>> joinResourceMock, Mock<IResourceHookContainer<Tag>> tagResourceMock) =
29-
CreateTestObjects(articleDiscovery, joinDiscovery, tagDiscovery);
29+
CreateTestObjectsC(articleDiscovery, joinDiscovery, tagDiscovery);
3030

3131
(List<Article> articles, List<IdentifiableArticleTag> joins, List<Tag> tags) = CreateIdentifiableManyToManyData();
3232

@@ -56,7 +56,7 @@ public void AfterRead_Without_Parent_Hook_Implemented()
5656

5757
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Article>> articleResourceMock,
5858
Mock<IResourceHookContainer<IdentifiableArticleTag>> joinResourceMock, Mock<IResourceHookContainer<Tag>> tagResourceMock) =
59-
CreateTestObjects(articleDiscovery, joinDiscovery, tagDiscovery);
59+
CreateTestObjectsC(articleDiscovery, joinDiscovery, tagDiscovery);
6060

6161
(List<Article> articles, List<IdentifiableArticleTag> joins, List<Tag> tags) = CreateIdentifiableManyToManyData();
6262

@@ -84,7 +84,7 @@ public void AfterRead_Without_Children_Hooks_Implemented()
8484

8585
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Article>> articleResourceMock,
8686
Mock<IResourceHookContainer<IdentifiableArticleTag>> joinResourceMock, Mock<IResourceHookContainer<Tag>> tagResourceMock) =
87-
CreateTestObjects(articleDiscovery, joinDiscovery, tagDiscovery);
87+
CreateTestObjectsC(articleDiscovery, joinDiscovery, tagDiscovery);
8888

8989
(List<Article> articles, _, List<Tag> tags) = CreateIdentifiableManyToManyData();
9090

@@ -110,7 +110,7 @@ public void AfterRead_Without_Grand_Children_Hooks_Implemented()
110110

111111
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Article>> articleResourceMock,
112112
Mock<IResourceHookContainer<IdentifiableArticleTag>> joinResourceMock, Mock<IResourceHookContainer<Tag>> tagResourceMock) =
113-
CreateTestObjects(articleDiscovery, joinDiscovery, tagDiscovery);
113+
CreateTestObjectsC(articleDiscovery, joinDiscovery, tagDiscovery);
114114

115115
(List<Article> articles, List<IdentifiableArticleTag> joins, _) = CreateIdentifiableManyToManyData();
116116

@@ -137,7 +137,7 @@ public void AfterRead_Without_Any_Descendant_Hooks_Implemented()
137137

138138
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Article>> articleResourceMock,
139139
Mock<IResourceHookContainer<IdentifiableArticleTag>> joinResourceMock, Mock<IResourceHookContainer<Tag>> tagResourceMock) =
140-
CreateTestObjects(articleDiscovery, joinDiscovery, tagDiscovery);
140+
CreateTestObjectsC(articleDiscovery, joinDiscovery, tagDiscovery);
141141

142142
(List<Article> articles, _, _) = CreateIdentifiableManyToManyData();
143143

@@ -159,7 +159,7 @@ public void AfterRead_Without_Any_Hook_Implemented()
159159

160160
(_, IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<Article>> articleResourceMock,
161161
Mock<IResourceHookContainer<IdentifiableArticleTag>> joinResourceMock, Mock<IResourceHookContainer<Tag>> tagResourceMock) =
162-
CreateTestObjects(articleDiscovery, joinDiscovery, tagDiscovery);
162+
CreateTestObjectsC(articleDiscovery, joinDiscovery, tagDiscovery);
163163

164164
(List<Article> articles, _, _) = CreateIdentifiableManyToManyData();
165165

‎test/UnitTests/ResourceHooks/Executor/SameResourceTypeTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void Resource_Has_Cyclic_Relations()
6969
{
7070
// Arrange
7171
IHooksDiscovery<TodoItem> todoDiscovery = SetDiscoverableHooks<TodoItem>(_targetHooks, DisableDbValues);
72-
(ResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<TodoItem>> todoResourceMock) = CreateTestObjects(todoDiscovery);
72+
(IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<TodoItem>> todoResourceMock) = CreateTestObjects(todoDiscovery);
7373
var todo = new TodoItem();
7474
todo.ParentTodo = todo;
7575
todo.ChildTodoItems = todo.AsList();
@@ -88,7 +88,7 @@ public void Resource_Has_Nested_Cyclic_Relations()
8888
{
8989
// Arrange
9090
IHooksDiscovery<TodoItem> todoDiscovery = SetDiscoverableHooks<TodoItem>(_targetHooks, DisableDbValues);
91-
(ResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<TodoItem>> todoResourceMock) = CreateTestObjects(todoDiscovery);
91+
(IResourceHookExecutor hookExecutor, Mock<IResourceHookContainer<TodoItem>> todoResourceMock) = CreateTestObjects(todoDiscovery);
9292

9393
var rootTodo = new TodoItem
9494
{

‎test/UnitTests/ResourceHooks/HooksDummyData.cs

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ protected HashSet<TodoItem> CreateTodoWithOwner()
116116
return (articles, allTags);
117117
}
118118

119-
protected (List<Article>, List<IdentifiableArticleTag>, List<Tag>) CreateIdentifiableManyToManyData()
119+
protected ManyToManyTestData CreateIdentifiableManyToManyData()
120120
{
121121
List<Tag> tagsSubset = TagFaker.Generate(3);
122122
List<IdentifiableArticleTag> joinsSubSet = _identifiableArticleTagFaker.Generate(3);
@@ -143,7 +143,28 @@ protected HashSet<TodoItem> CreateTodoWithOwner()
143143

144144
List<IdentifiableArticleTag> allJoins = joinsSubSet.Concat(completeJoin).ToList();
145145
List<Article> articles = ArrayFactory.Create(articleTagsSubset, articleWithAllTags).ToList();
146-
return (articles, allJoins, allTags);
146+
return new ManyToManyTestData(articles, allJoins, allTags);
147+
}
148+
149+
protected sealed class ManyToManyTestData
150+
{
151+
public List<Article> Articles { get; }
152+
public List<IdentifiableArticleTag> ArticleTags { get; }
153+
public List<Tag> Tags { get; }
154+
155+
public ManyToManyTestData(List<Article> articles, List<IdentifiableArticleTag> articleTags, List<Tag> tags)
156+
{
157+
Articles = articles;
158+
ArticleTags = articleTags;
159+
Tags = tags;
160+
}
161+
162+
public void Deconstruct(out List<Article> articles, out List<IdentifiableArticleTag> articleTags, out List<Tag> tags)
163+
{
164+
articles = Articles;
165+
articleTags = ArticleTags;
166+
tags = Tags;
167+
}
147168
}
148169
}
149170
}

0 commit comments

Comments
 (0)