Skip to content

Commit 879b14f

Browse files
TratcherTratcher
committed
React to corefx http2 change
1 parent ec60a57 commit 879b14f

File tree

1 file changed

+19
-24
lines changed

1 file changed

+19
-24
lines changed

‎src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/NegotiateHandlerFunctionalTests.cs

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,15 @@ public class NegotiateHandlerFunctionalTests
3535
new object[] { Http2Version },
3636
};
3737

38-
static NegotiateHandlerFunctionalTests()
39-
{
40-
AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2Support", true); // TODO: Remove after rebasing
41-
}
42-
4338
[ConditionalTheory]
4439
[MemberData(nameof(Http11And2))]
4540
public async Task Anonymous_NoChallenge_NoOps(Version version)
4641
{
4742
using var host = await CreateHostAsync();
4843
using var client = CreateSocketHttpClient(host);
49-
// client.DefaultRequestVersion = version;
44+
client.DefaultRequestVersion = version;
5045

51-
var result = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/Anonymous" + version.Major) { Version = version });
46+
var result = await client.GetAsync("/Anonymous" + version.Major);
5247
Assert.Equal(HttpStatusCode.OK, result.StatusCode);
5348
Assert.False(result.Headers.Contains(HeaderNames.WWWAuthenticate));
5449
Assert.Equal(version, result.Version);
@@ -61,9 +56,9 @@ public async Task Anonymous_Challenge_401Negotiate(Version version)
6156
using var host = await CreateHostAsync();
6257
// WinHttpHandler can't disable default credentials on localhost, use SocketHttpHandler.
6358
using var client = CreateSocketHttpClient(host);
64-
// client.DefaultRequestVersion = version;
59+
client.DefaultRequestVersion = version;
6560

66-
var result = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/Authenticate") { Version = version });
61+
var result = await client.GetAsync("/Authenticate");
6762
Assert.Equal(HttpStatusCode.Unauthorized, result.StatusCode);
6863
Assert.Equal("Negotiate", result.Headers.WwwAuthenticate.ToString());
6964
Assert.Equal(version, result.Version);
@@ -76,9 +71,9 @@ public async Task DefautCredentials_Success(Version version)
7671
using var host = await CreateHostAsync();
7772
// https://github.com/dotnet/corefx/issues/35195 SocketHttpHandler won't downgrade HTTP/2. WinHttpHandler does.
7873
using var client = CreateWinHttpClient(host);
79-
// client.DefaultRequestVersion = version;
74+
client.DefaultRequestVersion = version;
8075

81-
var result = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/Authenticate") { Version = version });
76+
var result = await client.GetAsync("/Authenticate");
8277
Assert.Equal(HttpStatusCode.OK, result.StatusCode);
8378
Assert.Equal(Http11Version, result.Version); // HTTP/2 downgrades.
8479
}
@@ -98,9 +93,9 @@ public async Task RequestAfterAuth_ReUses1(Version first, Version second)
9893
using var host = await CreateHostAsync();
9994
// https://github.com/dotnet/corefx/issues/35195 SocketHttpHandler won't downgrade HTTP/2. WinHttpHandler does.
10095
using var client = CreateWinHttpClient(host);
101-
// client.DefaultRequestVersion = first;
96+
client.DefaultRequestVersion = first;
10297

103-
var result = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/Authenticate") { Version = first });
98+
var result = await client.GetAsync("/Authenticate");
10499
Assert.Equal(HttpStatusCode.OK, result.StatusCode);
105100
Assert.Equal(Http11Version, result.Version); // Http/2 downgrades
106101

@@ -116,15 +111,15 @@ public async Task RequestAfterAuth_Http2Then2_Success()
116111
using var host = await CreateHostAsync();
117112
// https://github.com/dotnet/corefx/issues/35195 SocketHttpHandler won't downgrade HTTP/2. WinHttpHandler does.
118113
using var client = CreateWinHttpClient(host);
119-
// client.DefaultRequestVersion = Http2Version;
114+
client.DefaultRequestVersion = Http2Version;
120115

