Skip to content

Commit 1f24fd3

Browse files
Youssef1313Youssef1313
authored
Cleanup dotnet test (#50666)
1 parent 6b52b29 commit 1f24fd3

13 files changed

+129
-134
lines changed

‎src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/BaseSerializer.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ protected static void WriteLong(Stream stream, long value)
110110
stream.Write(bytes);
111111
}
112112

113-
protected static void WriteShort(Stream stream, ushort value)
113+
protected static void WriteUShort(Stream stream, ushort value)
114114
{
115115
Span<byte> bytes = stackalloc byte[sizeof(ushort)];
116116
BitConverter.TryWriteBytes(bytes, value);
@@ -140,7 +140,7 @@ protected static long ReadLong(Stream stream)
140140
return BitConverter.ToInt64(bytes);
141141
}
142142

143-
protected static ushort ReadShort(Stream stream)
143+
protected static ushort ReadUShort(Stream stream)
144144
{
145145
Span<byte> bytes = stackalloc byte[sizeof(ushort)];
146146
stream.ReadExactly(bytes);
@@ -166,7 +166,7 @@ protected static void WriteField(Stream stream, ushort id, string? value)
166166
return;
167167
}
168168

169-
WriteShort(stream, id);
169+
WriteUShort(stream, id);
170170
WriteStringSize(stream, value);
171171
WriteStringValue(stream, value);
172172
}
@@ -178,7 +178,7 @@ protected static void WriteField(Stream stream, ushort id, long? value)
178178
return;
179179
}
180180

181-
WriteShort(stream, id);
181+
WriteUShort(stream, id);
182182
WriteSize<long>(stream);
183183
WriteLong(stream, value.Value);
184184
}
@@ -210,7 +210,7 @@ protected static void WriteField(Stream stream, ushort id, bool? value)
210210
return;
211211
}
212212

213-
WriteShort(stream, id);
213+
WriteUShort(stream, id);
214214
WriteSize<bool>(stream);
215215
WriteBool(stream, value.Value);
216216
}
@@ -222,7 +222,7 @@ protected static void WriteField(Stream stream, ushort id, byte? value)
222222
return;
223223
}
224224

225-
WriteShort(stream, id);
225+
WriteUShort(stream, id);
226226
WriteSize<byte>(stream);
227227
WriteByte(stream, value.Value);
228228
}

‎src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/CommandLineOptionMessagesSerializer.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ public object Deserialize(Stream stream)
4646
string? moduleName = null;
4747
List<CommandLineOptionMessage>? commandLineOptionMessages = null;
4848

49-
ushort fieldCount = ReadShort(stream);
49+
ushort fieldCount = ReadUShort(stream);
5050

