Skip to content
This repository has been archived by the owner on Jun 5, 2019. It is now read-only.

Commit

Permalink
Merge pull request #323 from mortezag/fixHttpTests
Browse files Browse the repository at this point in the history 
Fix http tests issues
  • Loading branch information
@mortezag
mortezag committed Oct 13, 2015
2 parents 34a92c3 + a4f5227 commit 3346151
Show file tree
Hide file tree
Showing 13 changed files with 143 additions and 121 deletions.
3 changes: 0 additions & 3 deletions Test/Platform/Tests/CLR/System/Http/FunctionalTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,6 @@ private byte[] GetRequested(string uri, params string[] servers)

// Create request.
HttpWebRequest request = HttpWebRequest.Create(uri) as HttpWebRequest;
// Set proxy information
WebProxy itgProxy = new WebProxy(HttpTests.Proxy, true);
request.Proxy = itgProxy;
// Get response from server.
WebResponse resp = null;
try
Expand Down
17 changes: 12 additions & 5 deletions Test/Platform/Tests/CLR/System/Http/HttpKnownHeaderNamesTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,14 @@ public class HttpKnownHeaderNamesTests : IMFTestInterface
public InitializeResult Initialize()
{
Log.Comment("Adding set up for the tests.");
// Add your functionality here.
try
{
Microsoft.SPOT.Net.NetworkInformation.NetworkInterface[] nis = Microsoft.SPOT.Net.NetworkInformation.NetworkInterface.GetAllNetworkInterfaces();
}
catch
{
return InitializeResult.Skip;
}

return InitializeResult.ReadyToGo;
}
Expand Down Expand Up @@ -83,7 +90,7 @@ private bool VerifyHeaderIsLegal(WebHeaderCollection wrc, string header, string
public MFTestResults TestSetHTTPRequestHeaderAfterCreateHTTP1_1()
{
MFTestResults result = MFTestResults.Pass;
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://127.0.0.1:" + HttpServer.s_CurrentPort.ToString() + "/");
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://"+ Utilities.GetLocalIpAddress() + ":" + HttpServer.s_CurrentPort.ToString() + "/");
wr.UserAgent = ".Net Micro Framwork Device/4.0";

Log.Comment("Initial version: " + wr.ProtocolVersion); //Default version is 1.1
Expand Down Expand Up @@ -121,7 +128,7 @@ public MFTestResults TestSetHTTPRequestHeaderAfterCreateHTTP1_1()
public MFTestResults ValidateAbleToSetPropertiesValueHTTP1_1()
{
MFTestResults result = MFTestResults.Pass;
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://127.0.0.1:" + HttpServer.s_CurrentPort.ToString() + "/");
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://"+ Utilities.GetLocalIpAddress() + ":" + HttpServer.s_CurrentPort.ToString() + "/");
wr.UserAgent = ".Net Micro Framwork Device/4.0";

Log.Comment("Initial version: " + wr.ProtocolVersion); //Default version is 1.1
Expand Down Expand Up @@ -217,7 +224,7 @@ public MFTestResults ValidateAbleToSetPropertiesValueHTTP1_1()
public MFTestResults TestSetHTTPRequestHeaderAfterCreateHTTP1_0()
{
MFTestResults result = MFTestResults.Pass;
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://127.0.0.1:" + HttpServer.s_CurrentPort.ToString() + "/");
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://"+ Utilities.GetLocalIpAddress() + ":" + HttpServer.s_CurrentPort.ToString() + "/");
wr.UserAgent = ".Net Micro Framwork Device/4.0";

Log.Comment("Initial version: " + wr.ProtocolVersion); //Default version is 1.1
Expand Down Expand Up @@ -256,7 +263,7 @@ public MFTestResults TestSetHTTPRequestHeaderAfterCreateHTTP1_0()
public MFTestResults ValidateAbleToSetPropertiesValueHTTP1_0()
{
MFTestResults result = MFTestResults.Pass;
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://127.0.0.1:" + HttpServer.s_CurrentPort.ToString() + "/");
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://"+ Utilities.GetLocalIpAddress() + ":" + HttpServer.s_CurrentPort.ToString() + "/");
wr.UserAgent = ".Net Micro Framwork Device/4.0";

Log.Comment("Initial version: " + wr.ProtocolVersion); //Default version is 1.1
Expand Down
10 changes: 5 additions & 5 deletions Test/Platform/Tests/CLR/System/Http/HttpRequestHeaderTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private MFTestResults Verify(System.Net.WebHeaderCollection wrc, System.Net.WebH
public MFTestResults ValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_1()
{
MFTestResults result = MFTestResults.Pass;
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://127.0.0.1:" + HttpServer.s_CurrentPort.ToString() + "/");
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://"+ Utilities.GetLocalIpAddress() + ":" + HttpServer.s_CurrentPort.ToString() + "/");
wr.UserAgent = ".Net Micro Framwork Device/4.0";

Log.Comment("Initial version: " + wr.ProtocolVersion); //Default version is 1.1
Expand Down Expand Up @@ -166,7 +166,7 @@ public MFTestResults ValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_1_Http
public MFTestResults InValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_1_Https()
{
MFTestResults result = MFTestResults.Pass;
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("https://127.0.0.1:443/");
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("https://"+ Utilities.GetLocalIpAddress() + ":443/");
wr.UserAgent = ".Net Micro Framwork Device/4.0";

Log.Comment("Negative Test case 1:");
Expand Down Expand Up @@ -309,7 +309,7 @@ public MFTestResults InvalidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_1()
public MFTestResults ValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_0()
{
MFTestResults result = MFTestResults.Pass;
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://127.0.0.1:" + HttpServer.s_CurrentPort.ToString() + "/");
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("http://"+ Utilities.GetLocalIpAddress() + ":" + HttpServer.s_CurrentPort.ToString() + "/");
wr.UserAgent = ".Net Micro Framwork Device/4.0";

Log.Comment("Initial version: " + wr.ProtocolVersion); //Default version is 1.1
Expand Down Expand Up @@ -351,7 +351,7 @@ public MFTestResults ValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_0()
public MFTestResults ValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_0_HTTPS()
{
MFTestResults result = MFTestResults.Pass;
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("https://127.0.0.1:443/");
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("https://"+ Utilities.GetLocalIpAddress() + ":443/");
wr.UserAgent = ".Net Micro Framwork Device/4.0";

Log.Comment("Initial version: " + wr.ProtocolVersion); //Default version is 1.1
Expand Down Expand Up @@ -393,7 +393,7 @@ public MFTestResults ValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_0_HTTP
public MFTestResults InValidDefaultTestGetHTTPRequestHeaderAfterCreateHTTP1_0_HTTPS()
{
MFTestResults result = MFTestResults.Pass;
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("https://127.0.0.1:443/");
HttpWebRequest wr = (HttpWebRequest)WebRequest.Create("https://"+ Utilities.GetLocalIpAddress() + ":443/");
wr.UserAgent = ".Net Micro Framwork Device/4.0";

Log.Comment("Negative Test case 4:");
Expand Down
2 changes: 2 additions & 0 deletions Test/Platform/Tests/CLR/System/Http/HttpServer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ public void StartServer()
s_CurrentPort++;
throw new Exception("StartServer failed");
}

s_CurrentPort++;
}


Expand Down
Loading

0 comments on commit 3346151

Please sign in to comment.