Was made refactoring and updated tests

Author: Taritsyn

src/JavaScriptEngineSwitcher.ChakraCore/Helpers/ReflectionHelpers.cs

@@ -43,6 +43,11 @@ public static bool IsFullyFledgedMethod(MethodInfo method)
 
 		public static void FixFieldValueType(ref object value, FieldInfo field)
 		{
+			if (value == null)
+			{
+				return;
+			}
+
 			Type valueType = value.GetType();
 			Type fieldType = field.FieldType;
 
@@ -59,7 +64,11 @@ public static void FixFieldValueType(ref object value, FieldInfo field)
 
 		public static void FixPropertyValueType(ref object value, PropertyInfo property)
 		{
-			if (value == null) return;
+			if (value == null)
+			{
+				return;
+			}
+
 			Type valueType = value.GetType();
 			Type propertyType = property.PropertyType;
 
@@ -81,7 +90,11 @@ public static void FixArgumentTypes(ref object[] argValues, ParameterInfo[] para
 			for (int argIndex = 0; argIndex < argCount; argIndex++)
 			{
 				object argValue = argValues[argIndex];
-				if (argValue == null) continue;
+				if (argValue == null)
+				{
+					continue;
+				}
+
 				Type argType = argValue.GetType();
 
 				ParameterInfo parameter = parameters[argIndex];
@@ -124,17 +137,7 @@ public static MethodBase GetBestFitMethod(MethodBase[] methods, object[] argValu
 			}
 
 			Type[] argTypes = argValues
-				.Select(a =>
-				{
-					if (a == null)
-					{
-						return null;
-					}
-					else
-					{
-						return a.GetType();
-					}
-				})
+				.Select(a => a != null ? a.GetType() : typeof(object))
 				.ToArray()
 				;
 			var compatibleMethods = new List<MethodWithMetadata>();
@@ -234,4 +237,4 @@ public ushort CompatibilityScore
 			}
 		}
 	}
-}
+}

src/JavaScriptEngineSwitcher.ChakraCore/JavaScriptEngineSwitcher.ChakraCore.csproj

@@ -22,7 +22,7 @@ This package does not contain the native implementations of ChakraCore. Therefor
  * JavaScriptEngineSwitcher.ChakraCore.Native.osx-x64</Description>
 		<PackageIconUrl>https://raw.githubusercontent.com/Taritsyn/JavaScriptEngineSwitcher/master/Icons/JavaScriptEngineSwitcher_ChakraCore_Logo128x128.png</PackageIconUrl>
 		<PackageTags>JavaScriptEngineSwitcher;JavaScript;ECMAScript;ChakraCore</PackageTags>
-		<PackageReleaseNotes>ChakraCore was updated to version 1.11.15.</PackageReleaseNotes>
+		<PackageReleaseNotes>Fixed a errors leading to null reference exceptions in the `ReflectionHelpers` class. Special thanks to Vanjoge.</PackageReleaseNotes>
 	</PropertyGroup>
 
 	<Import Project="../../build/common.props" />

src/JavaScriptEngineSwitcher.ChakraCore/readme.txt

@@ -30,7 +30,8 @@
    =============
    RELEASE NOTES
    =============
-   ChakraCore was updated to version 1.11.15.
+   Fixed a errors leading to null reference exceptions in the `ReflectionHelpers`
+   class. Special thanks to Vanjoge.
 
    =============
    DOCUMENTATION

test/JavaScriptEngineSwitcher.Tests/Interop/FileManager.cs

@@ -1,18 +1,26 @@
 using System;
 using System.IO;
+using System.Text;
 
 namespace JavaScriptEngineSwitcher.Tests.Interop
 {
 	public sealed class FileManager
 	{
 		public string ReadFile(string path)
+		{
+			return ReadFile(path, null);
+		}
+
+		public string ReadFile(string path, Encoding encoding)
 		{
 			if (path == null)
 			{
 				throw new ArgumentNullException("path");
 			}
 
-			string content = File.ReadAllText(path);
+			encoding = encoding ?? Encoding.UTF8;
+
+			string content = File.ReadAllText(path, encoding);
 
 			return content;
 		}

test/JavaScriptEngineSwitcher.Tests/Interop/Person.cs

@@ -14,15 +14,26 @@ public string LastName
 			set;
 		}
 
+		public string Patronymic
+		{
+			get;
+			set;
+		}
+
 
 		public Person()
 			: this(string.Empty, string.Empty)
 		{ }
 
 		public Person(string firstName, string lastName)
+			: this(firstName, lastName, string.Empty)
+		{ }
+
+		public Person(string firstName, string lastName, string patronymic)
 		{
 			FirstName = firstName;
 			LastName = lastName;
+			Patronymic = patronymic;
 		}
 
 

test/JavaScriptEngineSwitcher.Tests/Interop/Product.cs

@@ -3,6 +3,7 @@
 	public sealed class Product
 	{
 		public string Name;
+		public string Description;
 		public double Price;
 	}
 }

