Update class name and conditions

Author: StanleyGoldman

src/GitHub.Api/GitHub.Api.csproj

@@ -104,7 +104,7 @@
     <Compile Include="Application\ApplicationManagerBase.cs" />
     <Compile Include="Helpers\Constants.cs" />
     <Compile Include="Cache\IBranchCache.cs" />
-    <Compile Include="Helpers\RegularExpressions.cs" />
+    <Compile Include="Helpers\Validation.cs" />
     <Compile Include="Platform\DefaultEnvironment.cs" />
     <Compile Include="Extensions\EnvironmentExtensions.cs" />
     <Compile Include="Extensions\FileEventExtensions.cs" />

src/GitHub.Api/Helpers/RegularExpressions.cs renamed to src/GitHub.Api/Helpers/Validation.cs

@@ -1,26 +1,24 @@
-using System.Text.RegularExpressions;
+using System;
+using System.Text.RegularExpressions;
 
 namespace GitHub.Unity.Helpers
 {
-    public static class RegularExpressions
-    {
-        public static readonly Regex BranchNameRegex = new Regex(@"^(?<name>[\.\w\d\/\-_]+)$");
-    }
-
-    public static class BranchNameValidator
+    public static class Validation
     {
         public static bool IsBranchNameValid(string branchName)
         {
-            return !string.IsNullOrEmpty(branchName)
+            return !String.IsNullOrEmpty(branchName)
                 && !branchName.Equals(".")
                 && !branchName.StartsWith("/")
                 && !branchName.EndsWith("/")
+                && !branchName.StartsWith(".")
                 && !branchName.EndsWith(".")
                 && !branchName.Contains("//")
                 && !branchName.Contains(@"\")
                 && !branchName.EndsWith(".lock")
-                && !(branchName.StartsWith(".") && branchName.Contains("/"))
-                && RegularExpressions.BranchNameRegex.IsMatch(branchName);
+                && BranchNameRegex.IsMatch(branchName);
         }
+
+        public static readonly Regex BranchNameRegex = new Regex(@"^(?<name>[\.\w\d\/\-_]+)$");
     }
 }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs

@@ -454,7 +454,7 @@ private void OnCreateGUI()
                     var cancelCreate = false;
                     var cannotCreate = selectedNode == null ||
                                        selectedNode.Type == NodeType.Folder ||
-                                       !BranchNameValidator.IsBranchNameValid(newBranchName);
+                                       !Validation.IsBranchNameValid(newBranchName);
 
                     // Create on return/enter or cancel on escape
                     var offsetID = GUIUtility.GetControlID(FocusType.Passive);

src/tests/UnitTests/Git/BranchNameValidationTests.cs renamed to src/tests/UnitTests/Git/ValidationTests.cs

@@ -7,7 +7,7 @@
 namespace UnitTests
 {
     [TestFixture]
-    public class BranchNameValidatorTests
+    public class ValidationTests
     {
         [TestCase(true, "feature1", TestName = "Branch name is valid")]
         [TestCase(true, "feature-1", TestName = "Branch name with hyphen is valid")]
@@ -29,16 +29,15 @@ public class BranchNameValidatorTests
         [TestCase(false, ".", TestName = "Single character cannot be [period]")]
         [TestCase(true, "features/feature-1", TestName = "Folder and branch name is valid")]
         [TestCase(false, @"features\feature-1", TestName = "Backslash is not a valid character")]
-        [TestCase(true, ".hidden", TestName = "Branch name is valid when starting with [period]")]
-        [TestCase(false, ".features/feature-1", TestName = "Folder and branch name is not valid when starting with [period]")]
+        [TestCase(false, ".hidden", TestName = "Branch name is not valid when starting with [period]")]
         [TestCase(false, "features//feature-1", TestName = "Multiple consecutive slashes are not valid")]
         [TestCase(false, null, TestName = "null string is not valid")]
         [TestCase(false, "", TestName = "Empty string is not valid")]
         [TestCase(false, "/", TestName = "Single slash is not valid")]
         [TestCase(false, "asdf@{", TestName = "Sequence @{ is not valid")]
         public void TestFeatureString(bool isValid, string branch)
         {
-            BranchNameValidator.IsBranchNameValid(branch).Should().Be(isValid);
+            Validation.IsBranchNameValid(branch).Should().Be(isValid);
         }
 
         [TestCase(true, 65, 65, 65, TestName = "Can test with ascii values")]
@@ -47,7 +46,7 @@ public void TestFeatureString(bool isValid, string branch)
         public void TestFeatureStringFromAsciiArray(bool isValid, params int[] asciiValues)
         {
             var branch = new string(asciiValues.Select(Convert.ToChar).ToArray());
-            BranchNameValidator.IsBranchNameValid(branch).Should().Be(isValid);
+            Validation.IsBranchNameValid(branch).Should().Be(isValid);
         }
     }
 }

src/tests/UnitTests/UnitTests.csproj

@@ -81,7 +81,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Authentication\KeychainTests.cs" />
-    <Compile Include="Git\BranchNameValidationTests.cs" />
+    <Compile Include="Git\ValidationTests.cs" />
     <Compile Include="Git\GitConfigTests.cs" />
     <Compile Include="IO\BranchListOutputProcessorTests.cs" />
     <Compile Include="Extensions\EnvironmentExtensionTests.cs" />