Skip to content

Commit 31f8508

Browse files
alexeyzimarevalexeyzimarev
committed
Remove usage of BuildUrl
1 parent 1fb6203 commit 31f8508

6 files changed

Lines changed: 20 additions & 19 deletions

File tree

‎src/RestSharp/Authenticators/OAuth/OAuth1Authenticator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ internal static void AddOAuthData(
245245
"Using query parameters in the base URL is not supported for OAuth calls. Consider using AddDefaultQueryParameter instead."
246246
);
247247

248-
var url = client.BuildUri(request).ToString();
248+
var url = client.BuildUriString(request);
249249
var queryStringStart = url.IndexOf('?');
250250

251251
if (queryStringStart != -1) url = url[..queryStringStart];

‎test/RestSharp.InteractiveTests/AuthenticationTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ public static async Task Can_Authenticate_With_OAuth_Async_With_Callback(Twitter
3939

4040
request = new($"oauth/authorize?oauth_token={oauthToken}");
4141

42-
var url = client.BuildUri(request)
43-
.ToString();
42+
var url = client.BuildUriString(request);
4443

4544
Console.WriteLine($"Open this URL in the browser: {url} and complete the authentication.");
4645
Console.Write("Enter the verifier: ");

‎test/RestSharp.Tests/Auth/OAuth1SignatureTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void Generates_correct_signature_base() {
3737
var requestParameters = _request.Parameters.ToWebParameters().ToArray();
3838
var parameters = new WebPairCollection();
3939
parameters.AddRange(requestParameters);
40-
var url = _client.BuildUri(_request).ToString();
40+
var url = _client.BuildUriString(_request);
4141
_workflow.RequestUrl = url;
4242
var oauthParameters = _workflow.BuildProtectedResourceSignature(method, parameters);
4343
oauthParameters.Parameters.AddRange(requestParameters);

‎test/RestSharp.Tests/Auth/OAuth1Tests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public async Task Can_Authenticate_OAuth1_With_Querystring_Parameters() {
4646
authenticator.ParameterHandling = OAuthParameterHandling.UrlOrPostParameters;
4747
await authenticator.Authenticate(client, request);
4848

49-
var requestUri = client.BuildUri(request);
49+
var requestUri = new Uri(client.BuildUriString(request));
5050
var actual = requestUri.ParseQuery().Select(x => x.Key).ToList();
5151

5252
actual.Should().BeEquivalentTo(expected);

‎test/RestSharp.Tests/Parameters/UrlSegmentTests.cs‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
namespace RestSharp.Tests.Parameters;
22

33
public class UrlSegmentTests {
4-
const string BaseUrl = "http://localhost:8888/";
4+
const string BaseUrlNoTrail = "http://localhost:8888";
5+
const string BaseUrl = $"{BaseUrlNoTrail}/";
56

67
[Fact]
78
public void AddUrlSegmentWithInt() {
@@ -22,10 +23,10 @@ public void AddUrlSegmentModifiesUrlSegmentWithInt() {
2223

2324
var path = string.Format(pathTemplate, $"{{{name}}}");
2425
var request = new RestRequest(path).AddUrlSegment(name, urlSegmentValue);
25-
var expected = string.Format(pathTemplate, urlSegmentValue);
26+
var expected = $"{BaseUrlNoTrail}{string.Format(pathTemplate, urlSegmentValue)}";
2627

2728
using var client = new RestClient(BaseUrl);
28-
var actual = client.BuildUri(request).AbsolutePath;
29+
var actual = client.BuildUriString(request);
2930

3031
expected.Should().BeEquivalentTo(actual);
3132
}
@@ -38,11 +39,11 @@ public void AddUrlSegmentModifiesUrlSegmentWithString() {
3839

3940
var path = string.Format(pathTemplate, $"{{{name}}}");
4041
var request = new RestRequest(path).AddUrlSegment(name, urlSegmentValue);
41-
var expected = string.Format(pathTemplate, urlSegmentValue);
42+
var expected = $"{BaseUrlNoTrail}{string.Format(pathTemplate, urlSegmentValue)}";
4243

4344
using var client = new RestClient(BaseUrl);
4445

45-
var actual = client.BuildUri(request).AbsolutePath;
46+
var actual = client.BuildUriString(request);
4647

4748
expected.Should().BeEquivalentTo(actual);
4849
}
@@ -73,14 +74,15 @@ public void UrlSegmentParameter_WithValueWithEncodedSlash_CanLeaveEncodedSlash(s
7374

7475
[Fact]
7576
public void AddSameUrlSegmentTwice_ShouldReplaceFirst() {
76-
var client = new RestClient();
77-
var request = new RestRequest("https://api.example.com/orgs/{segment}/something");
77+
const string host = "https://api.example.com";
78+
var client = new RestClient();
79+
var request = new RestRequest($"{host}/orgs/{{segment}}/something");
7880
request.AddUrlSegment("segment", 1);
79-
var url1 = client.BuildUri(request);
81+
var url1 = client.BuildUriString(request);
8082
request.AddUrlSegment("segment", 2);
81-
var url2 = client.BuildUri(request);
82-
83-
url1.AbsolutePath.Should().Be("/orgs/1/something");
84-
url2.AbsolutePath.Should().Be("/orgs/2/something");
83+
var url2 = client.BuildUriString(request);
84+
85+
url1.Should().Be($"{host}/orgs/1/something");
86+
url2.Should().Be($"{host}/orgs/2/something");
8587
}
8688
}

‎test/RestSharp.Tests/RestRequestTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public void RestRequest_Test_Already_Encoded() {
2626
parameters.Should().BeEquivalentTo(expected, options => options.ExcludingMissingMembers());
2727

2828
using var client = new RestClient(baseUrl);
29-
var actual = client.BuildUri(request);
30-
actual.AbsoluteUri.Should().Be($"{baseUrl}{resource}");
29+
var actual = client.BuildUriString(request);
30+
actual.Should().Be($"{baseUrl}{resource}");
3131
}
3232

3333
[Fact]

0 commit comments

Comments
 (0)