Issues 373 (Execute Bug), 374 (Remove Tests.Utility) and 375 (Clean warnings)

Src/GoogleApis.Tests/Apis/Upload/ResumableUploadTest.cs

 /*
 Copyright 2012 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 57 matching lines @@
 /// <summary> Base mock handler which contains the upload Uri. </summary
>
 private abstract class BaseMockMessageHandler : CountableMessageHandler
 {
 /// <summary> The upload Uri for uploading the media. </summary>
 protected static Uri uploadUri = new Uri("http://upload.com");
 }
 
 /// <summary> A handler which handles uploading an empty file. </summary
>
 private class EmptyFileMessageHandler : BaseMockMessageHandler
 {
- protected override async Task<HttpResponseMessage> SendAsyncCore(Htt
 pRequestMessage request,
+ protected override Task<HttpResponseMessage> SendAsyncCore(HttpReque
 stMessage request,
 CancellationToken cancellationToken)
 {
 var response = new HttpResponseMessage();
 switch (Calls)
 {
 case 1:
 // First call is initialization
 Assert.That(request.RequestUri.Query, Is.EqualTo("?uploa
dType=resumable"));
 Assert.That(request.Headers.GetValues("X-Upload-Content-
Type").First(),
 Is.EqualTo("text/plain"));
 Assert.That(request.Headers.GetValues("X-Upload-Content-
Length").First(), Is.EqualTo("0"));
 
 response.Headers.Location = uploadUri;
 break;
 case 2:
 // Receiving an empty stream
 Assert.That(request.RequestUri, Is.EqualTo(uploadUri));
 var range = String.Format("bytes */0");
 Assert.That(request.Content.Headers.GetValues("Content-R
ange").First(), Is.EqualTo(range));
 Assert.That(request.Content.Headers.ContentLength, Is.Eq
ualTo(0));
 break;
 }
 
- return response;
+ TaskCompletionSource<HttpResponseMessage> tcs = new TaskCompleti
 onSource<HttpResponseMessage>();
+ tcs.SetResult(response);
+ return tcs.Task;
 }
 }
 
 /// <summary> A handler which handles a request object on the initializa
tion request. </summary>
 private class RequestResponseMessageHandler<TRequest> : BaseMockMessageH
andler
 {
 /// <summary>·
 /// Gets or sets the expected request object. Server checks that the
initialization request contains that·
 /// object in the request.
 /// </summary>
@@ skipping 52 matching lines @@
 {
 /// <summary> Gets or sets the expected stream length. </summary>
 public long StreamLength { get; set; }
 
 /// <summary> Gets or sets the query parameters which should be part
of the initialize request. </summary>
 public string QueryParameters { get; set; }
 
 /// <summary> Gets or sets the path parameters which should be part
of the initialize request. </summary>
 public string PathParameters { get; set; }
 
- protected override async Task<HttpResponseMessage> SendAsyncCore(Htt
 pRequestMessage request,
+ protected override Task<HttpResponseMessage> SendAsyncCore(HttpReque
 stMessage request,
 CancellationToken cancellationToken)
 {
 var response = new HttpResponseMessage();
 var range = string.Empty;
 switch (Calls)
 {
 case 1:
 if (PathParameters == null)
 {
 Assert.That(request.RequestUri.AbsolutePath, Is.Equa
lTo("/"));
@@ skipping 13 matching lines @@
 break;
 
 case 2:
 Assert.That(request.RequestUri, Is.EqualTo(uploadUri));
 range = String.Format("bytes 0-{0}/{1}", StreamLength -
1, StreamLength);
 Assert.That(request.Content.Headers.GetValues("Content-R
ange").First(), Is.EqualTo(range));
 Assert.That(request.Content.Headers.ContentLength, Is.Eq
ualTo(StreamLength));
 break;
 }
 
- return response;
+ TaskCompletionSource<HttpResponseMessage> tcs = new TaskCompleti
 onSource<HttpResponseMessage>();
+ tcs.SetResult(response);
+ return tcs.Task;
 }
 }
 
 /// <summary>·
 /// A handler which demonstrate a server which reads partial data (e.g.
on the first upload request the client
 /// sends X bytes, but the server actually read only Y of them)
 /// </summary>
 private class ReadPartialMessageHandler : BaseMockMessageHandler
 {
 /// <summary> Received stream which contains the data that the serve
r reads. </summary>
@@ skipping 812 matching lines @@
 var stream = new MemoryStream(Encoding.UTF8.GetBytes(UploadTestD
ata));
 var upload = new MockResumableUploadWithResponse<TestRequest, Te
stResponse>
 (service, stream, "text/plain");
 
 // negative chunk size
 try
 {
 upload.ChunkSize = -1;
 Assert.Fail();
 }
- catch (ArgumentOutOfRangeException ex)
+ catch (ArgumentOutOfRangeException)
 {
 // expected
 }
 
 // less than the minimum
 try
 {
 upload.ChunkSize = MockResumableUpload.MinimumChunkSize - 1;
 Assert.Fail();
 }
- catch (ArgumentOutOfRangeException ex)
+ catch (ArgumentOutOfRangeException)
 {
 // expected
 }
 
 // valid chunk size
 upload.ChunkSize = MockResumableUpload.MinimumChunkSize;
 upload.ChunkSize = MockResumableUpload.MinimumChunkSize * 2;
 }
 }
 }
 }