Skip to content

Commit 81f34d4

Browse files
author
cosullivan
committed
minor cleanup
1 parent a75f6e2 commit 81f34d4

File tree

8 files changed

+64
-85
lines changed

8 files changed

+64
-85
lines changed

‎Src/SmtpServer.Tests/SmtpParserTests.cs‎

Lines changed: 42 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.Net;
43
using System.Text;
5-
using SmtpServer.Mail;
64
using SmtpServer.Protocol;
75
using SmtpServer.Text;
86
using Xunit;
@@ -41,7 +39,7 @@ public void CanMakeNoop()
4139
var parser = CreateParser("NOOP");
4240

4341
// act
44-
var result = parser.TryMakeNoop(out SmtpCommand command, out SmtpResponse errorResponse);
42+
var result = parser.TryMakeNoop(out var command, out var errorResponse);
4543

4644
// assert
4745
Assert.True(result);
@@ -55,7 +53,7 @@ public void CanMakeHelo()
5553
var parser = CreateParser("HELO abc-1-def.mail.com");
5654

5755
// act
58-
var result = parser.TryMakeHelo(out SmtpCommand command, out SmtpResponse errorResponse);
56+
var result = parser.TryMakeHelo(out var command, out var errorResponse);
5957

6058
// assert
6159
Assert.True(result);
@@ -73,7 +71,7 @@ public void CanNotMakeHelo(string input)
7371
var parser = CreateParser(input);
7472

7573
// act
76-
var result = parser.TryMakeHelo(out SmtpCommand command, out SmtpResponse errorResponse);
74+
var result = parser.TryMakeHelo(out var command, out var errorResponse);
7775

7876
// assert
7977
Assert.False(result);
@@ -92,7 +90,7 @@ public void CanMakeEhlo(string input)
9290
var parser = CreateParser(input);
9391

9492
// act
95-
var result = parser.TryMakeEhlo(out SmtpCommand command, out SmtpResponse errorResponse);
93+
var result = parser.TryMakeEhlo(out var command, out var errorResponse);
9694

9795
var ipOrDomainPart = input.Substring(5);
9896

@@ -121,7 +119,7 @@ public void CanMakeAuthPlain()
121119
var parser = CreateParser("AUTH PLAIN Y2Fpbi5vc3VsbGl2YW5AZ21haWwuY29t");
122120

123121
// act
124-
var result = parser.TryMakeAuth(out SmtpCommand command, out SmtpResponse errorResponse);
122+
var result = parser.TryMakeAuth(out var command, out var errorResponse);
125123

126124
// assert
127125
Assert.True(result);
@@ -137,7 +135,7 @@ public void CanMakeAuthLogin()
137135
var parser = CreateParser("AUTH LOGIN Y2Fpbi5vc3VsbGl2YW5AZ21haWwuY29t");
138136

139137
// act
140-
var result = parser.TryMakeAuth(out SmtpCommand command, out SmtpResponse errorResponse);
138+
var result = parser.TryMakeAuth(out var command, out var errorResponse);
141139

