Skip to content

Commit 5e1ccb1

Browse files
alexeyzimarevalexeyzimarev
committed
Refactoring tests to xUnit
1 parent 603c3c4 commit 5e1ccb1

File tree

98 files changed

+7738
-8823
lines changed

Some content is hidden

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

98 files changed

+7738
-8823
lines changed

‎.editorconfig‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
2+
[*]
3+
4+
# ReSharper properties
5+
resharper_align_multiline_binary_expressions_chain = false
6+
resharper_blank_lines_around_single_line_auto_property = 0
7+
resharper_blank_lines_around_single_line_field = 0
8+
resharper_blank_lines_before_multiline_statements = 1
9+
resharper_csharp_blank_lines_around_single_line_invocable = 1
10+
resharper_csharp_empty_block_style = together
11+
resharper_csharp_int_align_comments = true
12+
resharper_csharp_keep_blank_lines_in_code = 1
13+
resharper_csharp_keep_blank_lines_in_declarations = 1
14+
resharper_csharp_wrap_after_declaration_lpar = true
15+
resharper_csharp_wrap_after_invocation_lpar = true
16+
resharper_csharp_wrap_arguments_style = chop_if_long
17+
resharper_csharp_wrap_before_declaration_rpar = true
18+
resharper_csharp_wrap_before_invocation_rpar = true
19+
resharper_csharp_wrap_parameters_style = chop_if_long
20+
resharper_int_align_assignments = true
21+
resharper_int_align_fields = true
22+
resharper_int_align_nested_ternary = true
23+
resharper_int_align_parameters = true
24+
resharper_int_align_properties = true
25+
resharper_int_align_property_patterns = true
26+
resharper_int_align_switch_expressions = true
27+
resharper_int_align_switch_sections = true
28+
resharper_int_align_variables = true
29+
resharper_place_accessorholder_attribute_on_same_line = false
30+
resharper_place_expr_method_on_single_line = false
31+
resharper_place_expr_property_on_single_line = true
32+
resharper_place_simple_initializer_on_single_line = false
33+
resharper_show_autodetect_configure_formatting_tip = false
34+
resharper_use_indent_from_vs = false
35+
resharper_wrap_array_initializer_style = chop_always
36+
resharper_wrap_before_arrow_with_expressions = true
37+
resharper_wrap_chained_binary_expressions = chop_if_long
38+
resharper_wrap_object_and_collection_initializer_style = chop_always
39+
40+
# Microsoft .NET properties
41+
csharp_using_directive_placement = outside_namespace
42+
csharp_new_line_before_members_in_object_initializers = false
43+
csharp_new_line_before_open_brace = none
44+
csharp_preferred_modifier_order = public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async:suggestion
45+
csharp_style_var_elsewhere = true:suggestion
46+
csharp_style_var_for_built_in_types = true:suggestion
47+
csharp_style_var_when_type_is_apparent = true:suggestion
48+
dotnet_naming_rule.unity_serialized_field_rule.import_to_resharper = True
49+
dotnet_naming_rule.unity_serialized_field_rule.resharper_description = Unity serialized field
50+
dotnet_naming_rule.unity_serialized_field_rule.resharper_guid = 5f0fdb63-c892-4d2c-9324-15c80b22a7ef
51+
dotnet_naming_rule.unity_serialized_field_rule.severity = warning
52+
dotnet_naming_rule.unity_serialized_field_rule.style = lower_camel_case_style
53+
dotnet_naming_rule.unity_serialized_field_rule.symbols = unity_serialized_field_symbols
54+
dotnet_naming_style.lower_camel_case_style.capitalization = camel_case
55+
dotnet_naming_symbols.unity_serialized_field_symbols.applicable_accessibilities = *
56+
dotnet_naming_symbols.unity_serialized_field_symbols.applicable_kinds =
57+
dotnet_naming_symbols.unity_serialized_field_symbols.resharper_applicable_kinds = unity_serialised_field
58+
dotnet_naming_symbols.unity_serialized_field_symbols.resharper_required_modifiers = instance
59+
dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
60+
dotnet_style_parentheses_in_other_binary_operators = never_if_unnecessary:none
61+
dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none
62+
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
63+
dotnet_style_predefined_type_for_member_access = true:suggestion
64+
dotnet_style_qualification_for_event = false:suggestion
65+
dotnet_style_qualification_for_field = false:suggestion
66+
dotnet_style_qualification_for_method = false:suggestion
67+
dotnet_style_qualification_for_property = false:suggestion
68+
dotnet_style_require_accessibility_modifiers = never:suggestion
69+
70+
# ReSharper inspection severities
71+
resharper_arrange_redundant_parentheses_highlighting = hint
72+
resharper_arrange_this_qualifier_highlighting = hint
73+
resharper_arrange_type_member_modifiers_highlighting = hint
74+
resharper_arrange_type_modifiers_highlighting = hint
75+
resharper_built_in_type_reference_style_for_member_access_highlighting = hint
76+
resharper_built_in_type_reference_style_highlighting = hint
77+
resharper_redundant_base_qualifier_highlighting = warning
78+
resharper_suggest_var_or_type_built_in_types_highlighting = hint
79+
resharper_suggest_var_or_type_elsewhere_highlighting = hint
80+
resharper_suggest_var_or_type_simple_types_highlighting = hint
81+
resharper_web_config_module_not_resolved_highlighting = warning
82+
resharper_web_config_type_not_resolved_highlighting = warning
83+
resharper_web_config_wrong_module_highlighting = warning
84+
85+
[*.{appxmanifest,asax,ascx,aspx,axaml,build,cg,cginc,compute,cs,cshtml,dtd,fs,fsi,fsscript,fsx,hlsl,hlsli,hlslinc,master,ml,mli,nuspec,paml,razor,resw,resx,shader,skin,usf,ush,vb,xaml,xamlx,xoml,xsd}]
86+
indent_style = space
87+
indent_size = 4
88+
tab_width = 4

