Merge branch 'master' into fix-160

Author: JeremyTCD

test/NodeJS/NodeJSServiceImplementations/OutOfProcess/Http/HttpNodeJSPoolServiceIntegrationTests.cs

@@ -9,6 +9,7 @@
 using System.Linq;
 using System.Net.Http;
 using System.Text;
+using System.Text.Encodings.Web;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -93,24 +94,25 @@ public async void FileWatching_RespectsGracefulShutdownOptionWhenItsTrue()
             const int dummyNumProcesses = 5;
             Uri tempWatchDirectoryUri = CreateWatchDirectoryUri();
             // Create initial module
-            string dummylongRunningTriggerPath = new Uri(tempWatchDirectoryUri, "dummyTriggerFile").AbsolutePath; // fs.watch can't deal with backslashes in paths
+            string dummylongRunningTriggerPath = new Uri(tempWatchDirectoryUri, "dummyTriggerFile").LocalPath; // Use LocalPath instead of AbsolutePath, the latter performs URL encoding, which results in paths that are invalid for local use
 #if NET461
             File.WriteAllText(dummylongRunningTriggerPath, string.Empty); // fs.watch returns immediately if path to watch doesn't exist
 #else
             await File.WriteAllTextAsync(dummylongRunningTriggerPath, string.Empty).ConfigureAwait(false); // fs.watch returns immediately if path to watch doesn't exist
 #endif
+            // JavascriptEncode.Default.Encode encodes a string so that it can be used as a string literal in Javascript
             string dummyInitialModule = $@"module.exports = {{
     getPid: (callback) => callback(null, process.pid),
     longRunning: (callback) => {{
-        fs.watch('{dummylongRunningTriggerPath}', 
+        fs.watch('{JavaScriptEncoder.Default.Encode(dummylongRunningTriggerPath)}', 
             null, 
             () => {{
                 callback(null, process.pid);
             }}
         );
     }}
 }}";
-            string dummyModuleFilePath = new Uri(tempWatchDirectoryUri, "dummyModule.js").AbsolutePath;
+            string dummyModuleFilePath = new Uri(tempWatchDirectoryUri, "dummyModule.js").LocalPath;
 #if NET461
             File.WriteAllText(dummyModuleFilePath, dummyInitialModule);
 #else
@@ -194,7 +196,7 @@ public async void FileWatching_RespectsGracefulShutdownOptionWhenItsFalse()
     getPid: (callback) => callback(null, process.pid),
     longRunning: (callback) => setInterval(() => { /* Do nothing */ }, 1000)
 }";
-            string dummyModuleFilePath = new Uri(CreateWatchDirectoryUri(), "dummyModule.js").AbsolutePath;
+            string dummyModuleFilePath = new Uri(CreateWatchDirectoryUri(), "dummyModule.js").LocalPath;
 #if NET461
             File.WriteAllText(dummyModuleFilePath, dummyInitialModule);
 #else

test/NodeJS/NodeJSServiceImplementations/OutOfProcess/Http/HttpNodeJSServiceIntegrationTests.cs

@@ -10,6 +10,7 @@
 using System.Net.Http;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Text.Encodings.Web;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -1106,24 +1107,25 @@ public async void FileWatching_RespectsGracefulShutdownOptionWhenItsTrue()
             // Arrange
             Uri tempWatchDirectoryUri = CreateWatchDirectoryUri();
             // Create initial module
-            string dummylongRunningTriggerPath = new Uri(tempWatchDirectoryUri, "dummyTriggerFile").AbsolutePath; // fs.watch can't deal with backslashes in paths
+            string dummylongRunningTriggerPath = new Uri(tempWatchDirectoryUri, "dummyTriggerFile").LocalPath; // Use LocalPath instead of AbsolutePath, the latter performs URL encoding, which results in paths that are invalid for local use
 #if NET461
             File.WriteAllText(dummylongRunningTriggerPath, string.Empty); // fs.watch returns immediately if path to watch doesn't exist
 #else
             await File.WriteAllTextAsync(dummylongRunningTriggerPath, string.Empty).ConfigureAwait(false); // fs.watch returns immediately if path to watch doesn't exist
 #endif
+            // JavascriptEncode.Default.Encode encodes a string so that it can be used as a string literal in Javascript
             string dummyInitialModule = $@"module.exports = {{
     getPid: (callback) => callback(null, process.pid),
     longRunning: (callback) => {{
-        fs.watch('{dummylongRunningTriggerPath}', 
+        fs.watch('{JavaScriptEncoder.Default.Encode(dummylongRunningTriggerPath)}', 
             null, 
             () => {{
                 callback(null, process.pid);
             }}
         );
     }}
 }}";
-            string dummyModuleFilePath = new Uri(tempWatchDirectoryUri, "dummyModule.js").AbsolutePath;
+            string dummyModuleFilePath = new Uri(tempWatchDirectoryUri, "dummyModule.js").LocalPath;
 #if NET461
             File.WriteAllText(dummyModuleFilePath, dummyInitialModule);
 #else
@@ -1175,7 +1177,7 @@ public async void FileWatching_RespectsGracefulShutdownOptionWhenItsFalse()
     getPid: (callback) => callback(null, process.pid),
     longRunning: (callback) => setInterval(() => { /* Do nothing */ }, 1000)
 }";
-            string dummyModuleFilePath = new Uri(CreateWatchDirectoryUri(), "dummyModule.js").AbsolutePath;
+            string dummyModuleFilePath = new Uri(CreateWatchDirectoryUri(), "dummyModule.js").LocalPath;
 #if NET461
             File.WriteAllText(dummyModuleFilePath, dummyInitialModule);
 #else

test/NodeJS/NodeJSServiceImplementations/OutOfProcess/OutOfProcessNodeJSServiceUnitTests.cs

@@ -462,7 +462,7 @@ public async void TryInvokeCoreAsync_ThrowsObjectDisposedExceptionIfObjectHasBee
             mockTestSubject.Object.Dispose();
             ObjectDisposedException result = await Assert.
                 ThrowsAsync<ObjectDisposedException>(async () => await mockTestSubject.Object.TryInvokeCoreAsync<string>(new InvocationRequest(ModuleSourceType.String, "dummyModuleSource"), CancellationToken.None).ConfigureAwait(false)).ConfigureAwait(false);
-            Assert.Equal($"Cannot access a disposed object.\nObject name: '{nameof(OutOfProcessNodeJSService)}'.", result.Message, ignoreLineEndingDifferences: true);
+            Assert.Contains($"{nameof(OutOfProcessNodeJSService)}", result.Message);
         }
 
         [Fact]