fix test

Author: GregTrevellick

CHANGELOG.md

@@ -2,8 +2,12 @@
 
 These are the changes to each version that has been released in the Visual Studio Marketplace.
 
+## 1.1.43
+**2017-07-20**
+- [x] Addition of Open In Atom
+
 ## 1.1.41
-**2017-07-15**
+**2017-07-16**
 - [x] Addition of 'Open In ...' when folder node selected for all appropriate applications
 - [x] Addition of 'Open In ...' when project node selected for all appropriate applications
 - [x] Exclusion of \bin and \obj directories when 'Open In ...' project node selected

src/OpenInApp.Command/InvokeCommandCallBackDto.cs

@@ -19,6 +19,5 @@ public class InvokeCommandCallBackDto
         public bool SuppressTypicalFileExtensionsWarning { get; set; }
         public string TypicalFileExtensions { get; set; }
         public bool UseShellExecute { get; set; }
-        public bool WrapArgumentsWithQuotations { get; set; }
     }
 }

src/OpenInApp.Command/MenuItemCallBackHelper.cs

@@ -106,8 +106,7 @@ public PersistOptionsDto InvokeCommandCallBack(InvokeCommandCallBackDto dto)
                                         dto.SeparateProcessPerFileToBeOpened, 
                                         dto.UseShellExecute,
                                         dto.ArtefactTypeToOpen,
-                                        dto.ProcessWithinProcess,
-                                        dto.WrapArgumentsWithQuotations);
+                                        dto.ProcessWithinProcess);
                                 }
                             }
                         }

src/OpenInApp.Common.Tests/Helpers/GeneralOptionsHelperTests.cs

@@ -14,7 +14,7 @@ public class GeneralOptionsHelperTests
 
         [Test()]
         [TestCase(KeyToExecutableEnum.AltovaXMLSpy, @"C:\Program Files (x86)\Altova\XMLSpy2016\XMLSpy.exe")]
-        [TestCase(KeyToExecutableEnum.Atom, @"C:\Users\gtrev\AppData\Local\atom\atom.exe")]
+        [TestCase(KeyToExecutableEnum.Atom, OverrideAtTestExecutionTime)]
         [TestCase(KeyToExecutableEnum.ChromeCanary, OverrideAtTestExecutionTime)]
         //[TestCase(KeyToExecutableEnum.Emacs, null)]
         [TestCase(KeyToExecutableEnum.FirefoxDeveloperEdition, @"C:\Program Files\Firefox Developer Edition\firefox.exe")]