5151
for (int i = 0; i < fieldCount; i++)
5252
{
53-
int fieldId = ReadShort(stream);
53+
int fieldId = ReadUShort(stream);
5454
int fieldSize = ReadInt(stream);
5555

5656
switch (fieldId)
@@ -83,11 +83,11 @@ private static List<CommandLineOptionMessage> ReadCommandLineOptionMessagesPaylo
8383
string? name = null, description = null;
8484
bool? isHidden = null, isBuiltIn = null;
8585

86-
int fieldCount = ReadShort(stream);
86+
int fieldCount = ReadUShort(stream);
8787

8888
for (int j = 0; j < fieldCount; j++)
8989
{
90-
int fieldId = ReadShort(stream);
90+
int fieldId = ReadUShort(stream);
9191
int fieldSize = ReadInt(stream);
9292

9393
switch (fieldId)
@@ -126,7 +126,7 @@ public void Serialize(object objectToSerialize, Stream stream)
126126

127127
var commandLineOptionMessages = (CommandLineOptionMessages)objectToSerialize;
128128

129-
WriteShort(stream, GetFieldCount(commandLineOptionMessages));
129+
WriteUShort(stream, GetFieldCount(commandLineOptionMessages));
130130

131131
WriteField(stream, CommandLineOptionMessagesFieldsId.ModulePath, commandLineOptionMessages.ModulePath);
132132
WriteCommandLineOptionMessagesPayload(stream, commandLineOptionMessages.CommandLineOptionMessageList);
@@ -139,7 +139,7 @@ private static void WriteCommandLineOptionMessagesPayload(Stream stream, Command
139139
return;
140140
}
141141

142-
WriteShort(stream, CommandLineOptionMessagesFieldsId.CommandLineOptionMessageList);
142+
WriteUShort(stream, CommandLineOptionMessagesFieldsId.CommandLineOptionMessageList);
143143

144144
// We will reserve an int (4 bytes)
145145
// so that we fill the size later, once we write the payload
@@ -149,7 +149,7 @@ private static void WriteCommandLineOptionMessagesPayload(Stream stream, Command
149149
WriteInt(stream, commandLineOptionMessageList.Length);
150150
foreach (CommandLineOptionMessage commandLineOptionMessage in commandLineOptionMessageList)
151151
{
152-
WriteShort(stream, GetFieldCount(commandLineOptionMessage));
152+
WriteUShort(stream, GetFieldCount(commandLineOptionMessage));
153153

154154
WriteField(stream, CommandLineOptionMessageFieldsId.Name, commandLineOptionMessage.Name);
155155
WriteField(stream, CommandLineOptionMessageFieldsId.Description, commandLineOptionMessage.Description);

‎src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/DiscoveredTestMessagesSerializer.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ public object Deserialize(Stream stream)
4343
string? instanceId = null;
4444
List<DiscoveredTestMessage>? discoveredTestMessages = null;
4545

46-
ushort fieldCount = ReadShort(stream);
46+
ushort fieldCount = ReadUShort(stream);
4747

4848
for (int i = 0; i < fieldCount; i++)
4949
{
50-
int fieldId = ReadShort(stream);
50+
int fieldId = ReadUShort(stream);
5151
int fieldSize = ReadInt(stream);
5252

5353
switch (fieldId)
@@ -83,11 +83,11 @@ private static List<DiscoveredTestMessage> ReadDiscoveredTestMessagesPayload(Str
8383
{
8484
string? uid = null, displayName = null;
8585

86-
int fieldCount = ReadShort(stream);
86+
int fieldCount = ReadUShort(stream);
8787

8888
for (int j = 0; j < fieldCount; j++)
8989
{
90-
int fieldId = ReadShort(stream);
90+
int fieldId = ReadUShort(stream);
9191
int fieldSize = ReadInt(stream);
9292

9393
switch (fieldId)
@@ -118,7 +118,7 @@ public void Serialize(object objectToSerialize, Stream stream)
118118

119119
var discoveredTestMessages = (DiscoveredTestMessages)objectToSerialize;
120120

121-
WriteShort(stream, GetFieldCount(discoveredTestMessages));
121+
WriteUShort(stream, GetFieldCount(discoveredTestMessages));
122122

123123
WriteField(stream, DiscoveredTestMessagesFieldsId.ExecutionId, discoveredTestMessages.ExecutionId);
124124
WriteField(stream, DiscoveredTestMessagesFieldsId.InstanceId, discoveredTestMessages.InstanceId);
@@ -132,7 +132,7 @@ private static void WriteDiscoveredTestMessagesPayload(Stream stream, Discovered
132132
return;
133133
}
134134

135-
WriteShort(stream, DiscoveredTestMessagesFieldsId.DiscoveredTestMessageList);
135+
WriteUShort(stream, DiscoveredTestMessagesFieldsId.DiscoveredTestMessageList);
136136

137137
// We will reserve an int (4 bytes)
138138
// so that we fill the size later, once we write the payload
@@ -142,7 +142,7 @@ private static void WriteDiscoveredTestMessagesPayload(Stream stream, Discovered
142142
WriteInt(stream, discoveredTestMessageList.Length);
143143
foreach (DiscoveredTestMessage discoveredTestMessage in discoveredTestMessageList)
144144
{
145-
WriteShort(stream, GetFieldCount(discoveredTestMessage));
145+
WriteUShort(stream, GetFieldCount(discoveredTestMessage));
146146

147147
WriteField(stream, DiscoveredTestMessageFieldsId.Uid, discoveredTestMessage.Uid);
148148
WriteField(stream, DiscoveredTestMessageFieldsId.DisplayName, discoveredTestMessage.DisplayName);

‎src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/FileArtifactMessagesSerializer.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ public object Deserialize(Stream stream)
5959
string? instanceId = null;
6060
List<FileArtifactMessage>? fileArtifactMessages = null;
6161

62-
ushort fieldCount = ReadShort(stream);
62+
ushort fieldCount = ReadUShort(stream);
6363

6464
for (int i = 0; i < fieldCount; i++)
6565
{
66-
int fieldId = ReadShort(stream);
66+
int fieldId = ReadUShort(stream);
6767
int fieldSize = ReadInt(stream);
6868

6969
switch (fieldId)
@@ -99,11 +99,11 @@ private static List<FileArtifactMessage> ReadFileArtifactMessagesPayload(Stream
9999
{
100100
string? fullPath = null, displayName = null, description = null, testUid = null, testDisplayName = null, sessionUid = null;
101101

102-
int fieldCount = ReadShort(stream);
102+
int fieldCount = ReadUShort(stream);
103103

104104
for (int j = 0; j < fieldCount; j++)
105105
{
106-
int fieldId = ReadShort(stream);
106+
int fieldId = ReadUShort(stream);
107107
int fieldSize = ReadInt(stream);
108108

109109
switch (fieldId)
@@ -150,7 +150,7 @@ public void Serialize(object objectToSerialize, Stream stream)
150150

151151
var fileArtifactMessages = (FileArtifactMessages)objectToSerialize;
152152

153-
WriteShort(stream, GetFieldCount(fileArtifactMessages));
153+
WriteUShort(stream, GetFieldCount(fileArtifactMessages));
154154

155155
WriteField(stream, FileArtifactMessagesFieldsId.ExecutionId, fileArtifactMessages.ExecutionId);
156156
WriteField(stream, FileArtifactMessagesFieldsId.InstanceId, fileArtifactMessages.InstanceId);
@@ -164,7 +164,7 @@ private static void WriteFileArtifactMessagesPayload(Stream stream, FileArtifact
164164
return;
165165
}
166166

167-
WriteShort(stream, FileArtifactMessagesFieldsId.FileArtifactMessageList);
167+
WriteUShort(stream, FileArtifactMessagesFieldsId.FileArtifactMessageList);
168168

169169
// We will reserve an int (4 bytes)
170170
// so that we fill the size later, once we write the payload
@@ -174,7 +174,7 @@ private static void WriteFileArtifactMessagesPayload(Stream stream, FileArtifact
174174
WriteInt(stream, fileArtifactMessageList.Length);
175175
foreach (FileArtifactMessage fileArtifactMessage in fileArtifactMessageList)
176176
{
177-
WriteShort(stream, GetFieldCount(fileArtifactMessage));
177+
WriteUShort(stream, GetFieldCount(fileArtifactMessage));
178178

179179
WriteField(stream, FileArtifactMessageFieldsId.FullPath, fileArtifactMessage.FullPath);
180180
WriteField(stream, FileArtifactMessageFieldsId.DisplayName, fileArtifactMessage.DisplayName);

‎src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/HandshakeMessageSerializer.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public object Deserialize(Stream stream)
1616
{
1717
Dictionary<byte, string> properties = [];
1818

19-
ushort fieldCount = ReadShort(stream);
19+
ushort fieldCount = ReadUShort(stream);
2020

2121
for (int i = 0; i < fieldCount; i++)
2222
{
@@ -32,12 +32,15 @@ public void Serialize(object objectToSerialize, Stream stream)
3232

3333
var handshakeMessage = (HandshakeMessage)objectToSerialize;
3434

35-
if (handshakeMessage.Properties is null || handshakeMessage.Properties.Count == 0)
35+
// Deserializer always expected fieldCount to be present.
36+
// We must write the count even if Properties is null or empty.
37+
WriteUShort(stream, (ushort)(handshakeMessage.Properties?.Count ?? 0));
38+
39+
if (handshakeMessage.Properties is null)
3640
{
3741
return;
3842
}
3943

40-
WriteShort(stream, (ushort)handshakeMessage.Properties.Count);
4144
foreach (KeyValuePair<byte, string> property in handshakeMessage.Properties)
4245
{
4346
WriteField(stream, property.Key);

‎src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/TestResultMessagesSerializer.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ public object Deserialize(Stream stream)
115115
List<SuccessfulTestResultMessage>? successfulTestResultMessages = null;
116116
List<FailedTestResultMessage>? failedTestResultMessages = null;
117117

118-
ushort fieldCount = ReadShort(stream);
118+
ushort fieldCount = ReadUShort(stream);
119119

120120
for (int i = 0; i < fieldCount; i++)
121121
{
122-
int fieldId = ReadShort(stream);
122+
int fieldId = ReadUShort(stream);
123123
int fieldSize = ReadInt(stream);
124124

125125
switch (fieldId)
@@ -165,11 +165,11 @@ private static List<SuccessfulTestResultMessage> ReadSuccessfulTestMessagesPaylo
165165
byte? state = null;
166166
long? duration = null;
167167

168-
int fieldCount = ReadShort(stream);
168+
int fieldCount = ReadUShort(stream);
169169

170170
for (int j = 0; j < fieldCount; j++)
171171
{
172-
int fieldId = ReadShort(stream);
172+
int fieldId = ReadUShort(stream);
173173
int fieldSize = ReadInt(stream);
174174

175175
switch (fieldId)
@@ -230,11 +230,11 @@ private static List<FailedTestResultMessage> ReadFailedTestMessagesPayload(Strea
230230
byte? state = null;
231231
long? duration = null;
232232

233-
int fieldCount = ReadShort(stream);
233+
int fieldCount = ReadUShort(stream);
234234

235235
for (int j = 0; j < fieldCount; j++)
236236
{
237-
int fieldId = ReadShort(stream);
237+
int fieldId = ReadUShort(stream);
238238
int fieldSize = ReadInt(stream);
239239

240240
switch (fieldId)
@@ -294,15 +294,15 @@ private static ExceptionMessage[] ReadExceptionMessagesPayload(Stream stream)
294294
int length = ReadInt(stream);
295295
for (int i = 0; i < length; i++)
296296
{
297-
int fieldCount = ReadShort(stream);
297+
int fieldCount = ReadUShort(stream);
298298

299299
string? errorMessage = null;
300300
string? errorType = null;
301301
string? stackTrace = null;
302302

303303
for (int j = 0; j < fieldCount; j++)
304304
{
305-
int fieldId = ReadShort(stream);
305+
int fieldId = ReadUShort(stream);
306306
int fieldSize = ReadInt(stream);
307307

308308
switch (fieldId)
@@ -333,7 +333,7 @@ public void Serialize(object objectToSerialize, Stream stream)
333333

334334
var testResultMessages = (TestResultMessages)objectToSerialize;
335335

336-
WriteShort(stream, GetFieldCount(testResultMessages));
336+
WriteUShort(stream, GetFieldCount(testResultMessages));
337337

338338
WriteField(stream, TestResultMessagesFieldsId.ExecutionId, testResultMessages.ExecutionId);
339339
WriteField(stream, TestResultMessagesFieldsId.InstanceId, testResultMessages.InstanceId);
@@ -348,7 +348,7 @@ private static void WriteSuccessfulTestMessagesPayload(Stream stream, Successful
348348
return;
349349
}
350350

351-
WriteShort(stream, TestResultMessagesFieldsId.SuccessfulTestMessageList);
351+
WriteUShort(stream, TestResultMessagesFieldsId.SuccessfulTestMessageList);
352352

353353
// We will reserve an int (4 bytes)
354354
// so that we fill the size later, once we write the payload
@@ -358,7 +358,7 @@ private static void WriteSuccessfulTestMessagesPayload(Stream stream, Successful
358358
WriteInt(stream, successfulTestResultMessages.Length);
359359
foreach (SuccessfulTestResultMessage successfulTestResultMessage in successfulTestResultMessages)
360360
{
361-
WriteShort(stream, GetFieldCount(successfulTestResultMessage));
361+
WriteUShort(stream, GetFieldCount(successfulTestResultMessage));
362362

363363
WriteField(stream, SuccessfulTestResultMessageFieldsId.Uid, successfulTestResultMessage.Uid);
364364
WriteField(stream, SuccessfulTestResultMessageFieldsId.DisplayName, successfulTestResultMessage.DisplayName);
@@ -382,7 +382,7 @@ private static void WriteFailedTestMessagesPayload(Stream stream, FailedTestResu
382382
return;
383383
}
384384

385-
WriteShort(stream, TestResultMessagesFieldsId.FailedTestMessageList);
385+
WriteUShort(stream, TestResultMessagesFieldsId.FailedTestMessageList);
386386

387387
// We will reserve an int (4 bytes)
388388
// so that we fill the size later, once we write the payload
@@ -392,7 +392,7 @@ private static void WriteFailedTestMessagesPayload(Stream stream, FailedTestResu
392392
WriteInt(stream, failedTestResultMessages.Length);
393393
foreach (FailedTestResultMessage failedTestResultMessage in failedTestResultMessages)
394394
{
395-
WriteShort(stream, GetFieldCount(failedTestResultMessage));
395+
WriteUShort(stream, GetFieldCount(failedTestResultMessage));
396396

397397
WriteField(stream, FailedTestResultMessageFieldsId.Uid, failedTestResultMessage.Uid);
398398
WriteField(stream, FailedTestResultMessageFieldsId.DisplayName, failedTestResultMessage.DisplayName);
@@ -417,7 +417,7 @@ private static void WriteExceptionMessagesPayload(Stream stream, ExceptionMessag
417417
return;
418418
}
419419

420-
WriteShort(stream, FailedTestResultMessageFieldsId.ExceptionMessageList);
420+
WriteUShort(stream, FailedTestResultMessageFieldsId.ExceptionMessageList);
421421

422422
// We will reserve an int (4 bytes)
423423
// so that we fill the size later, once we write the payload
@@ -427,7 +427,7 @@ private static void WriteExceptionMessagesPayload(Stream stream, ExceptionMessag
427427
WriteInt(stream, exceptionMessages.Length);
428428
foreach (ExceptionMessage exceptionMessage in exceptionMessages)
429429
{
430-
WriteShort(stream, GetFieldCount(exceptionMessage));
430+
WriteUShort(stream, GetFieldCount(exceptionMessage));
431431

432432
WriteField(stream, ExceptionMessageFieldsId.ErrorMessage, exceptionMessage.ErrorMessage);
433433
WriteField(stream, ExceptionMessageFieldsId.ErrorType, exceptionMessage.ErrorType);

‎src/Cli/dotnet/Commands/Test/MTP/IPC/Serializers/TestSessionEventSerializer.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ public object Deserialize(Stream stream)
3434
string? sessionUid = null;
3535
string? executionId = null;
3636

37-
ushort fieldCount = ReadShort(stream);
37+
ushort fieldCount = ReadUShort(stream);
3838

3939
for (int i = 0; i < fieldCount; i++)
4040
{
41-
ushort fieldId = ReadShort(stream);
41+
ushort fieldId = ReadUShort(stream);
4242
int fieldSize = ReadInt(stream);
4343

4444
switch (fieldId)
@@ -71,7 +71,7 @@ public void Serialize(object objectToSerialize, Stream stream)
7171

7272
var testSessionEvent = (TestSessionEvent)objectToSerialize;
7373

74-
WriteShort(stream, GetFieldCount(testSessionEvent));
74+
WriteUShort(stream, GetFieldCount(testSessionEvent));
7575

7676
WriteField(stream, TestSessionEventFieldsId.SessionType, testSessionEvent.SessionType);
7777
WriteField(stream, TestSessionEventFieldsId.SessionUid, testSessionEvent.SessionUid);

0 commit comments

Comments
 (0)