Skip to content

Commit f53a5ee

Browse files
marwannettourmarwannettour
committed
[fix] all comments from copilot
1 parent 8bc8c8e commit f53a5ee

File tree

8 files changed

+113
-186
lines changed

8 files changed

+113
-186
lines changed

‎tests/ByteSync.Functions.UnitTests/Http/CloudSessionFunctionTests.cs‎

Lines changed: 20 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,7 @@ namespace ByteSync.Functions.UnitTests.Http;
2020
[TestFixture]
2121
public class CloudSessionFunctionTests
2222
{
23-
private static FunctionContext BuildFunctionContextWithClient()
24-
{
25-
var mockContext = new Mock<FunctionContext>();
26-
var items = new Dictionary<object, object>();
27-
mockContext.SetupGet(c => c.Items).Returns(items);
28-
29-
var client = new Client("cli", "cliInst", "1.0.0", OSPlatforms.Windows, "127.0.0.1");
30-
items[AuthConstants.FUNCTION_CONTEXT_CLIENT] = client;
31-
32-
return mockContext.Object;
33-
}
34-
35-
private static async Task WriteBodyAsync<T>(FakeHttpRequestData request, T body)
36-
{
37-
var json = JsonHelper.Serialize(body);
38-
var bytes = Encoding.UTF8.GetBytes(json);
39-
request.Body.SetLength(0);
40-
await request.Body.WriteAsync(bytes, 0, bytes.Length);
41-
request.Body.Position = 0;
42-
}
23+
4324

4425
[Test]
4526
public async Task Create_ReturnsOk_AndSendsRequest()
@@ -72,7 +53,7 @@ public async Task Create_ReturnsOk_AndSendsRequest()
7253
});
7354

7455
var function = new CloudSessionFunction(mediatorMock.Object);
75-
var context = BuildFunctionContextWithClient();
56+
var context = HttpFunctionTestHelper.BuildFunctionContextWithClient();
7657
var request = new FakeHttpRequestData(context);
7758

7859
var parameters = new CreateCloudSessionParameters
@@ -83,7 +64,7 @@ public async Task Create_ReturnsOk_AndSendsRequest()
8364
CreatorPublicKeyInfo = new PublicKeyInfo { ClientId = "cli", PublicKey = [5, 6], ProtocolVersion = 1 },
8465
CreatorPrivateData = new EncryptedSessionMemberPrivateData { Id = "priv", Data = [7], IV = [8] }
8566
};
86-
await WriteBodyAsync(request, parameters);
67+
await HttpFunctionTestHelper.WriteBodyAsync(request, parameters);
8768

8869
var response = await function.Create(request, context);
8970

@@ -105,7 +86,7 @@ public async Task AskPasswordExchangeKey_ReturnsOk_AndSendsRequest()
10586
.ReturnsAsync(JoinSessionResult.BuildProcessingNormally());
10687

10788
var function = new CloudSessionFunction(mediatorMock.Object);
108-
var context = BuildFunctionContextWithClient();
89+
var context = HttpFunctionTestHelper.BuildFunctionContextWithClient();
10990
var request = new FakeHttpRequestData(context);
11091

11192
var parameters = new AskCloudSessionPasswordExchangeKeyParameters
@@ -115,7 +96,7 @@ public async Task AskPasswordExchangeKey_ReturnsOk_AndSendsRequest()
11596
LobbyId = "L2",
11697
ProfileClientId = "prof"
11798
};
118-
await WriteBodyAsync(request, parameters);
99+
await HttpFunctionTestHelper.WriteBodyAsync(request, parameters);
119100

120101
var response = await function.AskPasswordExchangeKey(request, context, "S1");
121102

@@ -148,7 +129,7 @@ public async Task ValidateJoinCloudSession_ReturnsOk_AndSendsRequest()
148129
EncryptedAesKey = [10, 11],
149130
FinalizationPassword = "pwd"
150131
};
151-
await WriteBodyAsync(request, parameters);
132+
await HttpFunctionTestHelper.WriteBodyAsync(request, parameters);
152133

153134
var response = await function.ValidateJoinCloudSession(request, context, "S2");
154135

@@ -168,7 +149,7 @@ public async Task FinalizeJoinCloudSession_ReturnsOk_AndSendsRequest()
168149
.ReturnsAsync(FinalizeJoinSessionResult.BuildFrom(FinalizeJoinSessionStatuses.FinalizeJoinSessionSucess));
169150

170151
var function = new CloudSessionFunction(mediatorMock.Object);
171-
var context = BuildFunctionContextWithClient();
152+
var context = HttpFunctionTestHelper.BuildFunctionContextWithClient();
172153
var request = new FakeHttpRequestData(context);
173154

174155
var parameters = new FinalizeJoinCloudSessionParameters
@@ -179,7 +160,7 @@ public async Task FinalizeJoinCloudSession_ReturnsOk_AndSendsRequest()
179160
FinalizationPassword = "finalPwd",
180161
EncryptedSessionMemberPrivateData = new EncryptedSessionMemberPrivateData { Id = "mid", Data = [12], IV = [13] }
181162
};
182-
await WriteBodyAsync(request, parameters);
163+
await HttpFunctionTestHelper.WriteBodyAsync(request, parameters);
183164

