Skip to content

Commit d04826c

Browse files
scottschluerscottschluer
committed
Fixed tab/space issues
1 parent 2e3595b commit d04826c

File tree

7 files changed

+105
-105
lines changed

7 files changed

+105
-105
lines changed

‎RestSharp.IntegrationTests/AsyncTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class AsyncTests
1313
[Fact]
1414
public void Can_Perform_GET_Async()
1515
{
16-
Uri baseUrl = new Uri("http://localhost:8080/");
16+
Uri baseUrl = new Uri("http://localhost:8080/");
1717
const string val = "Basic async test";
1818
var resetEvent = new ManualResetEvent(false);
1919
using (SimpleServer.Create(baseUrl.AbsoluteUri, Handlers.EchoValue(val)))
@@ -34,7 +34,7 @@ public void Can_Perform_GET_Async()
3434
[Fact]
3535
public void Can_Perform_GET_Async_Without_Async_Handle()
3636
{
37-
Uri baseUrl = new Uri("http://localhost:8080/");
37+
Uri baseUrl = new Uri("http://localhost:8080/");
3838
const string val = "Basic async test";
3939
var resetEvent = new ManualResetEvent(false);
4040
using (SimpleServer.Create(baseUrl.AbsoluteUri, Handlers.EchoValue(val)))

‎RestSharp.IntegrationTests/AuthenticationTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class AuthenticationTests
1414
[Fact]
1515
public void Can_Authenticate_With_Basic_Http_Auth()
1616
{
17-
Uri baseUrl = new Uri("http://localhost:8080/");
17+
Uri baseUrl = new Uri("http://localhost:8080/");
1818
using(SimpleServer.Create(baseUrl.AbsoluteUri, UsernamePasswordEchoHandler))
1919
{
2020
var client = new RestClient(baseUrl);

‎RestSharp.IntegrationTests/CompressionTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class CompressionTests
1111
[Fact]
1212
public void Can_Handle_Gzip_Compressed_Content()
1313
{
14-
Uri baseUrl = new Uri("http://localhost:8080/");
14+
Uri baseUrl = new Uri("http://localhost:8080/");
1515
using(SimpleServer.Create(baseUrl.AbsoluteUri, GzipEchoValue("This is some gzipped content")))
1616
{
1717
var client = new RestClient(baseUrl);
@@ -25,7 +25,7 @@ public void Can_Handle_Gzip_Compressed_Content()
2525
[Fact]
2626
public void Can_Handle_Deflate_Compressed_Content()
2727
{
28-
Uri baseUrl = new Uri("http://localhost:8080/");
28+
Uri baseUrl = new Uri("http://localhost:8080/");
2929
using(SimpleServer.Create(baseUrl.AbsoluteUri, DeflateEchoValue("This is some deflated content")))
3030
{
3131
var client = new RestClient(baseUrl);
@@ -39,7 +39,7 @@ public void Can_Handle_Deflate_Compressed_Content()
3939
[Fact]
4040
public void Can_Handle_Uncompressed_Content()
4141
{
42-
Uri baseUrl = new Uri("http://localhost:8080/");
42+
Uri baseUrl = new Uri("http://localhost:8080/");
4343
using(SimpleServer.Create(baseUrl.AbsoluteUri, Handlers.EchoValue("This is some sample content")))
4444
{
4545
var client = new RestClient(baseUrl);

‎RestSharp.IntegrationTests/FileTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class FileTests
1010
[Fact]
1111
public void Handles_Binary_File_Download()
1212
{
13-
Uri baseUrl = new Uri("http://localhost:8080/");
13+
Uri baseUrl = new Uri("http://localhost:8080/");
1414
using(SimpleServer.Create(baseUrl.AbsoluteUri, Handlers.FileHandler))
1515
{
1616
var client = new RestClient(baseUrl);

‎RestSharp.IntegrationTests/StatusCodeTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void Handles_Different_Root_Element_On_Error()
6767
[Fact]
6868
public void Handles_Default_Root_Element_On_No_Error()
6969
{
70-
Uri baseUrl = new Uri("http://localhost:8080/");
70+
Uri baseUrl = new Uri("http://localhost:8080/");
7171
using(SimpleServer.Create(baseUrl.AbsoluteUri, Handlers.Generic<ResponseHandler>()))
7272
{
7373
var client = new RestClient(baseUrl);

‎RestSharp.Tests/UrlBuilderTests.cs‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void GET_with_leading_slash()
2727
public void POST_with_leading_slash()
2828
{
2929
var request = new RestRequest("/resource", Method.POST);
30-
var client = new RestClient(new Uri("http://example.com"));
30+
var client = new RestClient(new Uri("http://example.com"));
3131

3232
var expected = new Uri("http://example.com/resource");
3333
var output = client.BuildUri(request);
@@ -40,7 +40,7 @@ public void GET_with_leading_slash_and_baseurl_trailing_slash()
4040
{
4141
var request = new RestRequest("/resource");
4242
request.AddParameter("foo", "bar");
43-
var client = new RestClient(new Uri("http://example.com"));
43+
var client = new RestClient(new Uri("http://example.com"));
4444

4545
var expected = new Uri("http://example.com/resource?foo=bar");
4646
var output = client.BuildUri(request);
@@ -52,7 +52,7 @@ public void GET_with_leading_slash_and_baseurl_trailing_slash()
5252
public void POST_with_leading_slash_and_baseurl_trailing_slash()
5353
{
5454
var request = new RestRequest("/resource", Method.POST);
55-
var client = new RestClient(new Uri("http://example.com"));
55+
var client = new RestClient(new Uri("http://example.com"));
5656

5757
var expected = new Uri("http://example.com/resource");
5858
var output = client.BuildUri(request);
@@ -64,7 +64,7 @@ public void POST_with_leading_slash_and_baseurl_trailing_slash()
6464
public void GET_with_resource_containing_slashes()
6565
{
6666
var request = new RestRequest("resource/foo");
67-
var client = new RestClient(new Uri("http://example.com"));
67+
var client = new RestClient(new Uri("http://example.com"));
6868

6969
var expected = new Uri("http://example.com/resource/foo");
7070
var output = client.BuildUri(request);
@@ -89,7 +89,7 @@ public void GET_with_resource_containing_tokens()
8989
{
9090
var request = new RestRequest("resource/{foo}");
9191
request.AddUrlSegment("foo", "bar");
92-
var client = new RestClient(new Uri("http://example.com"));
92+
var client = new RestClient(new Uri("http://example.com"));
9393

9494
var expected = new Uri("http://example.com/resource/bar");
9595
var output = client.BuildUri(request);
@@ -102,7 +102,7 @@ public void POST_with_resource_containing_tokens()
102102
{
103103
var request = new RestRequest("resource/{foo}", Method.POST);
104104
request.AddUrlSegment("foo", "bar");
105-
var client = new RestClient(new Uri("http://example.com"));
105+
var client = new RestClient(new Uri("http://example.com"));
106106

107107
var expected = new Uri("http://example.com/resource/bar");
108108
var output = client.BuildUri(request);
@@ -114,7 +114,7 @@ public void POST_with_resource_containing_tokens()
114114
public void GET_with_empty_request()
115115
{
116116
var request = new RestRequest();
117-
var client = new RestClient(new Uri("http://example.com"));
117+
var client = new RestClient(new Uri("http://example.com"));
118118

119119
var expected = new Uri("http://example.com/");
120120
var output = client.BuildUri(request);
@@ -126,75 +126,75 @@ public void GET_with_empty_request()
126126
public void GET_with_empty_request_and_bare_hostname()
127127
{
128128
var request = new RestRequest();
129-
var client = new RestClient(new Uri("http://example.com"));
129+
var client = new RestClient(new Uri("http://example.com"));
130130

131131
var expected = new Uri("http://example.com/");
132132
var output = client.BuildUri(request);
133133

134134
Assert.Equal(expected, output);
135135
}
136136

137-
[Fact]
138-
public void GET_with_Uri_containing_tokens()
139-
{
140-
var request = new RestRequest();
141-
request.AddUrlSegment("foo", "bar");
142-
var client = new RestClient(new Uri("http://example.com/{foo}"));
143-
144-
var expected = new Uri("http://example.com/bar");
145-
var output = client.BuildUri(request);
146-
147-
Assert.Equal(expected, output);
148-
}
149-
150-
[Fact]
151-
public void GET_with_Url_string_containing_tokens()
152-
{
153-
var request = new RestRequest();
154-
request.AddUrlSegment("foo", "bar");
155-
var client = new RestClient("http://example.com/{foo}");
156-
157-
var expected = new Uri("http://example.com/bar");
158-
var output = client.BuildUri(request);
159-
160-
Assert.Equal(expected, output);
161-
}
162-
163-
[Fact]
164-
public void GET_with_Uri_and_resource_containing_tokens()
165-
{
166-
var request = new RestRequest("resource/{baz}");
167-
request.AddUrlSegment("foo", "bar");
168-
request.AddUrlSegment("baz", "bat");
169-
var client = new RestClient(new Uri("http://example.com/{foo}"));
170-
171-
var expected = new Uri("http://example.com/bar/resource/bat");
172-
var output = client.BuildUri(request);
173-
174-
Assert.Equal(expected, output);
175-
}
176-
177-
[Fact]
178-
public void GET_with_Url_string_and_resource_containing_tokens()
179-
{
180-
var request = new RestRequest("resource/{baz}");
181-
request.AddUrlSegment("foo", "bar");
182-
request.AddUrlSegment("baz", "bat");
183-
var client = new RestClient("http://example.com/{foo}");
184-
185-
var expected = new Uri("http://example.com/bar/resource/bat");
186-
var output = client.BuildUri(request);
187-
188-
Assert.Equal(expected, output);
189-
}
190-
191-
[Fact]
192-
public void GET_with_Invalid_Url_string_throws_exception()
193-
{
194-
Assert.Throws<UriFormatException>(delegate
195-
{
196-
var client = new RestClient("invalid url");
197-
});
198-
}
137+
[Fact]
138+
public void GET_with_Uri_containing_tokens()
139+
{
140+
var request = new RestRequest();
141+
request.AddUrlSegment("foo", "bar");
142+
var client = new RestClient(new Uri("http://example.com/{foo}"));
143+
144+
var expected = new Uri("http://example.com/bar");
145+
var output = client.BuildUri(request);
146+
147+
Assert.Equal(expected, output);
148+
}
149+
150+
[Fact]
151+
public void GET_with_Url_string_containing_tokens()
152+
{
153+
var request = new RestRequest();
154+
request.AddUrlSegment("foo", "bar");
155+
var client = new RestClient("http://example.com/{foo}");
156+
157+
var expected = new Uri("http://example.com/bar");
158+
var output = client.BuildUri(request);
159+
160+
Assert.Equal(expected, output);
161+
}
162+
163+
[Fact]
164+
public void GET_with_Uri_and_resource_containing_tokens()
165+
{
166+
var request = new RestRequest("resource/{baz}");
167+
request.AddUrlSegment("foo", "bar");
168+
request.AddUrlSegment("baz", "bat");
169+
var client = new RestClient(new Uri("http://example.com/{foo}"));
170+
171+
var expected = new Uri("http://example.com/bar/resource/bat");
172+
var output = client.BuildUri(request);
173+
174+
Assert.Equal(expected, output);
175+
}
176+
177+
[Fact]
178+
public void GET_with_Url_string_and_resource_containing_tokens()
179+
{
180+
var request = new RestRequest("resource/{baz}");
181+
request.AddUrlSegment("foo", "bar");
182+
request.AddUrlSegment("baz", "bat");
183+
var client = new RestClient("http://example.com/{foo}");
184+
185+
var expected = new Uri("http://example.com/bar/resource/bat");
186+
var output = client.BuildUri(request);
187+
188+
Assert.Equal(expected, output);
189+
}
190+
191+
[Fact]
192+
public void GET_with_Invalid_Url_string_throws_exception()
193+
{
194+
Assert.Throws<UriFormatException>(delegate
195+
{
196+
var client = new RestClient("invalid url");
197+
});
198+
}
199199
}
200200
}

‎RestSharp/RestClient.cs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,17 @@ public RestClient(Uri baseUrl) : this()
6969
BaseUrl = baseUrl;
7070
}
7171

72-
/// <summary>
73-
/// Sets the BaseUrl property for requests made by this client instance
74-
/// </summary>
75-
/// <param name="baseUrl"></param>
76-
public RestClient(string baseUrl) : this()
77-
{
78-
if (String.IsNullOrEmpty(baseUrl))
79-
throw new ArgumentNullException("baseUrl");
80-
81-
BaseUrl = new Uri(baseUrl);
82-
}
72+
/// <summary>
73+
/// Sets the BaseUrl property for requests made by this client instance
74+
/// </summary>
75+
/// <param name="baseUrl"></param>
76+
public RestClient(string baseUrl) : this()
77+
{
78+
if (String.IsNullOrEmpty(baseUrl))
79+
throw new ArgumentNullException("baseUrl");
80+
81+
BaseUrl = new Uri(baseUrl);
82+
}
8383

8484
private IDictionary<string, IDeserializer> ContentHandlers { get; set; }
8585
private IList<string> AcceptTypes { get; set; }
@@ -193,16 +193,16 @@ IDeserializer GetHandler(string contentType)
193193
/// </summary>
194194
public IAuthenticator Authenticator { get; set; }
195195

196-
/// <summary>
197-
/// Combined with Request.Resource to construct URL for request
198-
/// Should include scheme and domain without trailing slash.
199-
/// </summary>
200-
/// <example>
201-
/// client.BaseUrl = new Uri("http://example.com");
202-
/// </example>
203-
public virtual Uri BaseUrl { get; set; }
196+
/// <summary>
197+
/// Combined with Request.Resource to construct URL for request
198+
/// Should include scheme and domain without trailing slash.
199+
/// </summary>
200+
/// <example>
201+
/// client.BaseUrl = new Uri("http://example.com");
202+
/// </example>
203+
public virtual Uri BaseUrl { get; set; }
204204

205-
private void AuthenticateIfNeeded(RestClient client, IRestRequest request)
205+
private void AuthenticateIfNeeded(RestClient client, IRestRequest request)
206206
{
207207
if (Authenticator != null)
208208
{
@@ -220,17 +220,17 @@ public Uri BuildUri(IRestRequest request)
220220
var assembled = request.Resource;
221221
var urlParms = request.Parameters.Where(p => p.Type == ParameterType.UrlSegment);
222222

223-
var builder = new UriBuilder(BaseUrl);
224-
223+
var builder = new UriBuilder(BaseUrl);
224+
225225
foreach (var p in urlParms)
226226
{
227-
if (!String.IsNullOrEmpty(assembled))
228-
assembled = assembled.Replace("{" + p.Name + "}", p.Value.ToString().UrlEncode());
227+
if (!String.IsNullOrEmpty(assembled))
228+
assembled = assembled.Replace("{" + p.Name + "}", p.Value.ToString().UrlEncode());
229229

230-
builder.Path = builder.Path.UrlDecode().Replace("{" + p.Name + "}", p.Value.ToString().UrlEncode());
230+
builder.Path = builder.Path.UrlDecode().Replace("{" + p.Name + "}", p.Value.ToString().UrlEncode());
231231
}
232232

233-
this.BaseUrl = new Uri(builder.ToString());
233+
this.BaseUrl = new Uri(builder.ToString());
234234

235235
if (!string.IsNullOrEmpty(assembled) && assembled.StartsWith("/"))
236236
{
@@ -239,7 +239,7 @@ public Uri BuildUri(IRestRequest request)
239239

240240
if (BaseUrl != null && !String.IsNullOrEmpty(BaseUrl.AbsoluteUri))
241241
{
242-
if (!BaseUrl.AbsoluteUri.EndsWith("/") && !string.IsNullOrEmpty(assembled)) assembled = String.Concat("/", assembled);
242+
if (!BaseUrl.AbsoluteUri.EndsWith("/") && !string.IsNullOrEmpty(assembled)) assembled = String.Concat("/", assembled);
243243
assembled = string.IsNullOrEmpty(assembled) ? BaseUrl.AbsoluteUri : string.Format("{0}{1}", BaseUrl, assembled);
244244
}
245245

0 commit comments

Comments
 (0)