@@ -46,6 +46,9 @@ public void GetActualPathToExeTest(KeyToExecutableEnum keyToExecutableEnum, stri
 
                 switch (keyToExecutableEnum)
                 {
+                    case KeyToExecutableEnum.Atom:
+                        expected = Path.Combine(localApplicationData, @"atom\bin\atom.cmd");
+                        break;
                     case KeyToExecutableEnum.ChromeCanary:
                         expected = Path.Combine(localApplicationData, @"Google\Chrome SxS\Application\chrome.exe");
                         break;

src/OpenInApp.Common.Tests/Helpers/OpenInAppHelperTests.cs

@@ -150,7 +150,7 @@ private void InvokeApplication(KeyToExecutableEnum keyToExecutableEnum, string e
             artefactsToBeOpened = GetTestArtefactsToBeOpened(singleOrMultipleArtefacts, typ, dto, artefactsToBeOpened);
 
             // Act
-            OpenInAppHelper.InvokeCommand(artefactsToBeOpened, executableFullPath, dto.SeparateProcessPerFileToBeOpened, dto.UseShellExecute, dto.ArtefactTypeToOpen, dto.ProcessWithinProcess, dto.WrapArgumentsWithQuotations);
+            OpenInAppHelper.InvokeCommand(artefactsToBeOpened, executableFullPath, dto.SeparateProcessPerFileToBeOpened, dto.UseShellExecute, dto.ArtefactTypeToOpen, dto.ProcessWithinProcess);
         }
 
         private string executableFullPath { get; set; }

src/OpenInApp.Common/Helpers/ApplicationToOpenHelper.cs

@@ -44,7 +44,6 @@ public ApplicationToOpenDto GetApplicationToOpenDto(KeyToExecutableEnum keyToExe
                 SecondaryFilePathSegmentHasMultipleVersions = false,
                 SeparateProcessPerFileToBeOpened = true,
                 UseShellExecute = true,
-                WrapArgumentsWithQuotations = true,
             };
 
             switch (keyToExecutableEnum)
@@ -142,7 +141,6 @@ public ApplicationToOpenDto GetApplicationToOpenDto(KeyToExecutableEnum keyToExe
                     applicationToOpenDto.SecondaryFilePathSegment = @"atom\bin";
                     applicationToOpenDto.SeparateProcessPerFileToBeOpened = false;
                     applicationToOpenDto.UseShellExecute = false;
-//gregtt                    applicationToOpenDto.WrapArgumentsWithQuotations = false;
                     break;
                 case KeyToExecutableEnum.ChromeCanary:
                     applicationToOpenDto.SecondaryFilePathSegment = @"Google\Chrome SxS\Application";

src/OpenInApp.Common/Helpers/Dtos/ApplicationToOpenDto.cs

@@ -14,6 +14,5 @@ public class ApplicationToOpenDto
         public bool SecondaryFilePathSegmentHasMultipleVersions { get; set; }
         public bool SeparateProcessPerFileToBeOpened { get; set; } 
         public bool UseShellExecute { get; set; }
-                public bool WrapArgumentsWithQuotations { get; set; }//gregtt delete this
     }
 }

src/OpenInApp.Common/Helpers/OpenInAppHelper.cs

@@ -16,8 +16,7 @@ public static void InvokeCommand(
             bool separateProcessPerFileToBeOpened, 
             bool useShellExecute,//gregtt rename to OpenExeWithinItsWorkingDirectory
             ArtefactTypeToOpen artefactTypeToOpen,
-            bool processWithinProcess,
-            bool wrapArgumentsWithQuotations)
+            bool processWithinProcess)
         {
             string fileName;
             string workingDirectory = string.Empty;
@@ -36,7 +35,7 @@ public static void InvokeCommand(
             {
                 foreach (var actualArtefactToBeOpened in actualArtefactsToBeOpened)
                 {
-                    var argument = GetSingleArgument(actualArtefactToBeOpened, wrapArgumentsWithQuotations);
+                    var argument = GetSingleArgument(actualArtefactToBeOpened);
                     InvokeProcess(argument, fileName, useShellExecute, workingDirectory, processWithinProcess);
                 }
             }
@@ -46,7 +45,7 @@ public static void InvokeCommand(
 
                 foreach (var actualArtefactToBeOpened in actualArtefactsToBeOpened)
                 {
-                    arguments += GetSingleArgument(actualArtefactToBeOpened, wrapArgumentsWithQuotations);
+                    arguments += GetSingleArgument(actualArtefactToBeOpened);
                 }
 
                 arguments = arguments.TrimEnd(' ');
@@ -55,19 +54,9 @@ public static void InvokeCommand(
             }
         }
 
-        private static string GetSingleArgument(string argument, bool wrapArgumentsWithQuotations)
+        private static string GetSingleArgument(string argument)
         {
-            string result;
-
-            if (wrapArgumentsWithQuotations)
-            {
-                result = "\"" + argument + "\"";
-            }
-            else
-            {
-                result = argument;
-            }
-
+            var result = "\"" + argument + "\"";
             return result + " ";
         }
 

src/OpenInApp.Menu/MenuCore.cs

@@ -227,7 +227,6 @@ private InvokeCommandCallBackDto GetInvokeCommandCallBackDto(
                 SuppressTypicalFileExtensionsWarning = suppressTypicalFileExtensionsWarning,
                 TypicalFileExtensions = typicalFileExtensions,
                 UseShellExecute = applicationToOpenDto.UseShellExecute,
-                WrapArgumentsWithQuotations = applicationToOpenDto.WrapArgumentsWithQuotations,
             };
         }
     }