142140
// assert
143141
Assert.True(result);
@@ -163,7 +161,7 @@ public void CanMakeMail(string email, string user, string host, string extension
163161
var parser = CreateParser(mailTo);
164162

165163
// act
166-
var result = parser.TryMakeMail(out SmtpCommand command, out SmtpResponse errorResponse);
164+
var result = parser.TryMakeMail(out var command, out var errorResponse);
167165

168166
// assert
169167
Assert.True(result);
@@ -185,7 +183,7 @@ public void CanMakeMailWithNoAddress()
185183
var parser = CreateParser("MAIL FROM:<>");
186184

187185
// act
188-
var result = parser.TryMakeMail(out SmtpCommand command, out SmtpResponse errorResponse);
186+
var result = parser.TryMakeMail(out var command, out var errorResponse);
189187

190188
// assert
191189
Assert.True(result);
@@ -202,7 +200,7 @@ public void CanMakeMailWithBlankAddress()
202200
var parser = CreateParser("MAIL FROM:< >");
203201

204202
// act
205-
var result = parser.TryMakeMail(out SmtpCommand command, out SmtpResponse errorResponse);
203+
var result = parser.TryMakeMail(out var command, out var errorResponse);
206204

207205
// assert
208206
Assert.True(result);
@@ -220,7 +218,7 @@ public void CanNotMakeMail(string input)
220218
var parser = CreateParser(input);
221219

222220
// act
223-
var result = parser.TryMakeMail(out SmtpCommand command, out SmtpResponse errorResponse);
221+
var result = parser.TryMakeMail(out var command, out var errorResponse);
224222

225223
// assert
226224
Assert.False(result);
@@ -237,7 +235,7 @@ public void CanMakeRcpt(string email, string user, string host)
237235
var parser = CreateParser($"RCPT TO:<{email}>");
238236

239237
// act
240-
var result = parser.TryMakeRcpt(out SmtpCommand command, out SmtpResponse errorResponse);
238+
var result = parser.TryMakeRcpt(out var command, out var errorResponse);
241239

242240
// assert
243241
Assert.True(result);
@@ -253,15 +251,15 @@ public void CanMakeProxyIpV4()
253251
var parser = CreateParser("PROXY TCP4 192.168.1.1 192.168.1.2 1234 16789");
254252

255253
// act
256-
var result = parser.TryMakeProxy(out SmtpCommand command, out SmtpResponse errorResponse);
254+
var result = parser.TryMakeProxy(out var command, out var errorResponse);
257255

258256
// assert
259257
Assert.True(result);
260-
Assert.True(command is ProxyProtocolCommand);
261-
Assert.Equal("192.168.1.1", ((ProxyProtocolCommand)command).SourceEndpoint.Address.ToString());
262-
Assert.Equal("192.168.1.2", ((ProxyProtocolCommand)command).DestinationEndpoint.Address.ToString());
263-
Assert.Equal(1234, ((ProxyProtocolCommand)command).SourceEndpoint.Port);
264-
Assert.Equal(16789, ((ProxyProtocolCommand)command).DestinationEndpoint.Port);
258+
Assert.True(command is ProxyCommand);
259+
Assert.Equal("192.168.1.1", ((ProxyCommand)command).SourceEndpoint.Address.ToString());
260+
Assert.Equal("192.168.1.2", ((ProxyCommand)command).DestinationEndpoint.Address.ToString());
261+
Assert.Equal(1234, ((ProxyCommand)command).SourceEndpoint.Port);
262+
Assert.Equal(16789, ((ProxyCommand)command).DestinationEndpoint.Port);
265263
}
266264

267265
[Fact]
@@ -271,26 +269,25 @@ public void CanMakeProxyIpV6()
271269
var parser = CreateParser("PROXY TCP6 2001:1234:abcd::0001 3456:2e76:66d8:f84:abcd:abef:ffff:1234 1234 16789");
272270

273271
// act
274-
var result = parser.TryMakeProxy(out SmtpCommand command, out SmtpResponse errorResponse);
272+
var result = parser.TryMakeProxy(out var command, out var errorResponse);
275273

276274
// assert
277275
Assert.True(result);
278-
Assert.True(command is ProxyProtocolCommand);
279-
Assert.Equal(IPAddress.Parse("2001:1234:abcd::0001").ToString(), ((ProxyProtocolCommand)command).SourceEndpoint.Address.ToString());
280-
Assert.Equal(IPAddress.Parse("3456:2e76:66d8:f84:abcd:abef:ffff:1234").ToString(), ((ProxyProtocolCommand)command).DestinationEndpoint.Address.ToString());
281-
Assert.Equal(1234, ((ProxyProtocolCommand)command).SourceEndpoint.Port);
282-
Assert.Equal(16789, ((ProxyProtocolCommand)command).DestinationEndpoint.Port);
276+
Assert.True(command is ProxyCommand);
277+
Assert.Equal(IPAddress.Parse("2001:1234:abcd::0001").ToString(), ((ProxyCommand)command).SourceEndpoint.Address.ToString());
278+
Assert.Equal(IPAddress.Parse("3456:2e76:66d8:f84:abcd:abef:ffff:1234").ToString(), ((ProxyCommand)command).DestinationEndpoint.Address.ToString());
279+
Assert.Equal(1234, ((ProxyCommand)command).SourceEndpoint.Port);
280+
Assert.Equal(16789, ((ProxyCommand)command).DestinationEndpoint.Port);
283281
}
284282

