Shift some UID # responses to the end so that we get test coverage fo…

…r SetUniqueId()

UnitTests/Net/Imap/ImapClientTests.cs

@@ -4116,8 +4116,8 @@ static List<ImapReplayCommand> CreateDovecotCommands (out List<DateTimeOffset> i
 			commands.Add (new ImapReplayCommand ("A00000050 FETCH 2 (BODY.PEEK[1.MIME])\r\n", "dovecot.getbodypartheaders.txt"));
 			commands.Add (new ImapReplayCommand ("A00000051 UID FETCH 1 (BODY.PEEK[]<128.64>)\r\n", "dovecot.getstream.txt"));
 			commands.Add (new ImapReplayCommand ("A00000052 UID FETCH 1 (BODY.PEEK[]<128.64>)\r\n", "dovecot.getstream2.txt"));
-			commands.Add (new ImapReplayCommand ("A00000053 FETCH 1 (BODY.PEEK[]<128.64>)\r\n", "dovecot.getstream3.txt"));
-			commands.Add (new ImapReplayCommand ("A00000054 FETCH 1 (BODY.PEEK[]<128.64>)\r\n", "dovecot.getstream4.txt"));
+			commands.Add (new ImapReplayCommand ("A00000053 FETCH 1 (BODY.PEEK[]<128.64>)\r\n", "dovecot.getstream.txt"));
+			commands.Add (new ImapReplayCommand ("A00000054 FETCH 1 (BODY.PEEK[]<128.64>)\r\n", "dovecot.getstream2.txt"));
 			commands.Add (new ImapReplayCommand ("A00000055 UID FETCH 1 (BODY.PEEK[HEADER.FIELDS (MIME-VERSION CONTENT-TYPE)])\r\n", "dovecot.getstream-section.txt"));
 			commands.Add (new ImapReplayCommand ("A00000056 FETCH 1 (BODY.PEEK[HEADER.FIELDS (MIME-VERSION CONTENT-TYPE)])\r\n", "dovecot.getstream-section2.txt"));
 			commands.Add (new ImapReplayCommand ("A00000057 UID STORE 1:14 (UNCHANGEDSINCE 3) +FLAGS.SILENT (\\Deleted $MailKit)\r\n", "dovecot.store-deleted-custom.txt"));
@@ -4130,8 +4130,8 @@ static List<ImapReplayCommand> CreateDovecotCommands (out List<DateTimeOffset> i
 			commands.Add (new ImapReplayCommand ("A00000064 UID SEARCH ALL\r\n", "dovecot.search-raw.txt"));
 			commands.Add (new ImapReplayCommand ("A00000065 UID SORT (REVERSE ARRIVAL) US-ASCII ALL\r\n", "dovecot.sort-raw.txt"));
 			commands.Add (new ImapReplayCommand ("A00000066 UID FETCH 1:* (BODY.PEEK[])\r\n", "dovecot.getstreams1.txt"));
-			commands.Add (new ImapReplayCommand ("A00000067 FETCH 1:3 (UID BODY.PEEK[])\r\n", "dovecot.getstreams2.txt"));
-			commands.Add (new ImapReplayCommand ("A00000068 FETCH 1:* (UID BODY.PEEK[])\r\n", "dovecot.getstreams3.txt"));
+			commands.Add (new ImapReplayCommand ("A00000067 FETCH 1:3 (UID BODY.PEEK[])\r\n", "dovecot.getstreams1.txt"));
+			commands.Add (new ImapReplayCommand ("A00000068 FETCH 1:* (UID BODY.PEEK[])\r\n", "dovecot.getstreams2.txt"));
 			commands.Add (new ImapReplayCommand ("A00000069 EXPUNGE\r\n", "dovecot.expunge.txt"));
 			commands.Add (new ImapReplayCommand ("A00000070 CLOSE\r\n", ImapReplayCommandResponse.OK));
 			commands.Add (new ImapReplayCommand ("A00000071 NOOP\r\n", "dovecot.noop+alert.txt"));

UnitTests/Net/Imap/Resources/dovecot/getbodypartheaders.txt

@@ -1,5 +1,5 @@
-* 2 FETCH (UID 2 BODY[1.MIME] {43}
+* 2 FETCH (BODY[1.MIME] {43}
 Content-Type: text/plain; charset=utf-8
 
- )
+ UID 2)
 A######## OK Fetch completed (0.002 + 0.000 secs).

UnitTests/Net/Imap/Resources/dovecot/getmessageheaders.txt

@@ -1,4 +1,4 @@
-* 1 FETCH (UID 1 BODY[HEADER] {226}
+* 1 FETCH (BODY[HEADER] {226}
 From: Unit Tests <unit-tests@mimekit.net>
 Date: Sun, 02 Oct 2016 17:56:45 -0400
 Subject: A
@@ -7,5 +7,5 @@ To: Unit Tests <unit-tests@mimekit.net>
 MIME-Version: 1.0
 Content-Type: text/plain; charset=utf-8
 
- )
+ UID 1)
 A######## OK Fetch completed (0.002 + 0.000 secs).

UnitTests/Net/Imap/Resources/dovecot/getstream2.txt

@@ -1,5 +1,5 @@
-* 1 FETCH (UID 1 BODY[]<128> {64}
+* 1 FETCH (BODY[]<128> {64}
 nit Tests <unit-tests@mimekit.net>
 MIME-Version: 1.0
-Content-T)
+Content-T UID 1)
 A######## OK Fetch completed (0.002 + 0.000 secs).

UnitTests/Net/Imap/Resources/dovecot/getstreams2.txt

@@ -1,7 +1,7 @@
-* 1 FETCH (UID 1 BODY[] {68}
-This is some dummy text just to make sure this is working correctly.)
-* 2 FETCH (UID 2 BODY[] {68}
-This is some dummy text just to make sure this is working correctly.)
-* 3 FETCH (UID 3 BODY[] {68}
-This is some dummy text just to make sure this is working correctly.)
+* 1 FETCH (BODY[] {68}
+This is some dummy text just to make sure this is working correctly. UID 1)
+* 2 FETCH (BODY[] {68}
+This is some dummy text just to make sure this is working correctly. UID 2)
+* 3 FETCH (BODY[] {68}
+This is some dummy text just to make sure this is working correctly. UID 3)
 A######## OK Fetch completed (0.002 + 0.000 secs).