cover tests for #184

Author: endel

Assets/Colyseus/Runtime/Scripts/ColyseusRequest.cs

@@ -151,7 +151,7 @@ public UriBuilder GetUriBuilder(string path, string query = "")
             return uriBuilder;
         }
 
-        private string GetWebRequestURL(string path, string query = "")
+        public string GetWebRequestURL(string path, string query = "")
         {
 
             return GetUriBuilder(path, query).ToString();

Assets/Colyseus/Runtime/Scripts/Settings/ColyseusSettings.cs

@@ -155,15 +155,14 @@ public int DetermineServerPort()
 	        }
 	        else
 	        {
-		        Debug.LogError($"Get Web Request Endpoint - Error parsing server port: \"{colyseusServerPort}\"");
-
+		        //Debug.LogError($"Get Web Request Endpoint - Error parsing server port: \"{colyseusServerPort}\"");
 		        return -1;
 	        }
         }
 
         private bool ShouldIncludeServerPort()
         {
-	        return !string.IsNullOrEmpty(colyseusServerPort) && !string.Equals(colyseusServerPort, "80");
+	        return !string.IsNullOrEmpty(colyseusServerPort) && !string.Equals(colyseusServerPort, "80") && !string.Equals(colyseusServerPort, "443");
         }
 	}
 }

Assets/Colyseus/Tests/Editor/ColyseusTests/ColyseusRequestTest.cs

@@ -0,0 +1,81 @@
+using NUnit.Framework;
+using UnityEngine;
+
+public class ColyseusRequestTest
+{
+
+	[SetUp]
+	public void Init()
+	{
+
+	}
+
+	[TearDown]
+	public void Dispose()
+	{
+
+	}
+
+	[Test]
+	public void UnsecureRootPathWithPortTest()
+	{
+		var settings = new Colyseus.ColyseusSettings();
+		settings.colyseusServerAddress = "localhost";
+		settings.colyseusServerPort = "2567";
+		settings.useSecureProtocol = false;
+
+		var request = new Colyseus.ColyseusRequest(settings);
+		Assert.AreEqual("http://localhost:2567/", request.GetUriBuilder("").ToString());
+	}
+
+	[Test]
+	public void UnsecureChildPathWithPortTest()
+	{
+		var settings = new Colyseus.ColyseusSettings();
+		settings.colyseusServerAddress = "localhost/path";
+		settings.colyseusServerPort = "2567";
+		settings.useSecureProtocol = false;
+
+		var request = new Colyseus.ColyseusRequest(settings);
+		Assert.AreEqual("http://localhost:2567/path/", request.GetUriBuilder("").ToString());
+	}
+
+	[Test]
+	public void UnsecureChildPathNoPortTest()
+	{
+		var settings = new Colyseus.ColyseusSettings();
+		settings.colyseusServerAddress = "localhost/path";
+		settings.colyseusServerPort = "80";
+		settings.useSecureProtocol = false;
+
+		var request = new Colyseus.ColyseusRequest(settings);
+		Assert.AreEqual("http://localhost/path/", request.GetUriBuilder("").ToString());
+	}
+
+
+	[Test]
+	public void SecureChildPathNoPortTest()
+	{
+		var settings = new Colyseus.ColyseusSettings();
+		settings.colyseusServerAddress = "localhost/path";
+		settings.colyseusServerPort = "443";
+		settings.useSecureProtocol = true;
+
+		var request = new Colyseus.ColyseusRequest(settings);
+		Assert.AreEqual("https://localhost/path/", request.GetUriBuilder("").ToString());
+	}
+
+	[Test]
+	public void SecureChildPathWithPortTest()
+	{
+		var settings = new Colyseus.ColyseusSettings();
+		settings.colyseusServerAddress = "localhost";
+		settings.colyseusServerPort = "8080";
+		settings.useSecureProtocol = true;
+
+		var request = new Colyseus.ColyseusRequest(settings);
+		Assert.AreEqual("https://localhost:8080/", request.GetUriBuilder("").ToString());
+	}
+
+
+}