Skip to content

Add HttpMethod.Query to static method test data #129790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MihaZupan merged 8 commits into from
Jun 26, 2026
Merged

Add HttpMethod.Query to static method test data #129790

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bd603b6
Add HttpMethod.Query to static method test data
NicoAvanzDev Jun 24, 2026
8580058
Merge branch 'main' into httpmethod-query-test-data
NicoAvanzDev Jun 24, 2026
4e48697
test: consolidate StaticHttpMethods and remove duplication
NicoAvanzDev Jun 25, 2026
c67ae79
Merge branch 'httpmethod-query-test-data' of https://github.com/NicoA…
NicoAvanzDev Jun 25, 2026
0414ce0
Merge branch 'main' into httpmethod-query-test-data
NicoAvanzDev Jun 25, 2026
77d566c
test: restore data-driven theories for StaticHttpMethods tests
NicoAvanzDev Jun 25, 2026
458309b
Merge branch 'httpmethod-query-test-data' of https://github.com/NicoA…
NicoAvanzDev Jun 25, 2026
e86d897
test: encapsulate StaticHttpMethods and restore case-insensitivity co…
NicoAvanzDev Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 23 additions & 37 deletions src/libraries/System.Net.Http/tests/FunctionalTests/HttpMethodTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,26 @@ namespace System.Net.Http.Functional.Tests
{
public class HttpMethodTest
{
public static IEnumerable<object[]> StaticHttpMethods { get; }

static HttpMethodTest()
{
List<object[]> staticHttpMethods = new List<object[]>
public static readonly List<HttpMethod> StaticHttpMethods = new List<HttpMethod>
{
HttpMethod.Connect,
HttpMethod.Delete,
HttpMethod.Get,
HttpMethod.Head,
HttpMethod.Options,
HttpMethod.Patch,
HttpMethod.Post,
HttpMethod.Put,
HttpMethod.Query,
HttpMethod.Trace,
};
Comment thread
NicoAvanzDev marked this conversation as resolved.
Outdated

public static IEnumerable<object[]> StaticHttpMethods_MemberData()
{
foreach (HttpMethod method in StaticHttpMethods)
{
new object[] { HttpMethod.Get },
new object[] { HttpMethod.Put },
new object[] { HttpMethod.Post },
new object[] { HttpMethod.Delete },
new object[] { HttpMethod.Head },
new object[] { HttpMethod.Options },
new object[] { HttpMethod.Trace }
};
AddStaticHttpMethods(staticHttpMethods);
StaticHttpMethods = staticHttpMethods;
yield return new object[] { method };
}
}

[Fact]
Expand Down Expand Up @@ -116,7 +120,7 @@ public void GetHashCode_CustomStringMethod_SameAsStringToUpperInvariantHashCode(
}

[Theory]
[MemberData(nameof(StaticHttpMethods))]
[MemberData(nameof(StaticHttpMethods_MemberData))]
public void GetHashCode_StaticMethods_SameAsStringToUpperInvariantHashCode(HttpMethod method)
{
Assert.Equal(method.ToString().ToUpperInvariant().GetHashCode(), method.GetHashCode());
Expand Down Expand Up @@ -151,24 +155,11 @@ public void Patch_VerifyValue_PropertyNameMatchesHttpMethodName()
Assert.Equal("PATCH", HttpMethod.Patch.Method);
}

public static IEnumerable<object[]> Parse_UsesKnownInstances_MemberData()
{
yield return new object[] { HttpMethod.Connect, nameof(HttpMethod.Connect) };
yield return new object[] { HttpMethod.Delete, nameof(HttpMethod.Delete) };
yield return new object[] { HttpMethod.Get, nameof(HttpMethod.Get) };
yield return new object[] { HttpMethod.Head, nameof(HttpMethod.Head) };
yield return new object[] { HttpMethod.Options, nameof(HttpMethod.Options) };
yield return new object[] { HttpMethod.Patch, nameof(HttpMethod.Patch) };
yield return new object[] { HttpMethod.Post, nameof(HttpMethod.Post) };
yield return new object[] { HttpMethod.Put, nameof(HttpMethod.Put) };
yield return new object[] { HttpMethod.Query, nameof(HttpMethod.Query) };
yield return new object[] { HttpMethod.Trace, nameof(HttpMethod.Trace) };
}

[Theory]
[MemberData(nameof(Parse_UsesKnownInstances_MemberData))]
public void Parse_KnownMethod_UsesKnownInstances(HttpMethod method, string methodName)
[MemberData(nameof(StaticHttpMethods_MemberData))]
public void Parse_KnownMethod_UsesKnownInstances(HttpMethod method)
{
string methodName = method.Method;
Assert.Same(method, HttpMethod.Parse(methodName));
Assert.Same(method, HttpMethod.Parse(methodName.ToUpperInvariant()));
Assert.Same(method, HttpMethod.Parse(methodName.ToLowerInvariant()));
Comment thread
NicoAvanzDev marked this conversation as resolved.
Outdated
Expand Down Expand Up @@ -201,10 +192,5 @@ public void Parse_InvalidToken_Throws(string method)
{
Assert.Throws<FormatException>(() => HttpMethod.Parse(method));
}

private static void AddStaticHttpMethods(List<object[]> staticHttpMethods)
{
staticHttpMethods.Add(new object[] { HttpMethod.Patch });
}
}
}
Loading