285283
[Fact]
286284
public void CanMakeAtom()
287285
{
288286
// arrange
289287
var parser = CreateParser("hello");
290-
string atom;
291288

292289
// act
293-
var made = parser.TryMakeAtom(out atom);
290+
var made = parser.TryMakeAtom(out var atom);
294291

295292
// assert
296293
Assert.True(made);
@@ -302,10 +299,9 @@ public void CanMakeDotString()
302299
{
303300
// arrange
304301
var parser = CreateParser("abc.def.hij");
305-
string dotString;
306302

307303
// act
308-
var made = parser.TryMakeDotString(out dotString);
304+
var made = parser.TryMakeDotString(out var dotString);
309305

310306
// assert
311307
Assert.True(made);
@@ -317,10 +313,9 @@ public void CanMakeLocalPart()
317313
{
318314
// arrange
319315
var parser = CreateParser("abc");
320-
string localPart;
321316

322317
// act
323-
var made = parser.TryMakeLocalPart(out localPart);
318+
var made = parser.TryMakeLocalPart(out var localPart);
324319

325320
// assert
326321
Assert.True(made);
@@ -331,12 +326,10 @@ public void CanMakeLocalPart()
331326
public void CanMakeTextOrNumber()
332327
{
333328
// arrange
334-
string textOrNumber1;
335-
string textOrNumber2;
336329

337330
// act
338-
var made1 = CreateParser("abc").TryMakeTextOrNumber(out textOrNumber1);
339-
var made2 = CreateParser("123").TryMakeTextOrNumber(out textOrNumber2);
331+
var made1 = CreateParser("abc").TryMakeTextOrNumber(out var textOrNumber1);
332+
var made2 = CreateParser("123").TryMakeTextOrNumber(out var textOrNumber2);
340333

341334
// assert
342335
Assert.True(made1);
@@ -350,10 +343,9 @@ public void CanMakeTextOrNumberOrHyphenString()
350343
{
351344
// arrange
352345
var parser = CreateParser("a1-b2");
353-
string textOrNumberOrHyphen1;
354346

355347
// act
356-
var made1 = parser.TryMakeTextOrNumberOrHyphenString(out textOrNumberOrHyphen1);
348+
var made1 = parser.TryMakeTextOrNumberOrHyphenString(out var textOrNumberOrHyphen1);
357349

358350
// assert
359351
Assert.True(made1);
@@ -365,10 +357,9 @@ public void CanMakeSubdomain()
365357
{
366358
// arrange
367359
var parser = CreateParser("a-1-b-2");
368-
string subdomain;
369360

370361
// act
371-
var made = parser.TryMakeSubdomain(out subdomain);
362+
var made = parser.TryMakeSubdomain(out var subdomain);
372363

373364
// assert
374365
Assert.True(made);
@@ -380,10 +371,9 @@ public void CanMakeDomain()
380371
{
381372
// arrange
382373
var parser = CreateParser("123.abc.com");
383-
string domain;
384374

385375
// act
386-
var made = parser.TryMakeDomain(out domain);
376+
var made = parser.TryMakeDomain(out var domain);
387377

388378
// assert
389379
Assert.True(made);
@@ -404,10 +394,9 @@ public void CanMakeMailbox(string email, string user, string host)
404394
{
405395
// arrange
406396
var parser = CreateParser(email);
407-
IMailbox mailbox;
408397

409398
// act
410-
var made = parser.TryMakeMailbox(out mailbox);
399+
var made = parser.TryMakeMailbox(out var mailbox);
411400

412401
// assert
413402
Assert.True(made);
@@ -420,10 +409,9 @@ public void CanMakePlusAddressMailBox()
420409
{
421410
// arrange
422411
var parser = CreateParser("cain.osullivan+plus@gmail.com");
423-
IMailbox mailbox;
424412

425413
// act
426-
var made = parser.TryMakeMailbox(out mailbox);
414+
var made = parser.TryMakeMailbox(out var mailbox);
427415

428416
// assert
429417
Assert.True(made);
@@ -436,10 +424,9 @@ public void CanMakeAtDomain()
436424
{
437425
// arrange
438426
var parser = CreateParser("@gmail.com");
439-
string atDomain;
440427

441428
// act
442-
var made = parser.TryMakeAtDomain(out atDomain);
429+
var made = parser.TryMakeAtDomain(out var atDomain);
443430

444431
// assert
445432
Assert.True(made);
@@ -451,10 +438,9 @@ public void CanMakeAtDomainList()
451438
{
452439
// arrange
453440
var parser = CreateParser("@gmail.com,@hotmail.com");
454-
string atDomainList;
455441

456442
// act
457-
var made = parser.TryMakeAtDomainList(out atDomainList);
443+
var made = parser.TryMakeAtDomainList(out var atDomainList);
458444

459445
// assert
460446
Assert.True(made);
@@ -466,10 +452,9 @@ public void CanMakePath()
466452
{
467453
// path
468454
var parser = CreateParser("<@gmail.com,@hotmail.com:cain.osullivan@gmail.com>");
469-
IMailbox mailbox;
470455

471456
// act
472-
var made = parser.TryMakePath(out mailbox);
457+
var made = parser.TryMakePath(out var mailbox);
473458

474459
// assert
475460
Assert.True(made);
@@ -482,10 +467,9 @@ public void CanMakeReversePath()
482467
{
483468
// path
484469
var parser = CreateParser("<@gmail.com,@hotmail.com:cain.osullivan@gmail.com>");
485-
IMailbox mailbox;
486470

487471
// act
488-
var made = parser.TryMakePath(out mailbox);
472+
var made = parser.TryMakePath(out var mailbox);
489473

490474
// assert
491475
Assert.True(made);
@@ -498,10 +482,9 @@ public void CanMakeAddressLiteral()
498482
{
499483
// arrange
500484
var parser = CreateParser("[ 127.0.0.1 ]");
501-
string address;
502485

503486
// act
504-
var made = parser.TryMakeAddressLiteral(out address);
487+
var made = parser.TryMakeAddressLiteral(out var address);
505488

506489
// assert
507490
Assert.True(made);
@@ -513,20 +496,19 @@ public void CanMakeMailParameters()
513496
{
514497
// arrange
515498
var parser = CreateParser("SIZE=123 ABC=DEF ABCDE ZZZ=123");
516-
IReadOnlyDictionary<string, string> parameters;
517499

518500
// act
519-
var made = parser.TryMakeMailParameters(out parameters);
501+
var made = parser.TryMakeMailParameters(out var parameters);
520502

521503
// assert
522504
Assert.True(made);
523505
Assert.Equal(4, parameters.Count);
524506
Assert.True(parameters.ContainsKey("SIZE"));
525-
Assert.Equal(parameters["SIZE"], "123");
507+
Assert.Equal("123", parameters["SIZE"]);
526508
Assert.True(parameters.ContainsKey("ABC"));
527-
Assert.Equal(parameters["ABC"], "DEF");
509+
Assert.Equal("DEF", parameters["ABC"]);
528510
Assert.True(parameters.ContainsKey("ZZZ"));
529-
Assert.Equal(parameters["ZZZ"], "123");
511+
Assert.Equal("123", parameters["ZZZ"]);
530512
Assert.True(parameters.ContainsKey("ABCDE"));
531513
}
532514

‎Src/SmtpServer/ISessionContext.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Net;
43
using SmtpServer.IO;
54

65
namespace SmtpServer

0 commit comments

Comments
 (0)