121116
// Falls back to HTTP/1.1 after trying HTTP/2.
122-
var result = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/Authenticate") { Version = Http2Version });
117+
var result = await client.GetAsync("/Authenticate");
123118
Assert.Equal(HttpStatusCode.OK, result.StatusCode);
124119
Assert.Equal(Http11Version, result.Version);
125120

126121
// Tries HTTP/2, falls back to HTTP/1.1 and re-authenticates.
127-
result = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/Authenticate") { Version = Http2Version });
122+
result = await client.GetAsync("/Authenticate");
128123
Assert.Equal(HttpStatusCode.OK, result.StatusCode);
129124
Assert.Equal(Http11Version, result.Version);
130125
}
@@ -135,15 +130,15 @@ public async Task RequestAfterAuth_Http2Then2Anonymous_Success()
135130
using var host = await CreateHostAsync();
136131
// https://github.com/dotnet/corefx/issues/35195 SocketHttpHandler won't downgrade HTTP/2. WinHttpHandler does.
137132
using var client = CreateWinHttpClient(host);
138-
// client.DefaultRequestVersion = Http2Version;
133+
client.DefaultRequestVersion = Http2Version;
139134

140135
// Falls back to HTTP/1.1 after trying HTTP/2.
141-
var result = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/Authenticate") { Version = Http2Version });
136+
var result = await client.GetAsync("/Authenticate");
142137
Assert.Equal(HttpStatusCode.OK, result.StatusCode);
143138
Assert.Equal(Http11Version, result.Version);
144139

145140
// Makes an anonymous HTTP/2 request
146-
result = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/Anonymous2") { Version = Http2Version });
141+
result = await client.GetAsync("/Anonymous2");
147142
Assert.Equal(HttpStatusCode.OK, result.StatusCode);
148143
Assert.Equal(Http2Version, result.Version);
149144
}
@@ -155,9 +150,9 @@ public async Task Unauthorized_401Negotiate(Version version)
155150
using var host = await CreateHostAsync();
156151
// https://github.com/dotnet/corefx/issues/35195 SocketHttpHandler won't downgrade. WinHttpHandler does.
157152
using var client = CreateWinHttpClient(host);
158-
// client.DefaultRequestVersion = version;
153+
client.DefaultRequestVersion = version;
159154

160-
var result = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/Unauthorized") { Version = version });
155+
var result = await client.GetAsync("/Unauthorized");
161156
Assert.Equal(HttpStatusCode.Unauthorized, result.StatusCode);
162157
Assert.Equal("Negotiate", result.Headers.WwwAuthenticate.ToString());
163158
Assert.Equal(Http11Version, result.Version); // HTTP/2 downgrades.
@@ -170,13 +165,13 @@ public async Task UnauthorizedAfterAuthenticated_Success(Version version)
170165
using var host = await CreateHostAsync();
171166
// https://github.com/dotnet/corefx/issues/35195 SocketHttpHandler won't downgrade. WinHttpHandler does.
172167
using var client = CreateWinHttpClient(host);
173-
// client.DefaultRequestVersion = version;
168+
client.DefaultRequestVersion = version;
174169

175-
var result = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/Authenticate") { Version = version });
170+
var result = await client.GetAsync("/Authenticate");
176171
Assert.Equal(HttpStatusCode.OK, result.StatusCode);
177172
Assert.Equal(Http11Version, result.Version); // HTTP/2 downgrades.
178173

179-
result = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, "/Unauthorized") { Version = version });
174+
result = await client.GetAsync("/Unauthorized");
180175
Assert.Equal(HttpStatusCode.Unauthorized, result.StatusCode);
181176
Assert.Equal("Negotiate", result.Headers.WwwAuthenticate.ToString());
182177
Assert.Equal(Http11Version, result.Version); // HTTP/2 downgrades.

0 commit comments

Comments
 (0)