test/JavaScriptEngineSwitcher.Tests/InteropTestsBase.cs

@@ -70,10 +70,12 @@ public virtual void EmbeddingOfInstanceOfCustomReferenceTypeWithFieldsIsCorrect(
 			var product = new Product
 			{
 				Name = "Red T-shirt",
+				Description = string.Empty,
 				Price = 995.00
 			};
 
-			const string updateCode = "product.Price *= 1.15;";
+			const string updateCode = @"product.Description = null;
+product.Price *= 1.15;";
 
 			const string input1 = "product.Name";
 			const string targetOutput1 = "Red T-shirt";
@@ -219,7 +221,8 @@ public virtual void EmbeddingOfInstanceOfCustomReferenceTypeWithPropertiesIsCorr
 		{
 			// Arrange
 			var person = new Person("Vanya", "Ivanov");
-			const string updateCode = "person.LastName = person.LastName.substr(0, 5) + 'ff';";
+			const string updateCode = @"person.LastName = person.LastName.substr(0, 5) + 'ff';
+person.Patronymic = null;";
 
 			const string input1 = "person.FirstName";
 			const string targetOutput1 = "Vanya";
@@ -406,7 +409,7 @@ public virtual void EmbeddingOfInstanceOfCustomReferenceTypeWithMethodIsCorrect(
 			var fileManager = new FileManager();
 			const string filePath = "Files/link.txt";
 
-			string input = string.Format("fileManager.ReadFile('{0}')", filePath.Replace(@"\", @"\\"));
+			string input = string.Format("fileManager.ReadFile('{0}', null)", filePath.Replace(@"\", @"\\"));
 			const string targetOutput = "http://www.panopticoncentral.net/2015/09/09/the-two-faces-of-jsrt-in-windows-10/";
 
 			// Act

test/JavaScriptEngineSwitcher.Tests/Jint/InteropTests.cs

@@ -6,6 +6,8 @@
 
 using JavaScriptEngineSwitcher.Core;
 
+using JavaScriptEngineSwitcher.Tests.Interop;
+
 namespace JavaScriptEngineSwitcher.Tests.Jint
 {
 	public class InteropTests : InteropTestsBase
@@ -18,6 +20,47 @@ protected override string EngineName
 
 		#region Embedding of objects
 
+		#region Objects with fields
+
+		[Fact]
+		public override void EmbeddingOfInstanceOfCustomReferenceTypeWithFieldsIsCorrect()
+		{
+			// Arrange
+			var product = new Product
+			{
+				Name = "Red T-shirt",
+				Description = string.Empty,
+				Price = 995.00
+			};
+
+			const string updateCode = "product.Price *= 1.15;";
+
+			const string input1 = "product.Name";
+			const string targetOutput1 = "Red T-shirt";
+
+			const string input2 = "product.Price";
+			const double targetOutput2 = 1144.25;
+
+			// Act
+			string output1;
+			double output2;
+
+			using (var jsEngine = CreateJsEngine())
+			{
+				jsEngine.EmbedHostObject("product", product);
+				jsEngine.Execute(updateCode);
+
+				output1 = jsEngine.Evaluate<string>(input1);
+				output2 = jsEngine.Evaluate<double>(input2);
+			}
+
+			// Assert
+			Assert.Equal(targetOutput1, output1);
+			Assert.Equal(targetOutput2, output2);
+		}
+
+		#endregion
+
 		#region Recursive calls
 
 		#region Mapping of errors

test/JavaScriptEngineSwitcher.Tests/Vroom/InteropTests.cs

@@ -25,6 +25,9 @@ public override void EmbeddingOfInstanceOfCustomReferenceTypeWithFieldsIsCorrect
 		public override void EmbeddingOfInstanceOfBuiltinReferenceTypeWithMethodIsCorrect()
 		{ }
 
+		public override void EmbeddingOfInstanceOfCustomReferenceTypeWithMethodIsCorrect()
+		{ }
+
 		#endregion
 
 		#region Delegates