changes the generation logif for linq scripts

Author: codingadventures

Src/BridgeVs.DynamicVisualizers/DynamicDebuggerVisualizer.cs

@@ -70,14 +70,13 @@ internal void DeployLinqScript(Message message, string vsVersion)
                     FS.FileSystem.Directory.CreateDirectory(targetFolder);
 
                 string fileName = FindAvailableFileName(targetFolder, message.FileName);
-
-                string linqPadScriptFilePath = Path.Combine(targetFolder, message.FileName);
-                Log.Write("linqPadScriptPath: {0}", linqPadScriptFilePath);
+                 
+                Log.Write("linqPadScriptPath: {0}", fileName);
 
                 Inspection linqQuery = new Inspection(message);
                 string linqQueryText = linqQuery.TransformText();
 
-                FS.FileSystem.File.WriteAllText(linqPadScriptFilePath, linqQueryText);
+                FS.FileSystem.File.WriteAllText(fileName, linqQueryText);
 
                 Log.Write("LinqQuery Successfully deployed");
             }
@@ -89,7 +88,7 @@ internal void DeployLinqScript(Message message, string vsVersion)
             }
         }
 
-        private string FindAvailableFileName(string targetFolder, string fileName)
+        private static string FindAvailableFileName(string targetFolder, string fileName)
         {
             int fileCount = 0;
             string path = Path.Combine(targetFolder, fileName);

Test/BridgeVs.UnitTest/Build/Tasks/MapperBuildTest.cs

@@ -48,9 +48,9 @@ public class MapperBuildTest
         private const string VsVersion15 = "15.0";
 
         private static readonly MockFileSystem MockFileSystem = new MockFileSystem(new Dictionary<string, MockFileData>
-    {
-        { DebuggerVisualizerAssemblyLocation, new MockFileData(DebuggerVisualizerAssemblyByte) }
-    });
+        {
+            {DebuggerVisualizerAssemblyLocation, new MockFileData(DebuggerVisualizerAssemblyByte)}
+        });
 
         private static string AssemblyModelLocation => typeof(CustomType1).Assembly.Location;
 
@@ -110,13 +110,7 @@ public void Init()
             Isolate.WhenCalled(() => CommonRegistryConfigurations.IsErrorTrackingEnabled("")).WillReturn(false);
             Isolate.WhenCalled(() => CommonRegistryConfigurations.IsLoggingEnabled("")).WillReturn(false);
         }
-
-        //[TestCleanup]
-        //public void TestCleanup()
-        //{
-            
-        //}
-
+        
         [TestMethod]
         [TestCategory("UnitTest")]
         public void Mapper_Build_Test_V11_Should_Succeed()

Test/BridgeVs.UnitTest/DynamicVisualizers/DynamicDebuggerVisualizerTest.cs

@@ -23,31 +23,29 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Abstractions;
-using System.IO.Abstractions.TestingHelpers;
-using System.Linq;
-using System.Text.RegularExpressions;
 using BridgeVs.DynamicVisualizers;
 using BridgeVs.DynamicVisualizers.Template;
 using BridgeVs.Shared.Common;
-using BridgeVs.Shared.FileSystem;
 using BridgeVs.Shared.Options;
 using BridgeVs.UnitTest.Model;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Abstractions.TestingHelpers;
+using System.Linq;
+using System.Text.RegularExpressions;
 using TypeMock.ArrangeActAssert;
