Skip to content

Commit 077a426

Browse files
bkoelmanbkoelman
committed
Wrap faker.Generate methods, so that a non-nullable return type is inferred
1 parent df55a7e commit 077a426

File tree

51 files changed

+602
-602
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+602
-602
lines changed

‎test/OpenApiKiotaEndToEndTests/AtomicOperations/AtomicCreateResourceTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public AtomicCreateResourceTests(IntegrationTestContext<OpenApiStartup<Operation
3535
public async Task Can_create_resource_with_attributes()
3636
{
3737
// Arrange
38-
Teacher newTeacher = _fakers.Teacher.Generate();
38+
Teacher newTeacher = _fakers.Teacher.GenerateOne();
3939

4040
using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
4141
var apiClient = new AtomicOperationsClient(requestAdapter);
@@ -88,9 +88,9 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
8888
public async Task Can_create_resource_with_attributes_and_relationships()
8989
{
9090
// Arrange
91-
Student existingStudent = _fakers.Student.Generate();
92-
Course existingCourse = _fakers.Course.Generate();
93-
Enrollment newEnrollment = _fakers.Enrollment.Generate();
91+
Student existingStudent = _fakers.Student.GenerateOne();
92+
Course existingCourse = _fakers.Course.GenerateOne();
93+
Enrollment newEnrollment = _fakers.Enrollment.GenerateOne();
9494

9595
await _testContext.RunOnDatabaseAsync(async dbContext =>
9696
{
@@ -169,7 +169,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
169169
public async Task Can_create_resource_with_client_generated_ID()
170170
{
171171
// Arrange
172-
Course newCourse = _fakers.Course.Generate();
172+
Course newCourse = _fakers.Course.GenerateOne();
173173
newCourse.Id = Guid.NewGuid();
174174

175175
using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);

‎test/OpenApiKiotaEndToEndTests/AtomicOperations/AtomicDeleteResourceTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public AtomicDeleteResourceTests(IntegrationTestContext<OpenApiStartup<Operation
3434
public async Task Can_delete_resource()
3535
{
3636
// Arrange
37-
Enrollment existingEnrollment = _fakers.Enrollment.Generate();
38-
existingEnrollment.Student = _fakers.Student.Generate();
39-
existingEnrollment.Course = _fakers.Course.Generate();
37+
Enrollment existingEnrollment = _fakers.Enrollment.GenerateOne();
38+
existingEnrollment.Student = _fakers.Student.GenerateOne();
39+
existingEnrollment.Course = _fakers.Course.GenerateOne();
4040

4141
await _testContext.RunOnDatabaseAsync(async dbContext =>
4242
{

‎test/OpenApiKiotaEndToEndTests/AtomicOperations/AtomicLocalIdTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ public AtomicLocalIdTests(IntegrationTestContext<OpenApiStartup<OperationsDbCont
3535
public async Task Can_use_local_IDs()
3636
{
3737
// Arrange
38-
Teacher newTeacher = _fakers.Teacher.Generate();
39-
Course newCourse = _fakers.Course.Generate();
38+
Teacher newTeacher = _fakers.Teacher.GenerateOne();
39+
Course newCourse = _fakers.Course.GenerateOne();
4040
newCourse.Id = Guid.NewGuid();
41-
Student newStudent = _fakers.Student.Generate();
42-
DateOnly newEnrolledAt = _fakers.Enrollment.Generate().EnrolledAt;
41+
Student newStudent = _fakers.Student.GenerateOne();
42+
DateOnly newEnrolledAt = _fakers.Enrollment.GenerateOne().EnrolledAt;
4343

4444
const string teacherLocalId = "teacher-1";
4545
const string studentLocalId = "student-1";

‎test/OpenApiKiotaEndToEndTests/AtomicOperations/AtomicRelationshipTests.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ public AtomicRelationshipTests(IntegrationTestContext<OpenApiStartup<OperationsD
3535
public async Task Can_update_ToOne_relationship()
3636
{
3737
// Arrange
38-
Enrollment existingEnrollment = _fakers.Enrollment.Generate();
39-
existingEnrollment.Student = _fakers.Student.Generate();
40-
existingEnrollment.Course = _fakers.Course.Generate();
38+
Enrollment existingEnrollment = _fakers.Enrollment.GenerateOne();
39+
existingEnrollment.Student = _fakers.Student.GenerateOne();
40+
existingEnrollment.Course = _fakers.Course.GenerateOne();
4141

42-
Student existingStudent = _fakers.Student.Generate();
42+
Student existingStudent = _fakers.Student.GenerateOne();
4343

4444
await _testContext.RunOnDatabaseAsync(async dbContext =>
4545
{
@@ -91,9 +91,9 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
9191
public async Task Can_update_ToMany_relationship()
9292
{
9393
// Arrange
94-
Teacher existingTeacher = _fakers.Teacher.Generate();
95-
existingTeacher.Teaches = _fakers.Course.Generate(1).ToHashSet();
96-
List<Course> existingCourses = _fakers.Course.Generate(2).ToList();
94+
Teacher existingTeacher = _fakers.Teacher.GenerateOne();
95+
existingTeacher.Teaches = _fakers.Course.GenerateSet(1);
96+
List<Course> existingCourses = _fakers.Course.GenerateList(2);
9797

9898
await _testContext.RunOnDatabaseAsync(async dbContext =>
9999
{
@@ -155,9 +155,9 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
155155
public async Task Can_add_to_ToMany_relationship()
156156
{
157157
// Arrange
158-
Teacher existingTeacher = _fakers.Teacher.Generate();
159-
existingTeacher.Teaches = _fakers.Course.Generate(1).ToHashSet();
160-
List<Course> existingCourses = _fakers.Course.Generate(2).ToList();
158+
Teacher existingTeacher = _fakers.Teacher.GenerateOne();
159+
existingTeacher.Teaches = _fakers.Course.GenerateSet(1);
160+
List<Course> existingCourses = _fakers.Course.GenerateList(2);
161161

162162
await _testContext.RunOnDatabaseAsync(async dbContext =>
163163
{
@@ -220,8 +220,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
220220
public async Task Can_remove_from_ToMany_relationship()
221221
{
222222
// Arrange
223-
Teacher existingTeacher = _fakers.Teacher.Generate();
224-
existingTeacher.Teaches = _fakers.Course.Generate(3).ToHashSet();
223+
Teacher existingTeacher = _fakers.Teacher.GenerateOne();
224+
existingTeacher.Teaches = _fakers.Course.GenerateSet(3);
225225

226226
await _testContext.RunOnDatabaseAsync(async dbContext =>
227227
{

‎test/OpenApiKiotaEndToEndTests/AtomicOperations/AtomicUpdateResourceTests.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public AtomicUpdateResourceTests(IntegrationTestContext<OpenApiStartup<Operation
4141
public async Task Can_update_resource_with_attributes()
4242
{
4343
// Arrange
44-
Student existingStudent = _fakers.Student.Generate();
45-
string newName = _fakers.Student.Generate().Name;
46-
string? newEmailAddress = _fakers.Student.Generate().EmailAddress;
44+
Student existingStudent = _fakers.Student.GenerateOne();
45+
string newName = _fakers.Student.GenerateOne().Name;
46+
string? newEmailAddress = _fakers.Student.GenerateOne().EmailAddress;
4747

4848
await _testContext.RunOnDatabaseAsync(async dbContext =>
4949
{
@@ -102,8 +102,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
102102
public async Task Can_update_resource_with_attributes_using_ref()
103103
{
104104
// Arrange
105-
Student existingStudent = _fakers.Student.Generate();
106-
string? newEmailAddress = _fakers.Student.Generate().EmailAddress;
105+
Student existingStudent = _fakers.Student.GenerateOne();
106+
string? newEmailAddress = _fakers.Student.GenerateOne().EmailAddress;
107107

108108
await _testContext.RunOnDatabaseAsync(async dbContext =>
109109
{
@@ -166,13 +166,13 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
166166
public async Task Can_update_resource_with_attributes_and_relationships()
167167
{
168168
// Arrange
169-
Enrollment existingEnrollment = _fakers.Enrollment.Generate();
170-
existingEnrollment.Student = _fakers.Student.Generate();
171-
existingEnrollment.Course = _fakers.Course.Generate();
169+
Enrollment existingEnrollment = _fakers.Enrollment.GenerateOne();
170+
existingEnrollment.Student = _fakers.Student.GenerateOne();
171+
existingEnrollment.Course = _fakers.Course.GenerateOne();
172172

173-
Student existingStudent = _fakers.Student.Generate();
174-
Course existingCourse = _fakers.Course.Generate();
175-
DateOnly newEnrolledAt = _fakers.Enrollment.Generate().EnrolledAt;
173+
Student existingStudent = _fakers.Student.GenerateOne();
174+
Course existingCourse = _fakers.Course.GenerateOne();
175+
DateOnly newEnrolledAt = _fakers.Enrollment.GenerateOne().EnrolledAt;
176176

177177
await _testContext.RunOnDatabaseAsync(async dbContext =>
178178
{

‎test/OpenApiKiotaEndToEndTests/ClientIdGenerationModes/ClientIdGenerationModesTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public ClientIdGenerationModesTests(IntegrationTestContext<OpenApiStartup<Client
3333
public async Task Cannot_create_resource_without_ID_when_supplying_ID_is_required()
3434
{
3535
// Arrange
36-
Player newPlayer = _fakers.Player.Generate();
36+
Player newPlayer = _fakers.Player.GenerateOne();
3737

3838
using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
3939
ClientIdGenerationModesClient apiClient = new(requestAdapter);
@@ -71,7 +71,7 @@ public async Task Cannot_create_resource_without_ID_when_supplying_ID_is_require
7171
public async Task Can_create_resource_with_ID_when_supplying_ID_is_required()
7272
{
7373
// Arrange
74-
Player newPlayer = _fakers.Player.Generate();
74+
Player newPlayer = _fakers.Player.GenerateOne();
7575
newPlayer.Id = Guid.NewGuid();
7676

7777
using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
@@ -108,7 +108,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
108108
public async Task Can_create_resource_without_ID_when_supplying_ID_is_allowed()
109109
{
110110
// Arrange
111-
Game newGame = _fakers.Game.Generate();
111+
Game newGame = _fakers.Game.GenerateOne();
112112

113113
using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
114114
ClientIdGenerationModesClient apiClient = new(requestAdapter);
@@ -148,7 +148,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
148148
public async Task Can_create_resource_with_ID_when_supplying_ID_is_allowed()
149149
{
150150
// Arrange
151-
Game newGame = _fakers.Game.Generate();
151+
Game newGame = _fakers.Game.GenerateOne();
152152
newGame.Id = Guid.NewGuid();
153153

154154
using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
@@ -187,7 +187,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
187187
public async Task Cannot_create_resource_with_existing_ID_when_supplying_ID_is_allowed()
188188
{
189189
// Arrange
190-
Game existingGame = _fakers.Game.Generate();
190+
Game existingGame = _fakers.Game.GenerateOne();
191191

192192
await _testContext.RunOnDatabaseAsync(async dbContext =>
193193
{
@@ -231,7 +231,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
231231
public async Task Can_create_resource_without_ID_when_supplying_ID_is_forbidden()
232232
{
233233
// Arrange
234-
PlayerGroup newPlayerGroup = _fakers.Group.Generate();
234+
PlayerGroup newPlayerGroup = _fakers.Group.GenerateOne();
235235

236236
using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
237237
ClientIdGenerationModesClient apiClient = new(requestAdapter);

‎test/OpenApiKiotaEndToEndTests/Headers/ETagTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public ETagTests(IntegrationTestContext<OpenApiStartup<HeaderDbContext>, HeaderD
3232
public async Task Returns_ETag_for_HEAD_request()
3333
{
3434
// Arrange
35-
List<Country> countries = _fakers.Country.Generate(2);
35+
List<Country> countries = _fakers.Country.GenerateList(2);
3636

3737
await _testContext.RunOnDatabaseAsync(async dbContext =>
3838
{
@@ -62,7 +62,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
6262
public async Task Returns_ETag_for_GET_request()
6363
{
6464
// Arrange
65-
List<Country> countries = _fakers.Country.Generate(2);
65+
List<Country> countries = _fakers.Country.GenerateList(2);
6666

6767
await _testContext.RunOnDatabaseAsync(async dbContext =>
6868
{
@@ -125,7 +125,7 @@ public async Task Returns_no_ETag_for_failed_GET_request()
125125
public async Task Returns_no_ETag_for_POST_request()
126126
{
127127
// Arrange
128-
Country newCountry = _fakers.Country.Generate();
128+
Country newCountry = _fakers.Country.GenerateOne();
129129

130130
using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
131131
var apiClient = new HeadersClient(requestAdapter);
@@ -162,7 +162,7 @@ public async Task Returns_no_ETag_for_POST_request()
162162
public async Task Returns_NotModified_for_matching_ETag()
163163
{
164164
// Arrange
165-
List<Country> countries = _fakers.Country.Generate(2);
165+
List<Country> countries = _fakers.Country.GenerateList(2);
166166

167167
await _testContext.RunOnDatabaseAsync(async dbContext =>
168168
{
@@ -205,7 +205,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
205205
public async Task Returns_content_for_mismatching_ETag()
206206
{
207207
// Arrange
208-
List<Country> countries = _fakers.Country.Generate(2);
208+
List<Country> countries = _fakers.Country.GenerateList(2);
209209

210210
await _testContext.RunOnDatabaseAsync(async dbContext =>
211211
{

‎test/OpenApiKiotaEndToEndTests/Headers/HeaderTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public HeaderTests(IntegrationTestContext<OpenApiStartup<HeaderDbContext>, Heade
3030
public async Task Returns_Location_for_post_resource_request()
3131
{
3232
// Arrange
33-
Country newCountry = _fakers.Country.Generate();
33+
Country newCountry = _fakers.Country.GenerateOne();
3434

3535
using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
3636
var apiClient = new HeadersClient(requestAdapter);
@@ -70,7 +70,7 @@ public async Task Returns_Location_for_post_resource_request()
7070
public async Task Returns_ContentLength_for_head_primary_resources_request()
7171
{
7272
// Arrange
73-
Country existingCountry = _fakers.Country.Generate();
73+
Country existingCountry = _fakers.Country.GenerateOne();
7474

7575
await _testContext.RunOnDatabaseAsync(async dbContext =>
7676
{
@@ -100,7 +100,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
100100
public async Task Returns_ContentLength_for_head_primary_resource_request()
101101
{
102102
// Arrange
103-
Country existingCountry = _fakers.Country.Generate();
103+
Country existingCountry = _fakers.Country.GenerateOne();
104104

105105
await _testContext.RunOnDatabaseAsync(async dbContext =>
106106
{
@@ -129,8 +129,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
129129
public async Task Returns_ContentLength_for_head_secondary_resource_request()
130130
{
131131
// Arrange
132-
Country existingCountry = _fakers.Country.Generate();
133-
existingCountry.Languages = _fakers.Language.Generate(1).ToHashSet();
132+
Country existingCountry = _fakers.Country.GenerateOne();
133+
existingCountry.Languages = _fakers.Language.GenerateSet(1);
134134

135135
await _testContext.RunOnDatabaseAsync(async dbContext =>
136136
{
@@ -159,8 +159,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
159159
public async Task Returns_ContentLength_for_head_relationship_request()
160160
{
161161
// Arrange
162-
Country existingCountry = _fakers.Country.Generate();
163-
existingCountry.Languages = _fakers.Language.Generate(1).ToHashSet();
162+
Country existingCountry = _fakers.Country.GenerateOne();
163+
existingCountry.Languages = _fakers.Language.GenerateSet(1);
164164

165165
await _testContext.RunOnDatabaseAsync(async dbContext =>
166166
{

‎test/OpenApiKiotaEndToEndTests/Links/AlternateOpenApiRouteTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public AlternateOpenApiRouteTests(IntegrationTestContext<OpenApiStartup<LinkDbCo
3333
public async Task DescribedBy_link_matches_alternate_OpenAPI_route()
3434
{
3535
// Arrange
36-
Excursion excursion = _fakers.Excursion.Generate();
36+
Excursion excursion = _fakers.Excursion.GenerateOne();
3737

3838
using HttpClientRequestAdapter requestAdapter = _requestAdapterFactory.CreateAdapter(_testContext.Factory);
3939
var apiClient = new LinksClient(requestAdapter);

0 commit comments

Comments
 (0)