fix validate method for surrogate pairs and update test; remove whitelist tests

Author: jlindamood

src/StorageSync/StorageSync.Test/UnitTests/FilenamesCharactersValidationTest.cs

@@ -78,67 +78,6 @@ public void ItReturnsErrorOnFileWithInvalidCodePoint()
             Assert.StrictEqual<Result>(Result.Fail, validationResult.Result);
         }
 
-        /// <summary>
-        /// Defines the test method ItReturnsErrorWhenCodePointIsInBoundsOfRange.
-        /// </summary>
-        [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void ItReturnsErrorWhenCodePointIsInBoundsOfRange()
-        {
-            var configurationMockFactory = new Moq.Mock<IConfiguration>();
-            List<Configuration.CodePointRange> whitelist = new List<Configuration.CodePointRange> {
-                new Configuration.CodePointRange {
-                    Start = 0x00, 
-                    End = 0x77    // x - 1
-                },
-                new Configuration.CodePointRange {
-                    Start = 0x7B, // z + 1
-                    End = 0x10FFFF
-                },
-            };
-            configurationMockFactory.Setup(configuration => configuration.BlacklistOfCodePoints()).Returns(new List<int>());
-            FilenamesCharactersValidation validation = new FilenamesCharactersValidation(configurationMockFactory.Object);
-
-            var fileInfoMockFactory = new Moq.Mock<IFileInfo>();
-            fileInfoMockFactory.SetupGet(fileInfo => fileInfo.Name).Returns("AAAxAAAzAAA");
-            IValidationResult validationResult = validation.Validate(fileInfoMockFactory.Object);
-
-            Assert.StrictEqual<Result>(Result.Fail, validationResult.Result);
-            Assert.True(validationResult.Positions.Count == 2, $"Unexpected number of error positions");
-            Assert.True(validationResult.Positions[0] == 4, $"Unexpected position of first error");
-            Assert.True(validationResult.Positions[1] == 8, $"Unexpected position of second error");
-        }
-
-        /// <summary>
-        /// Defines the test method ItReturnsErrorWhenCodePointIsInMiddleOfRange.
-        /// </summary>
-        [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void ItReturnsErrorWhenCodePointIsInMiddleOfRange()
-        {
-            var configurationMockFactory = new Moq.Mock<IConfiguration>();
-            List<Configuration.CodePointRange> whitelist = new List<Configuration.CodePointRange> {
-                new Configuration.CodePointRange {
-                    Start = 0x00,
-                    End = 0x77    // x - 1
-                },
-                new Configuration.CodePointRange {
-                    Start = 0x7B, // z + 1
-                    End = 0x10FFFF
-                },
-            };
-
-            configurationMockFactory.Setup(configuration => configuration.BlacklistOfCodePoints()).Returns(new List<int>());
-            FilenamesCharactersValidation validation = new FilenamesCharactersValidation(configurationMockFactory.Object);
-
-            var fileInfoMockFactory = new Moq.Mock<IFileInfo>();
-            fileInfoMockFactory.SetupGet(fileInfo => fileInfo.Name).Returns("AAAyAAA");
-            IValidationResult validationResult = validation.Validate(fileInfoMockFactory.Object);
-
-            Assert.StrictEqual<Result>(Result.Fail, validationResult.Result);
-            Assert.True(validationResult.Positions.Count == 1, $"Unexpected number of error positions");
-            Assert.True(validationResult.Positions[0] == 4, $"Unexpected position of first error");
-        }
 
         /// <summary>
         /// Defines the test method TestWithRealConfigReturnsSuccessForValidSurrogateCodePoint.
@@ -171,16 +110,20 @@ public void TestWithRealConfigReturnsErrorForInvalidCodePoint()
             fileInfoMockFactory.SetupGet(fileInfo => fileInfo.Name).Returns(new string(new char[] {
                 'a',
                 (char)0xD834, (char)0xDD1E, // valid surrogate pair
-                (char)0xFFF0, // invalid codepoint
+                (char)0xD834, 'a', // invalid surrogate pair,
+                'a', (char)0xDD1E, // invalid surrogate pair,
+                (char)0xD834, 'a', // invalid surrogate pair,
                 'z',
                 (char)0x007C // blacklisted codepoint
             }));
             IValidationResult validationResult = validation.Validate(fileInfoMockFactory.Object);
 
             Assert.StrictEqual<Result>(Result.Fail, validationResult.Result);
-            Assert.True(validationResult.Positions.Count == 2, $"Unexpected number of error positions");
-            Assert.True(validationResult.Positions[0] == 3, $"Unexpected position of first error");
-            Assert.True(validationResult.Positions[1] == 5, $"Unexpected position of second error");
+            Assert.True(validationResult.Positions.Count == 4, $"Unexpected number of error positions");
+            Assert.True(validationResult.Positions[0] == 4, $"Unexpected position of first error");
+            Assert.True(validationResult.Positions[1] == 7, $"Unexpected position of second error");
+            Assert.True(validationResult.Positions[2] == 8, $"Unexpected position of third error");
+            Assert.True(validationResult.Positions[3] == 11, $"Unexpected position of fourth error");
         }
 
     }

src/StorageSync/StorageSync/Validations/NamespaceValidations/FilenamesCharactersValidation.cs

@@ -122,6 +122,7 @@ private IValidationResult ValidateInternal(INamedObjectInfo node, bool isDirecto
                 }
                 else if (char.IsHighSurrogate(prevChar) && !char.IsLowSurrogate(name[i]))
                 {
+                    --codepointIndex;
                     codePoint = name[i];
                     message = $"Invalid hight surrogate char found in the file name at location {i + 1}";
                 }
@@ -147,6 +148,8 @@ private IValidationResult ValidateInternal(INamedObjectInfo node, bool isDirecto
                     positions.Add(codepointIndex + 1);
                 }
 
+                codepointIndex = i;
+
                 if (!string.IsNullOrEmpty(message))
                 {
                     Trace.TraceInformation(message);