+using FS = BridgeVs.Shared.FileSystem.FileSystemFactory;
 
 namespace BridgeVs.UnitTest.DynamicVisualizers
 {
     [TestClass]
+    [Isolated]
     public class DynamicDebuggerVisualizerTest
     {
-        private readonly Message _message = new Message(Guid.NewGuid().ToString(), SerializationOption.BinarySerializer, typeof(CustomType1));
-
-        private static IFileSystem _fileSystem;
-
+        private static readonly Message Message = new Message(Guid.NewGuid().ToString(), SerializationOption.BinarySerializer, typeof(CustomType1));
+        private static readonly MockFileSystem MockFileSystem = new MockFileSystem(new Dictionary<string, MockFileData>());
         private const string AnonymousListLinqScript = @"
         <Query Kind=""Program"">
         <Namespace>System</Namespace>
@@ -85,27 +83,43 @@ void Main()
         [ClassInitialize]
         public static void Init(TestContext ctx)
         {
-            _fileSystem = new MockFileSystem(new Dictionary<string, MockFileData>
-            {
-                { @"c:\myfile.txt", new MockFileData("Testing is meh.") },
-                { @"c:\demo\jQuery.js", new MockFileData("some js") },
-                { @"c:\demo\image.gif", new MockFileData(new byte[] { 0x12, 0x34, 0x56, 0xd2 }) }
-            });
-            Isolate.WhenCalled(() => FileSystemFactory.FileSystem).WillReturn(_fileSystem);
+            string dstScriptPath = CommonFolderPaths.DefaultLinqPadQueryFolder;
+
+            string targetFolder = Path.Combine(dstScriptPath, Message.AssemblyName);
+            MockFileSystem.AddDirectory(targetFolder);
+
+            Isolate.WhenCalled(() => FS.FileSystem).WillReturn(MockFileSystem);
         }
 
         [TestMethod]
         [TestCategory("UnitTest")]
         public void DeployLinqScriptTest()
         {
             DynamicDebuggerVisualizer cVisualizerObjectSource = new DynamicDebuggerVisualizer();
-            cVisualizerObjectSource.DeployLinqScript(_message, "15.0");
+            cVisualizerObjectSource.DeployLinqScript(Message, "15.0");
+
+            string dstScriptPath = CommonFolderPaths.DefaultLinqPadQueryFolder;
+
+            string fileNamePath = Path.Combine(dstScriptPath, Message.AssemblyName, Message.FileName);
+
+            Assert.IsTrue(FS.FileSystem.File.Exists(fileNamePath + ".linq"));
+        }
+
+        [TestMethod]
+        [TestCategory("UnitTest")]
+        public void DeployLinqScriptTest_Duplicate()
+        {
 
             string dstScriptPath = CommonFolderPaths.DefaultLinqPadQueryFolder;
+            string targetFolder = Path.Combine(dstScriptPath, Message.AssemblyName);
+            MockFileSystem.AddFile(Path.Combine(targetFolder, Message.FileName + ".linq"), new MockFileData(""));
 
-            string fileNamePath = Path.Combine(dstScriptPath, _message.AssemblyName, _message.FileName);
+            DynamicDebuggerVisualizer cVisualizerObjectSource = new DynamicDebuggerVisualizer();
+            cVisualizerObjectSource.DeployLinqScript(Message, "15.0");
+
+            string fileNamePath = Path.Combine(dstScriptPath, Message.AssemblyName, Message.FileName);
 
-            Assert.IsTrue(_fileSystem.File.Exists(fileNamePath));
+            Assert.IsTrue(FS.FileSystem.File.Exists(fileNamePath + "_1.linq"));
         }
 
         [TestMethod]
@@ -124,7 +138,7 @@ public void InspectionTransformTest_AnonymousType()
             Inspection linqQuery = new Inspection(message);
             string linqQueryText = linqQuery.TransformText();
 
-            bool linqIsEqual = CompareNormalisedString(linqQueryText, linqToCompare);
+            bool linqIsEqual = CompareNormalizedString(linqQueryText, linqToCompare);
             Assert.IsTrue(linqIsEqual);
         }
 
@@ -141,11 +155,11 @@ public void InspectionTransformTest_StrongType()
             Inspection linqQuery = new Inspection(message);
             string linqQueryText = linqQuery.TransformText();
 
-            bool linqIsEqual = CompareNormalisedString(linqQueryText, linqToCompare);
+            bool linqIsEqual = CompareNormalizedString(linqQueryText, linqToCompare);
             Assert.IsTrue(linqIsEqual);
         }
-        
-        private static bool CompareNormalisedString(string str1, string str2)
+
+        private static bool CompareNormalizedString(string str1, string str2)
         {
             string normalized1 = Regex.Replace(str1, @"\s", "");
             string normalized2 = Regex.Replace(str2, @"\s", "");