Minor tweaks of tests

Author: Taritsyn

test/JavaScriptEngineSwitcher.Tests/ChakraCore/CommonTests.cs

@@ -194,40 +194,56 @@ public void MappingRuntimeErrorDuringOutOfMemory()
 	arr.push('Current date: ' + new Date());
 }";
 
-			JsRuntimeException exception = null;
-
 			// Act
-			using (IJsEngine jsEngine = new ChakraCoreJsEngine(
-				new ChakraCoreSettings
-				{
-					MemoryLimit = new UIntPtr(2 * 1024 * 1024)
-				}
-			))
+			IJsEngine jsEngine = null;
+			JsException exception = null;
+
+			try
 			{
-				try
-				{
-					jsEngine.Execute(input);
-				}
-				catch (JsRuntimeException e)
-				{
-					exception = e;
-				}
+				jsEngine = new ChakraCoreJsEngine(
+					new ChakraCoreSettings
+					{
+						MemoryLimit = new UIntPtr(2 * 1024 * 1024)
+					}
+				);
+				jsEngine.Execute(input);
+			}
+			catch (JsEngineException e)
+			{
+				exception = e;
+			}
+			catch (JsRuntimeException e)
+			{
+				exception = e;
+			}
+			finally
+			{
+				jsEngine?.Dispose();
 			}
 
 			// Assert
 			Assert.NotNull(exception);
-			Assert.Equal("Runtime error", exception.Category);
-			Assert.Equal("Out of memory", exception.Description);
+			if (exception is JsRuntimeException)
+			{
+				Assert.Equal("Runtime error", exception.Category);
+				Assert.Equal("Out of memory", exception.Description);
+			}
+			else if (exception is JsEngineException)
+			{
+				Assert.Equal("Engine load error", exception.Category);
+				Assert.Equal("Out of memory.", exception.Description);
+			}
 		}
 
 		[Fact]
 		public void MappingEngineLoadErrorDuringOutOfMemory()
 		{
 			// Arrange
+
+			// Act
 			IJsEngine jsEngine = null;
 			JsEngineLoadException exception = null;
 
-			// Act
 			try
 			{
 				jsEngine = new ChakraCoreJsEngine(

test/JavaScriptEngineSwitcher.Tests/Yantra/ConsoleTests.cs

@@ -63,7 +63,7 @@ function calculateIncomeTax(salary) {
 				;
 
 			// Act
-			using (var jsEngine = CreateJsEngine(logger.Log))
+			using (var jsEngine = CreateJsEngine(consoleCallback: logger.Log))
 			{
 				jsEngine.EmbedHostType("favoriteSchoolSubject", favoriteSchoolSubject);
 				jsEngine.EmbedHostObject("wikipediaPageUrl", wikipediaPageUrl);
@@ -93,12 +93,12 @@ public void SupportsConsoleInfoMethod()
 console.info(driveLetter, 'drive has been formatted successfully!');";
 
 			// Act
-			JsRuntimeException exception = null;
 			IJsEngine jsEngine = null;
+			JsRuntimeException exception = null;
 
 			try
 			{
-				jsEngine = CreateJsEngine(logger.Log);
+				jsEngine = CreateJsEngine(consoleCallback: logger.Log);
 				jsEngine.Execute(input);
 			}
 			catch (JsRuntimeException e)
@@ -128,13 +128,13 @@ public void SupportsConsoleWarnMethod()
 			const string input = @"console.warn('Watch out, the doors are closing!');
 console.warn('Watch yourself,', 'be careful!');
 console.warn('It is forbidden to watch!');";
-			string targetOutput = "warn:	Watch out, the doors are closing!" + Environment.NewLine +
-				"warn:	Watch yourself, be careful!" + Environment.NewLine +
-				"warn:	It is forbidden to watch!" + Environment.NewLine
+			string targetOutput = "warn: Watch out, the doors are closing!" + Environment.NewLine +
+				"warn: Watch yourself, be careful!" + Environment.NewLine +
+				"warn: It is forbidden to watch!" + Environment.NewLine
 				;
 
 			// Act
-			using (var jsEngine = CreateJsEngine(logger.Log))
+			using (var jsEngine = CreateJsEngine(consoleCallback: logger.Log))
 			{
 				jsEngine.Execute(input);
 			}
@@ -156,10 +156,10 @@ public void SupportsConsoleErrorMethod()
 			var logger = new StringLogger(sb);
 
 			const string input = @"console.error('A terrible thing happened!');";
-			string targetOutput = "error:	A terrible thing happened!" + Environment.NewLine;
+			string targetOutput = "error: A terrible thing happened!" + Environment.NewLine;
 
 			// Act
-			using (var jsEngine = CreateJsEngine(logger.Log))
+			using (var jsEngine = CreateJsEngine(consoleCallback: logger.Log))
 			{
 				jsEngine.Execute(input);
 			}
@@ -188,8 +188,7 @@ public void Log(string type, object[] args)
 			{
 				if (type != "log")
 				{
-					_buffer.Append(type);
-					_buffer.Append(":	");
+					_buffer.AppendFormat("{0}: ", type);
 				}
 
 				for (int argIndex = 0; argIndex < args.Length; argIndex++)