UTY-2126: deployment launcher window no longer accepts 33-chara… (#1202)

Author: Paul Balaji

CHANGELOG.md

@@ -16,6 +16,10 @@
 
 - Generated Worker ID's for local development are now smaller and easier to read for debugging. [#1197](https://github.com/spatialos/gdk-for-unity/pull/1197)
 
+### Fixed
+
+- Fixed a bug where the Deployment Launcher window would accept tags with 33 characters. [#1202](https://github.com/spatialos/gdk-for-unity/pull/1202)
+
 ### Internal
 
 - Cleaned up Subscriptions and Callbacks. [#1200](https://github.com/spatialos/gdk-for-unity/pull/1200)

workers/unity/Packages/io.improbable.gdk.deploymentlauncher/AssemblyInfo.cs

@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Improbable.Gdk.DeploymentLauncher.EditmodeTests")]

workers/unity/Packages/io.improbable.gdk.deploymentlauncher/AssemblyInfo.cs.meta

@@ -409,9 +409,9 @@ private bool ValidateSnapshotPath(out string message)
 
         private bool ValidateTag(string tag, out string message)
         {
-            if (!Regex.IsMatch(tag, "^[A-Za-z0-9][A-Za-z0-9_]{2,32}$"))
+            if (!Regex.IsMatch(tag, "^[A-Za-z0-9][A-Za-z0-9_]{2,31}$"))
             {
-                message = $"Tag \"{tag}\" invalid. Must conform to the regex: ^[A-Za-z0-9][A-Za-z0-9_]{{2,32}}$";
+                message = $"Tag \"{tag}\" invalid. Must conform to the regex: ^[A-Za-z0-9][A-Za-z0-9_]{{2,31}}$";
                 return false;
             }
 

workers/unity/Packages/io.improbable.gdk.deploymentlauncher/DeploymentConfigurations.cs

@@ -0,0 +1,39 @@
+using Improbable.Gdk.DeploymentLauncher.EditmodeTests.Utils;
+using NUnit.Framework;
+
+namespace Improbable.Gdk.DeploymentLauncher.EditmodeTests
+{
+    [TestFixture]
+    public class AssemblyConfigTests
+    {
+        private AssemblyConfig GetValidConfig()
+        {
+            return new AssemblyConfig
+            {
+                ProjectName = DeploymentConfigTestUtils.ValidProjectName,
+                AssemblyName = DeploymentConfigTestUtils.ValidAssemblyName
+            };
+        }
+
+        [Test]
+        public void AssemblyConfig_does_not_throw_error_when_valid()
+        {
+            Assert.IsNull(GetValidConfig().GetError());
+        }
+
+        [TestCase(null, DeploymentConfigErrorTypes.NullOrEmpty)]
+        [TestCase("", DeploymentConfigErrorTypes.NullOrEmpty)]
+        [TestCase("gdk", DeploymentConfigErrorTypes.Invalid)]
+        [TestCase("siebenhundertsiebenundsiebzigtausendsiebenhundertsiebenundsiebzig", DeploymentConfigErrorTypes.Invalid)]
+        public void AssemblyConfig_throws_error_for_invalid_assembly_name(string assemblyName, string errorType)
+        {
+            var config = GetValidConfig();
+            config.AssemblyName = assemblyName;
+            var error = config.GetError();
+
+            Assert.IsNotNull(error);
+            Assert.IsTrue(error.Contains("Assembly Name"));
+            Assert.IsTrue(error.Contains(errorType));
+        }
+    }
+}

workers/unity/Packages/io.improbable.gdk.deploymentlauncher/Tests.meta

@@ -0,0 +1,139 @@
+using System.Linq;
+using Improbable.Gdk.DeploymentLauncher.EditmodeTests.Utils;
+using NUnit.Framework;
+
+namespace Improbable.Gdk.DeploymentLauncher.EditmodeTests
+{
+    [TestFixture]
+    public class BaseDeploymentConfigTests
+    {
+        [Test]
+        public void BaseDeploymentConfig_does_not_throw_error_when_valid()
+        {
+            Assert.IsEmpty(DeploymentConfigTestUtils.GetValidBaseConfig().GetErrors());
+        }
+
+        [TestCase("demo_dpl_final")]
+        [TestCase("demo_dpl_final2")]
+        public void BaseDeploymentConfig_does_not_throw_error_for_valid_deployment_name(string deploymentName)
+        {
+            var config = DeploymentConfigTestUtils.GetValidBaseConfig();
+            config.Name = deploymentName;
+
+            Assert.IsEmpty(config.GetErrors());
+        }
+
+        [TestCase(null, DeploymentConfigErrorTypes.NullOrEmpty)]
+        [TestCase("", DeploymentConfigErrorTypes.NullOrEmpty)]
+        [TestCase("#badname!", DeploymentConfigErrorTypes.Invalid)]
+        public void BaseDeploymentConfig_throws_error_for_invalid_deployment_name(string invalidName, string errorType)
+        {
+            var config = DeploymentConfigTestUtils.GetValidBaseConfig();
+            config.Name = invalidName;
+            var errors = config.GetErrors().ToArray();
+
+            Assert.AreEqual(errors.Length, 1, "Failed: did not throw exactly one error.");
+            Assert.IsTrue(errors[0].Contains("Deployment Name"));
+            Assert.IsTrue(errors[0].Contains(errorType));
+        }
+
+        [TestCase("default_launch.json")]
+        [TestCase("cloud_launch.json")]
+        public void BaseDeploymentConfig_does_not_throw_error_for_valid_launch_json_path(string launchJson)
+        {
+            var config = DeploymentConfigTestUtils.GetValidBaseConfig();
+            config.LaunchJson = launchJson;
+
+            Assert.IsEmpty(config.GetErrors());
+        }
+
+        [TestCase(null, DeploymentConfigErrorTypes.NullOrEmpty)]
+        [TestCase("", DeploymentConfigErrorTypes.NullOrEmpty)]
+        [TestCase("this/launch/config/does/not/exist.json", DeploymentConfigErrorTypes.NotFound)]
+        public void BaseDeploymentConfig_throws_error_for_invalid_launch_json_path(string launchJson, string errorType)
+        {
+            var config = DeploymentConfigTestUtils.GetValidBaseConfig();
+            config.LaunchJson = launchJson;
+            var errors = config.GetErrors().ToArray();
+
+            Assert.AreEqual(errors.Length, 1, "Failed: did not throw exactly one error.");
+            Assert.IsTrue(errors[0].Contains("Launch Config"));
+            Assert.IsTrue(errors[0].Contains(errorType));
+        }
+
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("snapshots/default.snapshot")]
+        public void BaseDeploymentConfig_does_not_throw_error_for_valid_snapshot_path(string snapshotPath)
+        {
+            var config = DeploymentConfigTestUtils.GetValidBaseConfig();
+            config.SnapshotPath = snapshotPath;
+
+            Assert.IsEmpty(config.GetErrors());
+        }
+
+        [TestCase("this/snapshot/path/does/not/exist.snapshot")]
+        public void BaseDeploymentConfig_throws_error_for_invalid_snapshot_path(string snapshotPath)
+        {
+            var config = DeploymentConfigTestUtils.GetValidBaseConfig();
+            config.SnapshotPath = snapshotPath;
+            var errors = config.GetErrors().ToArray();
+
+            Assert.AreEqual(errors.Length, 1, "Failed: did not throw exactly one error.");
+            Assert.IsTrue(errors[0].Contains("Snapshot"));
+            Assert.IsTrue(errors[0].Contains(DeploymentConfigErrorTypes.NotFound));
+        }
+
+        [TestCase("dev_login")]
+        [TestCase("quinquagintaquadringentillionths")]
+        public void BaseDeploymentConfig_does_not_throw_error_for_valid_tag(string validTag)
+        {
+            var config = DeploymentConfigTestUtils.GetValidBaseConfig();
+            config.Tags.Add(validTag);
+
+            Assert.IsEmpty(config.GetErrors());
+        }
+
+        [TestCase("_invalidtag")]
+        [TestCase("f")]
+        [TestCase("gg")]
+        [TestCase("quinquagintaquadringentillionthss")]
+        [TestCase("supercalifragilisticexpialidocious")]
+        public void BaseDeploymentConfig_throws_error_for_invalid_tag(string invalidTag)
+        {
+            var config = DeploymentConfigTestUtils.GetValidBaseConfig();
+            config.Tags.Add(invalidTag);
+            var errors = config.GetErrors().ToArray();
+
+            Assert.AreEqual(errors.Length, 1, "Failed: did not throw exactly one error.");
+            Assert.IsTrue(errors[0].Contains("Tag"));
+            Assert.IsTrue(errors[0].Contains(DeploymentConfigErrorTypes.Invalid));
+        }
+
+        [Test]
+        public void BaseDeploymentConfig_throws_N_errors_for_N_invalid_tags()
+        {
+            var config = DeploymentConfigTestUtils.GetValidBaseConfig();
+
+            //5 invalid tags
+            config.Tags.AddRange(new[]
+            {
+                "_invalidtag",
+                "f",
+                "gg",
+                "quinquagintaquadringentillionthss",
+                "supercalifragilisticexpialidocious"
+            });
+
+            var errors = config.GetErrors().ToArray();
+
+            Assert.AreEqual(errors.Length, 5, "Failed: did not throw exactly five errors.");
+
+            foreach (var error in errors)
+            {
+                Assert.IsTrue(error.Contains("Tag"));
+                Assert.IsTrue(error.Contains("invalid"));
+            }
+        }
+    }
+}