184165
var response = await function.FinalizeJoinCloudSession(request, context, "S3");
185166

@@ -201,7 +182,7 @@ public async Task AskJoinCloudSession_ReturnsOk_AndSendsRequest()
201182
.ReturnsAsync(JoinSessionResult.BuildProcessingNormally());
202183

203184
var function = new CloudSessionFunction(mediatorMock.Object);
204-
var context = BuildFunctionContextWithClient();
185+
var context = HttpFunctionTestHelper.BuildFunctionContextWithClient();
205186
var request = new FakeHttpRequestData(context);
206187

207188
var parameters = new AskJoinCloudSessionParameters
@@ -211,7 +192,7 @@ public async Task AskJoinCloudSession_ReturnsOk_AndSendsRequest()
211192
ValidatorInstanceId = "validator3",
212193
EncryptedPassword = [14, 15]
213194
};
214-
await WriteBodyAsync(request, parameters);
195+
await HttpFunctionTestHelper.WriteBodyAsync(request, parameters);
215196

216197
var response = await function.AskJoinCloudSession(request, context, "S4");
217198

@@ -233,7 +214,7 @@ public async Task GiveCloudSessionPasswordExchangeKey_ReturnsOk_AndSendsRequest(
233214
.ReturnsAsync(Unit.Value);
234215

235216
var function = new CloudSessionFunction(mediatorMock.Object);
236-
var context = BuildFunctionContextWithClient();
217+
var context = HttpFunctionTestHelper.BuildFunctionContextWithClient();
237218
var request = new FakeHttpRequestData(context);
238219

239220
var parameters = new GiveCloudSessionPasswordExchangeKeyParameters
@@ -243,7 +224,7 @@ public async Task GiveCloudSessionPasswordExchangeKey_ReturnsOk_AndSendsRequest(
243224
ValidatorInstanceId = "validator4",
244225
PublicKeyInfo = new PublicKeyInfo { ClientId = "cli", PublicKey = [16], ProtocolVersion = 3 }
245226
};
246-
await WriteBodyAsync(request, parameters);
227+
await HttpFunctionTestHelper.WriteBodyAsync(request, parameters);
247228

248229
var response = await function.GiveCloudSessionPasswordExchangeKey(request, context, "S5");
249230

@@ -264,10 +245,10 @@ public async Task InformPasswordIsWrong_ReturnsOk_AndSendsRequest()
264245
.ReturnsAsync(Unit.Value);
265246

266247
var function = new CloudSessionFunction(mediatorMock.Object);
267-
var context = BuildFunctionContextWithClient();
248+
var context = HttpFunctionTestHelper.BuildFunctionContextWithClient();
268249
var request = new FakeHttpRequestData(context);
269250

270-
await WriteBodyAsync(request, "bad-client-inst");
251+
await HttpFunctionTestHelper.WriteBodyAsync(request, "bad-client-inst");
271252

272253
var response = await function.InformPasswordIsWrong(request, context, "S6");
273254

@@ -288,11 +269,11 @@ public async Task UpdateSettings_ReturnsOk_WhenUpdated()
288269
.ReturnsAsync(true);
289270

290271
var function = new CloudSessionFunction(mediatorMock.Object);
291-
var context = BuildFunctionContextWithClient();
272+
var context = HttpFunctionTestHelper.BuildFunctionContextWithClient();
292273
var request = new FakeHttpRequestData(context);
293274

294275
var settings = new EncryptedSessionSettings { Id = "set1", Data = [17], IV = [18] };
295-
await WriteBodyAsync(request, settings);
276+
await HttpFunctionTestHelper.WriteBodyAsync(request, settings);
296277

297278
var response = await function.UpdateSettings(request, context, "S7");
298279

@@ -310,11 +291,11 @@ public async Task UpdateSettings_ReturnsConflict_WhenNotUpdated()
310291
.ReturnsAsync(false);
311292

312293
var function = new CloudSessionFunction(mediatorMock.Object);
313-
var context = BuildFunctionContextWithClient();
294+
var context = HttpFunctionTestHelper.BuildFunctionContextWithClient();
314295
var request = new FakeHttpRequestData(context);
315296

316297
var settings = new EncryptedSessionSettings { Id = "set2", Data = [19], IV = [20] };
317-
await WriteBodyAsync(request, settings);
298+
await HttpFunctionTestHelper.WriteBodyAsync(request, settings);
318299

319300
var response = await function.UpdateSettings(request, context, "S8");
320301

@@ -332,7 +313,7 @@ public async Task Quit_ReturnsOk_AndSendsRequest()
332313
.Returns(Task.FromResult(Unit.Value));
333314

334315
var function = new CloudSessionFunction(mediatorMock.Object);
335-
var context = BuildFunctionContextWithClient();
316+
var context = HttpFunctionTestHelper.BuildFunctionContextWithClient();
336317
var request = new FakeHttpRequestData(context);
337318

338319
var response = await function.Quit(request, context, "S9");
@@ -353,7 +334,7 @@ public async Task Reset_ReturnsOk_AndSendsRequest()
353334
.Returns(Task.FromResult(Unit.Value));
354335

355336
var function = new CloudSessionFunction(mediatorMock.Object);
356-
var context = BuildFunctionContextWithClient();
337+
var context = HttpFunctionTestHelper.BuildFunctionContextWithClient();
357338
var request = new FakeHttpRequestData(context);
358339

359340
var response = await function.Reset(request, context, "S10");

‎tests/ByteSync.Functions.UnitTests/Http/CloudSessionProfileFunctionTests.cs‎

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,7 @@ namespace ByteSync.Functions.UnitTests.Http;
1717
[TestFixture]
1818
public class CloudSessionProfileFunctionTests
1919
{
20-
private static FunctionContext BuildFunctionContextWithClient()
21-
{
22-
var mockContext = new Mock<FunctionContext>();
23-
var items = new Dictionary<object, object>();
24-
mockContext.SetupGet(c => c.Items).Returns(items);
25-
26-
var client = new Client("cli", "cliInst", "1.0.0", OSPlatforms.Windows, "127.0.0.1");
27-
items[AuthConstants.FUNCTION_CONTEXT_CLIENT] = client;
28-
29-
return mockContext.Object;
30-
}
31-
32-
private static async Task WriteBodyAsync<T>(FakeHttpRequestData request, T body)
33-
{
34-
var json = JsonHelper.Serialize(body);
35-
var bytes = Encoding.UTF8.GetBytes(json);
36-
request.Body.SetLength(0);
37-
await request.Body.WriteAsync(bytes, 0, bytes.Length);
38-
request.Body.Position = 0;
39-
}
20+
4021

4122
[Test]
4223
public async Task CreateCloudSessionProfile_ForwardsRequest_AndReturnsOk()
@@ -48,11 +29,11 @@ public async Task CreateCloudSessionProfile_ForwardsRequest_AndReturnsOk()
4829
.ReturnsAsync(new CreateCloudSessionProfileResult());
4930

5031
var function = new CloudSessionProfileFunction(serviceMock.Object);
51-
var context = BuildFunctionContextWithClient();
32+
var context = HttpFunctionTestHelper.BuildFunctionContextWithClient();
5233
var request = new FakeHttpRequestData(context);
5334

5435
var sessionId = "S1";
55-
await WriteBodyAsync(request, sessionId);
36+
await HttpFunctionTestHelper.WriteBodyAsync(request, sessionId);
5637

5738
var response = await function.CreateCloudSessionProfile(request, context);
5839

@@ -72,11 +53,11 @@ public async Task GetCloudSessionProfileData_ForwardsRequest_AndReturnsOk()
7253
.ReturnsAsync(new CloudSessionProfileData());
7354

7455
var function = new CloudSessionProfileFunction(serviceMock.Object);
75-
var context = BuildFunctionContextWithClient();
56+
var context = HttpFunctionTestHelper.BuildFunctionContextWithClient();
7657
var request = new FakeHttpRequestData(context);
7758

7859
var parameters = new GetCloudSessionProfileDataParameters { SessionId = "P1", CloudSessionProfileId = "PC1" };
79-
await WriteBodyAsync(request, parameters);
60+
await HttpFunctionTestHelper.WriteBodyAsync(request, parameters);
8061

8162
var response = await function.GetCloudSessionProfileData(request, context, "P1");
8263

@@ -97,11 +78,11 @@ public async Task GetProfileDetailsPassword_ForwardsRequest_AndReturnsOk()
9778
.ReturnsAsync("password123");
9879

9980
var function = new CloudSessionProfileFunction(serviceMock.Object);
100-
var context = BuildFunctionContextWithClient();
81+
var context = HttpFunctionTestHelper.BuildFunctionContextWithClient();
10182
var request = new FakeHttpRequestData(context);
10283

10384
var parameters = new GetProfileDetailsPasswordParameters { ProfileClientId = "PC1" };
104-
await WriteBodyAsync(request, parameters);
85+
await HttpFunctionTestHelper.WriteBodyAsync(request, parameters);
10586

10687
var response = await function.GetProfileDetailsPassword(request, context, "P1");
10788

@@ -122,11 +103,11 @@ public async Task DeleteCloudSessionProfile_ForwardsRequest_AndReturnsOk()
122103
.ReturnsAsync(true);
123104

124105
var function = new CloudSessionProfileFunction(serviceMock.Object);
125-
var context = BuildFunctionContextWithClient();
106+
var context = HttpFunctionTestHelper.BuildFunctionContextWithClient();
126107
var request = new FakeHttpRequestData(context);
127108

128109
var parameters = new DeleteCloudSessionProfileParameters { ProfileClientId = "PC1" };
129-
await WriteBodyAsync(request, parameters);
110+
await HttpFunctionTestHelper.WriteBodyAsync(request, parameters);
130111

131112
var response = await function.DeleteCloudSessionProfile(request, context, "P1");
132113

0 commit comments

Comments
 (0)