Skip to content

Commit ed5893e

Browse files
author
Michael Hallett
committed
more code cleanup; removed var key word in favor of type names; fixed usings so they are surrounded by the appropriate ifdefs;
1 parent 2a239b0 commit ed5893e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1858
-1974
lines changed

‎RestSharp.IntegrationTests/AsyncRequestBodyTests.cs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ public void Can_Not_Be_Added_To_GET_Request()
1818

1919
using (SimpleServer.Create(BASE_URL, Handlers.Generic<RequestBodyCapturer>()))
2020
{
21-
var client = new RestClient(BASE_URL);
22-
var request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
21+
RestClient client = new RestClient(BASE_URL);
22+
RestRequest request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
2323

2424
const string contentType = "text/plain";
2525
const string bodyData = "abc123 foo bar baz BING!";
2626

2727
request.AddParameter(contentType, bodyData, ParameterType.RequestBody);
2828

29-
var resetEvent = new ManualResetEvent(false);
29+
ManualResetEvent resetEvent = new ManualResetEvent(false);
3030

3131
client.ExecuteAsync(request, response => resetEvent.Set());
3232
resetEvent.WaitOne();
@@ -42,9 +42,9 @@ public void Can_Have_No_Body_Added_To_POST_Request()
4242

4343
using (SimpleServer.Create(BASE_URL, Handlers.Generic<RequestBodyCapturer>()))
4444
{
45-
var client = new RestClient(BASE_URL);
46-
var request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
47-
var resetEvent = new ManualResetEvent(false);
45+
RestClient client = new RestClient(BASE_URL);
46+
RestRequest request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
47+
ManualResetEvent resetEvent = new ManualResetEvent(false);
4848

4949
client.ExecuteAsync(request, response => resetEvent.Set());
5050
resetEvent.WaitOne();
@@ -60,15 +60,15 @@ public void Can_Be_Added_To_POST_Request()
6060

6161
using (SimpleServer.Create(BASE_URL, Handlers.Generic<RequestBodyCapturer>()))
6262
{
63-
var client = new RestClient(BASE_URL);
64-
var request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
63+
RestClient client = new RestClient(BASE_URL);
64+
RestRequest request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
6565

6666
const string contentType = "text/plain";
6767
const string bodyData = "abc123 foo bar baz BING!";
6868

6969
request.AddParameter(contentType, bodyData, ParameterType.RequestBody);
7070

71-
var resetEvent = new ManualResetEvent(false);
71+
ManualResetEvent resetEvent = new ManualResetEvent(false);
7272

7373
client.ExecuteAsync(request, response => resetEvent.Set());
7474
resetEvent.WaitOne();
@@ -84,15 +84,15 @@ public void Can_Be_Added_To_PUT_Request()
8484

8585
using (SimpleServer.Create(BASE_URL, Handlers.Generic<RequestBodyCapturer>()))
8686
{
87-
var client = new RestClient(BASE_URL);
88-
var request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
87+
RestClient client = new RestClient(BASE_URL);
88+
RestRequest request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
8989

9090
const string contentType = "text/plain";
9191
const string bodyData = "abc123 foo bar baz BING!";
9292

9393
request.AddParameter(contentType, bodyData, ParameterType.RequestBody);
9494

95-
var resetEvent = new ManualResetEvent(false);
95+
ManualResetEvent resetEvent = new ManualResetEvent(false);
9696

9797
client.ExecuteAsync(request, response => resetEvent.Set());
9898
resetEvent.WaitOne();
@@ -108,15 +108,15 @@ public void Can_Be_Added_To_DELETE_Request()
108108

109109
using (SimpleServer.Create(BASE_URL, Handlers.Generic<RequestBodyCapturer>()))
110110
{
111-
var client = new RestClient(BASE_URL);
112-
var request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
111+
RestClient client = new RestClient(BASE_URL);
112+
RestRequest request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
113113

114114
const string contentType = "text/plain";
115115
const string bodyData = "abc123 foo bar baz BING!";
116116

117117
request.AddParameter(contentType, bodyData, ParameterType.RequestBody);
118118

119-
var resetEvent = new ManualResetEvent(false);
119+
ManualResetEvent resetEvent = new ManualResetEvent(false);
120120

121121
client.ExecuteAsync(request, response => resetEvent.Set());
122122
resetEvent.WaitOne();
@@ -132,15 +132,15 @@ public void Can_Not_Be_Added_To_HEAD_Request()
132132

133133
using (SimpleServer.Create(BASE_URL, Handlers.Generic<RequestBodyCapturer>()))
134134
{
135-
var client = new RestClient(BASE_URL);
136-
var request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
135+
RestClient client = new RestClient(BASE_URL);
136+
RestRequest request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
137137

138138
const string contentType = "text/plain";
139139
const string bodyData = "abc123 foo bar baz BING!";
140140

141141
request.AddParameter(contentType, bodyData, ParameterType.RequestBody);
142142

143-
var resetEvent = new ManualResetEvent(false);
143+
ManualResetEvent resetEvent = new ManualResetEvent(false);
144144

145145
client.ExecuteAsync(request, response => resetEvent.Set());
146146
resetEvent.WaitOne();
@@ -156,15 +156,15 @@ public void Can_Be_Added_To_OPTIONS_Request()
156156

157157
using (SimpleServer.Create(BASE_URL, Handlers.Generic<RequestBodyCapturer>()))
158158
{
159-
var client = new RestClient(BASE_URL);
160-
var request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
159+
RestClient client = new RestClient(BASE_URL);
160+
RestRequest request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
161161

162162
const string contentType = "text/plain";
163163
const string bodyData = "abc123 foo bar baz BING!";
164164

165165
request.AddParameter(contentType, bodyData, ParameterType.RequestBody);
166166

167-
var resetEvent = new ManualResetEvent(false);
167+
ManualResetEvent resetEvent = new ManualResetEvent(false);
168168

169169
client.ExecuteAsync(request, response => resetEvent.Set());
170170
resetEvent.WaitOne();
@@ -180,15 +180,15 @@ public void Can_Be_Added_To_PATCH_Request()
180180

181181
using (SimpleServer.Create(BASE_URL, Handlers.Generic<RequestBodyCapturer>()))
182182
{
183-
var client = new RestClient(BASE_URL);
184-
var request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
183+
RestClient client = new RestClient(BASE_URL);
184+
RestRequest request = new RestRequest(RequestBodyCapturer.RESOURCE, httpMethod);
185185

186186
const string contentType = "text/plain";
187187
const string bodyData = "abc123 foo bar baz BING!";
188188

189189
request.AddParameter(contentType, bodyData, ParameterType.RequestBody);
190190

191-
var resetEvent = new ManualResetEvent(false);
191+
ManualResetEvent resetEvent = new ManualResetEvent(false);
192192

193193
client.ExecuteAsync(request, response => resetEvent.Set());
194194
resetEvent.WaitOne();
@@ -223,7 +223,7 @@ private class RequestBodyCapturer
223223

224224
public static void Capture(HttpListenerContext context)
225225
{
226-
var request = context.Request;
226+
HttpListenerRequest request = context.Request;
227227

228228
CapturedContentType = request.ContentType;
229229
CapturedHasEntityBody = request.HasEntityBody;
@@ -232,7 +232,7 @@ public static void Capture(HttpListenerContext context)
232232

233233
private static string StreamToString(Stream stream)
234234
{
235-
var streamReader = new StreamReader(stream);
235+
StreamReader streamReader = new StreamReader(stream);
236236
return streamReader.ReadToEnd();
237237
}
238238
}

‎RestSharp.IntegrationTests/AsyncTests.cs‎

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Linq;
33
using System.Net;
44
using System.Threading;
5+
using System.Threading.Tasks;
56
using NUnit.Framework;
67
using RestSharp.IntegrationTests.Helpers;
78

@@ -16,12 +17,12 @@ public void Can_Perform_GET_Async()
1617
Uri baseUrl = new Uri("http://localhost:8888/");
1718
const string val = "Basic async test";
1819

19-
var resetEvent = new ManualResetEvent(false);
20+
ManualResetEvent resetEvent = new ManualResetEvent(false);
2021

2122
using (SimpleServer.Create(baseUrl.AbsoluteUri, Handlers.EchoValue(val)))
2223
{
23-
var client = new RestClient(baseUrl);
24-
var request = new RestRequest("");
24+
RestClient client = new RestClient(baseUrl);
25+
RestRequest request = new RestRequest("");
2526

2627
client.ExecuteAsync(request, (response, asyncHandle) =>
2728
{
@@ -40,12 +41,12 @@ public void Can_Perform_GET_Async_Without_Async_Handle()
4041
Uri baseUrl = new Uri("http://localhost:8888/");
4142
const string val = "Basic async test";
4243

43-
var resetEvent = new ManualResetEvent(false);
44+
ManualResetEvent resetEvent = new ManualResetEvent(false);
4445

4546
using (SimpleServer.Create(baseUrl.AbsoluteUri, Handlers.EchoValue(val)))
4647
{
47-
var client = new RestClient(baseUrl);
48-
var request = new RestRequest("");
48+
RestClient client = new RestClient(baseUrl);
49+
RestRequest request = new RestRequest("");
4950

5051
client.ExecuteAsync(request, response =>
5152
{
@@ -66,9 +67,9 @@ public void Can_Perform_GET_TaskAsync()
6667

6768
using (SimpleServer.Create(baseUrl, Handlers.EchoValue(val)))
6869
{
69-
var client = new RestClient(baseUrl);
70-
var request = new RestRequest("");
71-
var task = client.ExecuteTaskAsync(request);
70+
RestClient client = new RestClient(baseUrl);
71+
RestRequest request = new RestRequest("");
72+
Task<IRestResponse> task = client.ExecuteTaskAsync(request);
7273

7374
task.Wait();
7475

@@ -85,16 +86,16 @@ public void Can_Handle_Exception_Thrown_By_OnBeforeDeserialization_Handler()
8586

8687
using (SimpleServer.Create(baseUrl, Handlers.Generic<ResponseHandler>()))
8788
{
88-
var client = new RestClient(baseUrl);
89-
var request = new RestRequest("success");
89+
RestClient client = new RestClient(baseUrl);
90+
RestRequest request = new RestRequest("success");
9091

9192
request.OnBeforeDeserialization += r => { throw new Exception(exceptionMessage); };
9293

93-
var task = client.ExecuteTaskAsync<Response>(request);
94+
Task<IRestResponse<Response>> task = client.ExecuteTaskAsync<Response>(request);
9495

9596
task.Wait();
9697

97-
var response = task.Result;
98+
IRestResponse<Response> response = task.Result;
9899

99100
Assert.AreEqual(exceptionMessage, response.ErrorMessage);
100101
Assert.AreEqual(ResponseStatus.Error, response.ResponseStatus);
@@ -108,9 +109,9 @@ public void Can_Perform_ExecuteGetTaskAsync_With_Response_Type()
108109

109110
using (SimpleServer.Create(baseUrl, Handlers.Generic<ResponseHandler>()))
110111
{
111-
var client = new RestClient(baseUrl);
112-
var request = new RestRequest("success");
113-
var task = client.ExecuteTaskAsync<Response>(request);
112+
RestClient client = new RestClient(baseUrl);
113+
RestRequest request = new RestRequest("success");
114+
Task<IRestResponse<Response>> task = client.ExecuteTaskAsync<Response>(request);
114115

115116
task.Wait();
116117

@@ -125,9 +126,9 @@ public void Can_Perform_GetTaskAsync_With_Response_Type()
125126

126127
using (SimpleServer.Create(baseUrl, Handlers.Generic<ResponseHandler>()))
127128
{
128-
var client = new RestClient(baseUrl);
129-
var request = new RestRequest("success");
130-
var task = client.GetTaskAsync<Response>(request);
129+
RestClient client = new RestClient(baseUrl);
130+
RestRequest request = new RestRequest("success");
131+
Task<Response> task = client.GetTaskAsync<Response>(request);
131132

132133
task.Wait();
133134

@@ -143,10 +144,10 @@ public void Can_Cancel_GET_TaskAsync()
143144

144145
using (SimpleServer.Create(baseUrl, Handlers.EchoValue(val)))
145146
{
146-
var client = new RestClient(baseUrl);
147-
var request = new RestRequest("timeout");
148-
var cancellationTokenSource = new CancellationTokenSource();
149-
var task = client.ExecuteTaskAsync(request, cancellationTokenSource.Token);
147+
RestClient client = new RestClient(baseUrl);
148+
RestRequest request = new RestRequest("timeout");
149+
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
150+
Task<IRestResponse> task = client.ExecuteTaskAsync(request, cancellationTokenSource.Token);
150151

151152
cancellationTokenSource.Cancel();
152153

@@ -162,10 +163,10 @@ public void Can_Cancel_GET_TaskAsync_With_Response_Type()
162163

163164
using (SimpleServer.Create(baseUrl, Handlers.EchoValue(val)))
164165
{
165-
var client = new RestClient(baseUrl);
166-
var request = new RestRequest("timeout");
167-
var cancellationTokenSource = new CancellationTokenSource();
168-
var task = client.ExecuteTaskAsync<Response>(request, cancellationTokenSource.Token);
166+
RestClient client = new RestClient(baseUrl);
167+
RestRequest request = new RestRequest("timeout");
168+
CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
169+
Task<IRestResponse<Response>> task = client.ExecuteTaskAsync<Response>(request, cancellationTokenSource.Token);
169170

170171
cancellationTokenSource.Cancel();
171172

@@ -180,9 +181,9 @@ public void Handles_GET_Request_Errors_TaskAsync()
180181

181182
using (SimpleServer.Create(baseUrl, UrlToStatusCodeHandler))
182183
{
183-
var client = new RestClient(baseUrl);
184-
var request = new RestRequest("404");
185-
var task = client.ExecuteTaskAsync(request);
184+
RestClient client = new RestClient(baseUrl);
185+
RestRequest request = new RestRequest("404");
186+
Task<IRestResponse> task = client.ExecuteTaskAsync(request);
186187

187188
task.Wait();
188189

@@ -197,9 +198,9 @@ public void Handles_GET_Request_Errors_TaskAsync_With_Response_Type()
197198

198199
using (SimpleServer.Create(baseUrl, UrlToStatusCodeHandler))
199200
{
200-
var client = new RestClient(baseUrl);
201-
var request = new RestRequest("404");
202-
var task = client.ExecuteTaskAsync<Response>(request);
201+
RestClient client = new RestClient(baseUrl);
202+
RestRequest request = new RestRequest("404");
203+
Task<IRestResponse<Response>> task = client.ExecuteTaskAsync<Response>(request);
203204

204205
task.Wait();
205206

@@ -214,17 +215,17 @@ public void Can_Timeout_GET_TaskAsync()
214215

215216
using (SimpleServer.Create(baseUrl, Handlers.Generic<ResponseHandler>()))
216217
{
217-
var client = new RestClient(baseUrl);
218-
var request = new RestRequest("timeout", Method.GET).AddBody("Body_Content");
218+
RestClient client = new RestClient(baseUrl);
219+
IRestRequest request = new RestRequest("timeout", Method.GET).AddBody("Body_Content");
219220

220221
// Half the value of ResponseHandler.Timeout
221222
request.Timeout = 500;
222223

223-
var task = client.ExecuteTaskAsync(request);
224+
Task<IRestResponse> task = client.ExecuteTaskAsync(request);
224225

225226
task.Wait();
226227

227-
var response = task.Result;
228+
IRestResponse response = task.Result;
228229

229230
Assert.AreEqual(ResponseStatus.TimedOut, response.ResponseStatus);
230231
}
@@ -237,17 +238,17 @@ public void Can_Timeout_PUT_TaskAsync()
237238

238239
using (SimpleServer.Create(baseUrl, Handlers.Generic<ResponseHandler>()))
239240
{
240-
var client = new RestClient(baseUrl);
241-
var request = new RestRequest("timeout", Method.PUT).AddBody("Body_Content");
241+
RestClient client = new RestClient(baseUrl);
242+
IRestRequest request = new RestRequest("timeout", Method.PUT).AddBody("Body_Content");
242243

243244
// Half the value of ResponseHandler.Timeout
244245
request.Timeout = 500;
245246

246-
var task = client.ExecuteTaskAsync(request);
247+
Task<IRestResponse> task = client.ExecuteTaskAsync(request);
247248

248249
task.Wait();
249250

250-
var response = task.Result;
251+
IRestResponse response = task.Result;
251252

252253
Assert.AreEqual(ResponseStatus.TimedOut, response.ResponseStatus);
253254
}

0 commit comments

Comments
 (0)