* cr changes

Author: prupipho

code/src/CoreTemplateStudio/CoreTemplateStudio.Core/Resources/StringRes.Designer.cs

@@ -158,11 +158,11 @@
     <comment>{0}: Source File Path, {1}: Destination folder name, {2}: Error</comment>
   </data>
   <data name="FsSafeDeleteDirectoryMessage" xml:space="preserve">
-    <value>The folder {0} can't be delete. Error: {1}</value>
+    <value>The folder {0} can't be deleted. Error: {1}</value>
     <comment>{0}: Folder Name, {1}: Error</comment>
   </data>
   <data name="FsSafeDeleteFileMessage" xml:space="preserve">
-    <value>The file {0} can't be delete. Error: {1}</value>
+    <value>The file {0} can't be deleted. Error: {1}</value>
     <comment>{0}: File Path, {1}: Error</comment>
   </data>
   <data name="FsSafeMoveDirectoryMessage" xml:space="preserve">
@@ -438,7 +438,7 @@ The following changes could not be integrated: {2}
     <value>Templates local path is empty.</value>
   </data>
   <data name="FsSafeRenameDirectoryMessage" xml:space="preserve">
-    <value>The folder {0} can't be rename. Error: {1}</value>
+    <value>The folder {0} can't be renamed. Error: {1}</value>
     <comment>{0}: Folder Name, {1}: Error</comment>
   </data>
   <data name="TemplatesSynchronizationErrorDownloadingConfig" xml:space="preserve">

code/src/CoreTemplateStudio/CoreTemplateStudio.Core/Resources/StringRes.resx

@@ -117,22 +117,6 @@ public bool IsErrorMessageInLogFile(DateTime logDate, string errorLevel, string
             return false;
         }
 
-        public bool IsErrorAddedRecentlyInLogFile(DateTime logDate)
-        {
-            if (File.Exists(LogFile))
-            {
-                var lastModifiedWriteTime = File.GetLastWriteTime(LogFile);
-
-                var timeSinceLastEdit = logDate - lastModifiedWriteTime;
-                if (timeSinceLastEdit.Seconds < 30)
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
         [SuppressMessage("Usage", "CA1816:Dispose methods should call SuppressFinalize", Justification = "Testing purposes only")]
         public void Dispose()
         {

code/test/CoreTemplateStudio.Core.Test/Helpers/FSTestsFixture.cs

@@ -90,7 +90,8 @@ public void EnsureFileEditable_FileIsNotReadOnly_ShouldNotModifyIsReadOnly()
             Fs.EnsureFileEditable(filePath);
             var newFileInfo = new FileInfo(filePath);
 
-            Assert.Equal(newFileInfo.IsReadOnly, originalFileInfo.IsReadOnly);
+            Assert.False(originalFileInfo.IsReadOnly);
+            Assert.False(newFileInfo.IsReadOnly);
         }
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA1816:Dispose methods should call SuppressFinalize", Justification = "Testing purposes only")]

code/test/CoreTemplateStudio.Core.Test/Helpers/FsTests/EnsureFileEditableTests.cs

@@ -18,6 +18,10 @@ public class SafeDeleteDirectoryTests : IDisposable
     {
         private readonly FSTestsFixture _fixture;
         private readonly string _testFolder;
+        private DateTime _logDate;
+
+        private const string ErrorMessage = "can't be deleted";
+        private const string ErrorLevel = "Warning";
 
         public SafeDeleteDirectoryTests(FSTestsFixture fixture)
         {
@@ -61,6 +65,28 @@ public void SafeDeleteDirectory_WrongFolder_ShouldNotThrowException()
             Fs.SafeDeleteDirectory(wrongDirectoryToDelete, false);
         }
 
+        [Fact]
+        public void SafeDeleteDirectory_NoPermissions_ShouldLogException()
+        {
+            var noPermissionsDirectory = Environment.CurrentDirectory;
+
+            _logDate = DateTime.Now;
+            Fs.SafeDeleteDirectory(noPermissionsDirectory);
+
+            Assert.True(_fixture.IsErrorMessageInLogFile(_logDate, ErrorLevel, ErrorMessage));
+        }
+
+        [Fact]
+        public void SafeDeleteDirectory_NoPermissions_NotWarnOnFailure_ShouldNotThrowException()
+        {
+            var noPermissionsDirectory = Environment.CurrentDirectory;
+
+            _logDate = DateTime.Now;
+            Fs.SafeDeleteDirectory(noPermissionsDirectory, false);
+
+            Assert.False(_fixture.IsErrorMessageInLogFile(_logDate, ErrorLevel, ErrorMessage));
+        }
+
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA1816:Dispose methods should call SuppressFinalize", Justification = "Testing purposes only")]
         public void Dispose()
         {

code/test/CoreTemplateStudio.Core.Test/Helpers/FsTests/SafeDeleteDirectoryTests.cs

@@ -21,7 +21,7 @@ public class SafeDeleteFileTests : IDisposable
         private readonly string _testFolder;
 
         private DateTime _logDate;
-        private const string ErrorMessage = "can't be delete";
+        private const string ErrorMessage = "can't be deleted";
         private const string ErrorLevel = "Warning";
 
         public SafeDeleteFileTests(FSTestsFixture fixture)

code/test/CoreTemplateStudio.Core.Test/Helpers/FsTests/SafeDeleteFileTests.cs

@@ -22,7 +22,7 @@ public class SafeRenameDirectoryTests : IDisposable
 
         private DateTime _logDate;
 
-        private const string ErrorMessage = "can't be rename";
+        private const string ErrorMessage = "can't be renamed";
         private const string ErrorLevel = "Warning";
 
         public SafeRenameDirectoryTests(FSTestsFixture fixture)
@@ -72,13 +72,14 @@ public void SafeRenameDirectory_DirectoryAlreadyExists_ShouldLogException()
 
             var totalOriginalDirectories = Directory.GetParent(originalDirectory).GetDirectories().Length;
 
+            _logDate = DateTime.Now;
             Fs.SafeRenameDirectory(originalDirectory, renamedDirectory);
 
             var totalNewDirectories = Directory.GetParent(originalDirectory).GetDirectories().Length;
 
             var sameNumberOfDirectories = totalNewDirectories == totalOriginalDirectories;
             Assert.True(sameNumberOfDirectories);
-            Assert.True(_fixture.IsErrorAddedRecentlyInLogFile(_logDate));
+            Assert.True(_fixture.IsErrorMessageInLogFile(_logDate, ErrorLevel, $"{testScenarioName}_Original {ErrorMessage}"));
         }
 
         [Fact]