‎props/Common.props‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project>
2+
<PropertyGroup>
3+
<RepoRoot>$([System.IO.Directory]::GetParent($(MSBuildThisFileDirectory)).Parent.FullName)</RepoRoot>
4+
<AssemblyOriginatorKeyFile>$(RepoRoot)\RestSharp.snk</AssemblyOriginatorKeyFile>
5+
<SignAssembly>true</SignAssembly>
6+
<LangVersion>10</LangVersion>
7+
<ImplicitUsings>enable</ImplicitUsings>
8+
<Nullable>enable</Nullable>
9+
</PropertyGroup>
10+
</Project>

‎src/Directory.Build.props‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
<Project>
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'RestSharp.sln'))\props\Common.props" />
23
<PropertyGroup>
3-
<PackageReleaseNotes>For full release notes see https://github.com/restsharp/RestSharp/blob/master/releasenotes.md</PackageReleaseNotes>
44
<PackageIcon>restsharp.png</PackageIcon>
55
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
6-
<PackageProjectUrl>http://restsharp.dev</PackageProjectUrl>
6+
<PackageProjectUrl>https://restsharp.dev</PackageProjectUrl>
77
<RepositoryUrl>https://github.com/restsharp/RestSharp.git</RepositoryUrl>
88
<RepositoryType>git</RepositoryType>
99
<Description>Simple REST and HTTP API Client</Description>
1010
<Authors>John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community</Authors>
11-
<AssemblyOriginatorKeyFile>..\..\RestSharp.snk</AssemblyOriginatorKeyFile>
12-
<SignAssembly>true</SignAssembly>
13-
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
1411
<UpdateVersionProperties>true</UpdateVersionProperties>
1512
<PublishRepositoryUrl>true</PublishRepositoryUrl>
16-
<LangVersion>9</LangVersion>
17-
<Nullable>enable</Nullable>
1813
<IncludeSymbols>true</IncludeSymbols>
1914
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
15+
<MinVerSkip Condition="'$(Configuration)' == 'Debug'">true</MinVerSkip>
16+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
17+
<NoWarn>$(NoWarn);1591</NoWarn>
2018
</PropertyGroup>
2119

2220
<ItemGroup>
@@ -27,14 +25,10 @@
2725
</ItemGroup>
2826

2927
<ItemGroup>
30-
<None Include="..\..\restsharp.png" Pack="true" PackagePath="\"/>
28+
<None Include="$(RepoRoot)\restsharp.png" Pack="true" PackagePath="\"/>
29+
<Using Remove="System.Net.Http"/>
3130
</ItemGroup>
3231

33-
<PropertyGroup>
34-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
35-
<NoWarn>$(NoWarn);1591</NoWarn>
36-
</PropertyGroup>
37-
3832
<Target Name="CustomVersion" AfterTargets="MinVer">
3933
<PropertyGroup>
4034
<FileVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)</FileVersion>

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

