Issue 361: MediaDownloader can't download drive export list (which includes query parameters)

Src/GoogleApis.Tests/Apis/Download/MediaDownloaderTest.cs

 /*
 Copyright 2013 Google Inc
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
@@ skipping 111 matching lines @@
 
 /// <summary>Tests that download works in case the server returns a sing
le chunk to the client.</summary>
 [Test]
 public void Download_SingleChunk()
 {
 Subtest_Download_Chunks((int)StreamContent.Length);
 Subtest_Download_Chunks((int)StreamContent.Length 1);
 Subtest_Download_Chunks(100);
 }
 
+
+/// <summary>Tests that download works in case the URI download contains
query parameters.</summary>
+[Test]
+public void Download_SingleChunk_UriContainsQueryParameters()
+{
+Subtest_Download_Chunks((int)StreamContent.Length, true, 0, "https:/
/www.sample.com?a=1&b=2");
+}
+
 /// <summary>
 /// Tests that download asynchronously works in case the server returns
multiple chunks to the client.
 /// </summary>
 [Test]
 public void DownloadAsync_MultipleChunks()
 {
 Subtest_Download_Chunks(2, false);
 Subtest_Download_Chunks((int)StreamContent.Length - 1, false);
 }
 
@@ skipping 16 matching lines @@
 public void DownloadAsync_Cancel()
 {
 Subtest_Download_Chunks(2, false, 3);
 Subtest_Download_Chunks((int)StreamContent.Length - 1, false, 1);
 }
 
 /// <summary>A helper test to test sync and async downloads.</summary>
 /// <param name="chunkSize">The chunk size for each part.</param>
 /// <param name="sync">Indicates if this download should be synchronousl
y or asynchronously.</param>
 /// <param name="cancelRequest">Defines the request index to cancel the
download request.</param>
- private void Subtest_Download_Chunks(int chunkSize, bool sync = true, in
 t cancelRequest = 0)
+ /// <param name="downloadUri"The URI which contains the media to downloa
 d.</param>
+ private void Subtest_Download_Chunks(int chunkSize, bool sync = true, in
 t cancelRequest = 0,
+ string downloadUri = "http://www.sample.com")
 {
 // reset the steam
 StreamContent.Position = 0;
 
-string downloadUri = "http://www.sample.com";
 var handler = new MultipleChunksMessageHandler();
 handler.ChunkSize = chunkSize;
- handler.DownloadUri = new Uri(downloadUri "?alt=media");
+ handler.DownloadUri = new Uri(downloadUri 
+ (downloadUri.Contains("?") ? "&" : "?") "alt=media");
 
 // support cancellation
 if (cancelRequest > 0)
 {
 handler.CancelRequestNum = cancelRequest;
 }
 handler.CancellationTokenSource = new CancellationTokenSource();
 
 int expectedCalls = (int)Math.Ceiling((double)StreamContent.Length /
chunkSize);
 using (var service = new MockClientService(new BaseClientService.Ini
tializer()
@@ skipping 54 matching lines @@
 
 byte[] read = new byte[1000];
 outputStream.Position = 0;
 int length = outputStream.Read(read, 0, 1000);
 Assert.That(Encoding.UTF8.GetString(read, 0, length), Is.Equ
alTo(MediaContent));
 }
 }
 }
 }
 }