huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Jhkim/fix testcodeissues (#229) 

Fix test issue of incorrect usage of string comparison for testFlags
This commit is contained in:
jhkimnew 2017-11-01 17:31:38 -07:00 committed by GitHub
parent 2cd59f86c4
commit 192a403b9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/AspNetCoreModule.Test/FunctionalTestHelper.cs
View File

@ -35,14 +35,14 @@ namespace AspNetCoreModule.Test
{ {
get get
{ {
if (InitializeTestMachine.GlobalTestFlags.Contains(TestFlags.SkipTest)) if (TestFlags.Enabled(TestFlags.SkipTest))
{ {
AdditionalInfo = TestFlags.SkipTest + " is set"; AdditionalInfo = TestFlags.SkipTest + " is set";
return false; return false;
} }
if (_attributeValue == TestFlags.RequireRunAsAdministrator if (_attributeValue == TestFlags.RequireRunAsAdministrator
&& !InitializeTestMachine.GlobalTestFlags.Contains(TestFlags.RunAsAdministrator)) && !TestFlags.Enabled(TestFlags.RunAsAdministrator))
{ {
AdditionalInfo = _attributeValue + " is not belong to the given global test context(" + InitializeTestMachine.GlobalTestFlags + ")"; AdditionalInfo = _attributeValue + " is not belong to the given global test context(" + InitializeTestMachine.GlobalTestFlags + ")";
return false; return false;
@ -849,7 +849,7 @@ namespace AspNetCoreModule.Test
string result = string.Empty; string result = string.Empty;
iisConfig.SetANCMConfig(testSite.SiteName, testSite.AspNetCoreApp.Name, "forwardWindowsAuthToken", enabledForwardWindowsAuthToken); iisConfig.SetANCMConfig(testSite.SiteName, testSite.AspNetCoreApp.Name, "forwardWindowsAuthToken", enabledForwardWindowsAuthToken);
string requestHeaders = await GetResponse(testSite.AspNetCoreApp.GetUri("DumpRequestHeaders"), HttpStatusCode.OK); string requestHeaders = await GetResponse(testSite.AspNetCoreApp.GetUri("DumpRequestHeaders"), HttpStatusCode.OK);
Assert.DoesNotContain("MS-ASPNETCORE-WINAUTHTOKEN", requestHeaders.ToUpper()); Assert.DoesNotContain("MS-ASPNETCORE-WINAUTHTOKEN", requestHeaders, StringComparison.InvariantCultureIgnoreCase);
iisConfig.EnableIISAuthentication(testSite.SiteName, windows: true, basic: false, anonymous: false); iisConfig.EnableIISAuthentication(testSite.SiteName, windows: true, basic: false, anonymous: false);
Thread.Sleep(500); Thread.Sleep(500);
@ -883,7 +883,7 @@ namespace AspNetCoreModule.Test
} }
else else
{ {
Assert.DoesNotContain("MS-ASPNETCORE-WINAUTHTOKEN", requestHeaders.ToUpper()); Assert.DoesNotContain("MS-ASPNETCORE-WINAUTHTOKEN", requestHeaders, StringComparison.InvariantCultureIgnoreCase);
result = await GetResponse(testSite.AspNetCoreApp.GetUri("ImpersonateMiddleware"), HttpStatusCode.OK); result = await GetResponse(testSite.AspNetCoreApp.GetUri("ImpersonateMiddleware"), HttpStatusCode.OK);
Assert.Contains("ImpersonateMiddleware-UserName = NoAuthentication", result); Assert.Contains("ImpersonateMiddleware-UserName = NoAuthentication", result);
@ -1219,13 +1219,13 @@ namespace AspNetCoreModule.Test
string requestHeaders = string.Empty; string requestHeaders = string.Empty;
requestHeaders = await GetResponseAndHeaders(testSite.AspNetCoreApp.GetUri("DumpRequestHeaders"), new string[] { "Accept-Encoding", "gzip", requestHeader, requestHeaderValue }, HttpStatusCode.OK); requestHeaders = await GetResponseAndHeaders(testSite.AspNetCoreApp.GetUri("DumpRequestHeaders"), new string[] { "Accept-Encoding", "gzip", requestHeader, requestHeaderValue }, HttpStatusCode.OK);
requestHeaders = requestHeaders.Replace(" ", ""); requestHeaders = requestHeaders.Replace(" ", "");
Assert.DoesNotContain(requestHeader.ToLower() + ":", requestHeaders.ToUpper()); Assert.DoesNotContain(requestHeader + ":", requestHeaders, StringComparison.InvariantCultureIgnoreCase);
// Verify https request // Verify https request
Uri targetHttpsUri = testSite.AspNetCoreApp.GetUri(null, sslPort, protocol: "https"); Uri targetHttpsUri = testSite.AspNetCoreApp.GetUri(null, sslPort, protocol: "https");
requestHeader = await GetResponseAndHeaders(targetHttpsUri, new string[] { "Accept-Encoding", "gzip", requestHeader, requestHeaderValue }, HttpStatusCode.OK); requestHeader = await GetResponseAndHeaders(targetHttpsUri, new string[] { "Accept-Encoding", "gzip", requestHeader, requestHeaderValue }, HttpStatusCode.OK);
requestHeaders = requestHeaders.Replace(" ", ""); requestHeaders = requestHeaders.Replace(" ", "");
Assert.DoesNotContain(requestHeader.ToLower() + ":", requestHeaders.ToUpper()); Assert.DoesNotContain(requestHeader + ":", requestHeaders, StringComparison.InvariantCultureIgnoreCase);
// Remove the SSL Certificate mapping // Remove the SSL Certificate mapping
iisConfig.RemoveSSLCertificate(sslPort, hexIPAddress); iisConfig.RemoveSSLCertificate(sslPort, hexIPAddress);
@ -1561,11 +1561,11 @@ namespace AspNetCoreModule.Test
// Remove websocketModule // Remove websocketModule
IISConfigUtility.BackupAppHostConfig("DoWebSocketErrorhandlingTest", true); IISConfigUtility.BackupAppHostConfig("DoWebSocketErrorhandlingTest", true);
iisConfig.RemoveModule("WebSocketModule"); iisConfig.RemoveModule("WebSocketModule");
Thread.Sleep(3000);
using (WebSocketClientHelper websocketClient = new WebSocketClientHelper()) using (WebSocketClientHelper websocketClient = new WebSocketClientHelper())
{ {
var frameReturned = websocketClient.Connect(testSite.AspNetCoreApp.GetUri("websocket"), true, true, waitForConnectionOpen:false); var frameReturned = websocketClient.Connect(testSite.AspNetCoreApp.GetUri("websocket"), true, true, waitForConnectionOpen:false);
Assert.DoesNotContain("Connection: Upgrade", frameReturned.Content); Assert.DoesNotContain("Connection: Upgrade", frameReturned.Content, StringComparison.InvariantCultureIgnoreCase);
//BugBug: Currently we returns 101 here. //BugBug: Currently we returns 101 here.
//Assert.DoesNotContain("HTTP/1.1 101 Switching Protocols", frameReturned.Content); //Assert.DoesNotContain("HTTP/1.1 101 Switching Protocols", frameReturned.Content);

25
test/AspNetCoreModule.TestSites.Standard/Startup.cs
View File

@ -318,6 +318,31 @@ namespace AspnetCoreModule.TestSites.Standard
response += de.Key + ":" + de.Value + "<br/>"; response += de.Key + ":" + de.Value + "<br/>";
} }
} }
// This action can be used for testing invalid Transfer-Encoding response header
action = "SetTransferEncoding";
if (item.StartsWith(action))
{
if (item.Length > action.Length)
{
// this is the default response which is valid for chunked encoding
response = "10\r\nManually Chunked\r\n0\r\n\r\n";
parameter = item.Substring(action.Length);
// valid encoding value: "chunked" or "chunked,gzip"
string encoding = parameter;
var tokens = parameter.Split("_");
// if respons body value was also given after "_" delimeter, use the value as response data.
if (tokens.Length == 2)
{
encoding = tokens[0];
response = tokens[1];
}
context.Response.Headers[HeaderNames.TransferEncoding] = encoding;
return context.Response.WriteAsync(response);
}
}
} }
// Handle shutdown event from ANCM // Handle shutdown event from ANCM