Lines changed: 19 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@
1919
using RestSharp.Extensions;
2020
using RestSharp.Validation;
2121

22-
namespace RestSharp.Authenticators.OAuth
23-
{
22+
namespace RestSharp.Authenticators.OAuth {
2423
/// <summary>
2524
/// A class to encapsulate OAuth authentication flow.
2625
/// </summary>
27-
sealed class OAuthWorkflow
28-
{
26+
sealed class OAuthWorkflow {
2927
public string Version { get; set; }
3028

3129
public string ConsumerKey { get; set; }
@@ -64,8 +62,7 @@ sealed class OAuthWorkflow
6462
/// <param name="method">The HTTP method for the intended request</param>
6563
/// <param name="parameters">Any existing, non-OAuth query parameters desired in the request</param>
6664
/// <returns></returns>
67-
public OAuthParameters BuildRequestTokenInfo(string method, WebPairCollection parameters)
68-
{
65+
public OAuthParameters BuildRequestTokenInfo(string method, WebPairCollection parameters) {
6966
ValidateTokenRequestState();
7067

7168
var allParameters = new WebPairCollection();
@@ -79,8 +76,7 @@ public OAuthParameters BuildRequestTokenInfo(string method, WebPairCollection pa
7976

8077
var signatureBase = OAuthTools.ConcatenateRequestElements(method, RequestTokenUrl, allParameters);
8178

82-
return new OAuthParameters
83-
{
79+
return new OAuthParameters {
8480
Signature = OAuthTools.GetSignature(SignatureMethod, SignatureTreatment, signatureBase, ConsumerSecret),
8581
Parameters = authParameters
8682
};
@@ -93,8 +89,7 @@ public OAuthParameters BuildRequestTokenInfo(string method, WebPairCollection pa
9389
/// </summary>
9490
/// <param name="method">The HTTP method for the intended request</param>
9591
/// <param name="parameters">Any existing, non-OAuth query parameters desired in the request</param>
96-
public OAuthParameters BuildAccessTokenSignature(string method, WebPairCollection parameters)
97-
{
92+
public OAuthParameters BuildAccessTokenSignature(string method, WebPairCollection parameters) {
9893
ValidateAccessRequestState();
9994

10095
var allParameters = new WebPairCollection();
@@ -109,8 +104,7 @@ public OAuthParameters BuildAccessTokenSignature(string method, WebPairCollectio
109104

110105
var signatureBase = OAuthTools.ConcatenateRequestElements(method, uri.ToString(), allParameters);
111106

112-
return new OAuthParameters
113-
{
107+
return new OAuthParameters {
114108
Signature = OAuthTools.GetSignature(SignatureMethod, SignatureTreatment, signatureBase, ConsumerSecret, TokenSecret),
115109
Parameters = authParameters
116110
};
@@ -123,8 +117,7 @@ public OAuthParameters BuildAccessTokenSignature(string method, WebPairCollectio
123117
/// </summary>
124118
/// <param name="method">The HTTP method for the intended request</param>
125119
/// <param name="parameters">Any existing, non-OAuth query parameters desired in the request</param>
126-
public OAuthParameters BuildClientAuthAccessTokenSignature(string method, WebPairCollection parameters)
127-
{
120+
public OAuthParameters BuildClientAuthAccessTokenSignature(string method, WebPairCollection parameters) {
128121
ValidateClientAuthAccessRequestState();
129122

130123
var allParameters = new WebPairCollection();
@@ -139,15 +132,13 @@ public OAuthParameters BuildClientAuthAccessTokenSignature(string method, WebPai
139132

140133
var signatureBase = OAuthTools.ConcatenateRequestElements(method, uri.ToString(), allParameters);
141134

142-
return new OAuthParameters
143-
{
135+
return new OAuthParameters {
144136
Signature = OAuthTools.GetSignature(SignatureMethod, SignatureTreatment, signatureBase, ConsumerSecret),
145137
Parameters = authParameters
146138
};
147139
}
148140

149-
public OAuthParameters BuildProtectedResourceSignature(string method, WebPairCollection parameters, string url)
150-
{
141+
public OAuthParameters BuildProtectedResourceSignature(string method, WebPairCollection parameters, string url) {
151142
ValidateProtectedResourceState();
152143

153144
var allParameters = new WebPairCollection();
@@ -167,42 +158,35 @@ public OAuthParameters BuildProtectedResourceSignature(string method, WebPairCol
167158

168159
var signatureBase = OAuthTools.ConcatenateRequestElements(method, url, allParameters);
169160

170-
return new OAuthParameters
171-
{
161+
return new OAuthParameters {
172162
Signature = OAuthTools.GetSignature(SignatureMethod, SignatureTreatment, signatureBase, ConsumerSecret, TokenSecret),
173163
Parameters = authParameters
174164
};
175165
}
176166

177-
void ValidateTokenRequestState()
178-
{
167+
void ValidateTokenRequestState() {
179168
Ensure.NotEmpty(RequestTokenUrl, nameof(RequestTokenUrl));
180169
Ensure.NotEmpty(ConsumerKey, nameof(ConsumerKey));
181170
}
182171

183-
void ValidateAccessRequestState()
184-
{
172+
void ValidateAccessRequestState() {
185173
Ensure.NotEmpty(AccessTokenUrl, nameof(AccessTokenUrl));
186174
Ensure.NotEmpty(ConsumerKey, nameof(ConsumerKey));
187175
Ensure.NotEmpty(Token, nameof(Token));
188176
}
189177

190-
void ValidateClientAuthAccessRequestState()
191-
{
178+
void ValidateClientAuthAccessRequestState() {
192179
Ensure.NotEmpty(AccessTokenUrl, nameof(AccessTokenUrl));
193180
Ensure.NotEmpty(ConsumerKey, nameof(ConsumerKey));
194181
Ensure.NotEmpty(ClientUsername, nameof(ClientUsername));
195182
}
196183

197-
void ValidateProtectedResourceState()
198-
{
184+
void ValidateProtectedResourceState() {
199185
Ensure.NotEmpty(ConsumerKey, nameof(ConsumerKey));
200186
}
201187

202-
WebPairCollection GenerateAuthParameters(string timestamp, string nonce)
203-
{
204-
var authParameters = new WebPairCollection
205-
{
188+
WebPairCollection GenerateAuthParameters(string timestamp, string nonce) {
189+
var authParameters = new WebPairCollection {
206190
new WebPair("oauth_consumer_key", ConsumerKey),
207191
new WebPair("oauth_nonce", nonce),
208192
new WebPair("oauth_signature_method", SignatureMethod.ToRequestValue()),
@@ -222,8 +206,7 @@ WebPairCollection GenerateAuthParameters(string timestamp, string nonce)
222206
}
223207

224208
WebPairCollection GenerateXAuthParameters(string timestamp, string nonce)
225-
=> new WebPairCollection
226-
{
209+
=> new WebPairCollection {
227210
new WebPair("x_auth_username", ClientUsername),
228211
new WebPair("x_auth_password", ClientPassword),
229212
new WebPair("x_auth_mode", "client_auth"),
@@ -234,10 +217,9 @@ WebPairCollection GenerateXAuthParameters(string timestamp, string nonce)
234217
new WebPair("oauth_version", Version ?? "1.0")
235218
};
236219

237-
internal class OAuthParameters
238-
{
220+
internal class OAuthParameters {
239221
public WebPairCollection Parameters { get; set; }
240222
public string Signature { get; set; }
241223
}
242224
}
243-
}
225+
}

‎src/RestSharp/Extensions/ResponseStatusExtensions.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
using System;
1615
using System.Net;
1716
using static System.Net.WebExceptionStatus;
1817

@@ -31,8 +30,8 @@ public static WebException ToWebException(this ResponseStatus responseStatus)
3130
{
3231
ResponseStatus.None => new WebException("The request could not be processed.", ServerProtocolViolation),
3332
ResponseStatus.Error => new WebException("An error occurred while processing the request.", ServerProtocolViolation),
34-
ResponseStatus.TimedOut => new WebException("The request timed-out.", Timeout),
35-
ResponseStatus.Aborted => new WebException("The request was aborted.", Timeout),
33+
ResponseStatus.TimedOut => new WebException("The request timed-out.", WebExceptionStatus.Timeout),
34+
ResponseStatus.Aborted => new WebException("The request was aborted.", WebExceptionStatus.Timeout),
3635
_ => throw new ArgumentOutOfRangeException(nameof(responseStatus))
3736
};
3837
}

0 commit comments

Comments
 (0)