icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-13 03:35:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: IcdUriBuilder constructors behave closer to UriBuilder, Host defaults to "localhost"

Browse Source
This commit is contained in:
Chris Cameron
2019-05-01 17:05:22 -04:00
parent 78c20201ab
commit 33b1d29781
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ICD.Common.Utils.Tests/IcdUriBuilderTest.cs
View File

@@ -63,14 +63,15 @@ namespace ICD.Common.Utils.Tests
#endregion
[TestCase("http:///", null, null, null, null, (ushort)0, null, null, null)]
[TestCase("http://localhost:80/", null, "localhost", null, null, (ushort)80, null, null, null)]
[TestCase("http://username@localhost/", null, "localhost", null, null, (ushort)0, null, null, "username")]
[TestCase("http://localhost/", null, "localhost", "password", null, (ushort)0, null, null, null)]
[TestCase("/", null, null, null, null, (ushort)0, null, null, null)]
[TestCase("http:///", null, null, null, null, (ushort)0, null, "http", null)]
[TestCase("http://localhost:80/", null, "localhost", null, null, (ushort)80, null, "http", null)]
[TestCase("http://username@localhost/", null, "localhost", null, null, (ushort)0, null, "http", "username")]
[TestCase("http://localhost/", null, "localhost", "password", null, (ushort)0, null, "http", null)]
[TestCase("https://localhost/", null, "localhost", null, null, (ushort)0, null, "https", null)]
[TestCase("http://localhost/test", null, "localhost", null, "test", (ushort)0, null, null, null)]
[TestCase("http://localhost/test", null, "localhost", null, "/test", (ushort)0, null, null, null)]
[TestCase("http://localhost//test", null, "localhost", null, "//test", (ushort)0, null, null, null)]
[TestCase("http://localhost/test", null, "localhost", null, "test", (ushort)0, null, "http", null)]
[TestCase("http://localhost/test", null, "localhost", null, "/test", (ushort)0, null, "http", null)]
[TestCase("http://localhost//test", null, "localhost", null, "//test", (ushort)0, null, "http", null)]
public void ToStringTest(string expected, string fragment, string address, string password, string path, ushort port,
string query, string scheme, string userName)
{

12
ICD.Common.Utils/IcdUriBuilder.cs
View File

@@ -107,20 +107,20 @@ namespace ICD.Common.Utils
/// <returns></returns>
public override string ToString()
{
// URI = scheme:[//authority]path[?query][#fragment]
// URI = [scheme://][authority]path[?query][#fragment]
// authority = [userinfo@]host[:port]
// userinfo = username[:password]
StringBuilder builder = new StringBuilder();
// Scheme
string scheme = string.IsNullOrEmpty(Scheme) ? Uri.UriSchemeHttp : Scheme;
builder.Append(scheme);
builder.Append(':');
if (!string.IsNullOrEmpty(Scheme))
{
builder.Append(Scheme);
builder.Append("://");
}
// Authority
builder.Append("//");
if (!string.IsNullOrEmpty(UserName))
{
builder.Append(UserName);