Fixed a error, that occurred in the Classic mode during removing the embedded host objects and types

Taritsyn · Taritsyn · commit 5cdcfa5814d7 · 2017-12-23T19:27:59.000+03:00
diff --git a/src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs b/src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs
@@ -725,11 +725,25 @@ public override void RemoveVariable(string variableName)
 			{
 				try
 				{
-					InnerSetVariableValue(variableName, null);
-
-					if (_hostItems.ContainsKey(variableName))
+					if (_engineMode == JsEngineMode.Classic)
 					{
-						_hostItems.Remove(variableName);
+						if (_hostItems.ContainsKey(variableName))
+						{
+							_hostItems.Remove(variableName);
+						}
+						else
+						{
+							InnerSetVariableValue(variableName, null);
+						}
+					}
+					else
+					{
+						InnerSetVariableValue(variableName, null);
+
+						if (_hostItems.ContainsKey(variableName))
+						{
+							_hostItems.Remove(variableName);
+						}
 					}
 				}
 				catch (ActiveScriptException e)
diff --git a/test/MsieJavaScriptEngine.Test.Common/InteropTestsBase.cs b/test/MsieJavaScriptEngine.Test.Common/InteropTestsBase.cs
@@ -553,6 +553,37 @@ public virtual void InteractionOfEmbeddedCustomValueTypeAndDelegateInstancesIsCo
 
 		#endregion
 
+		#region Removal
+
+		[Test]
+		public virtual void RemovingOfEmbeddedInstanceOfCustomReferenceTypeIsCorrect()
+		{
+			// Arrange
+			var person = new Person("Vasya", "Pupkin");
+
+			// Act
+			Exception currentException = null;
+
+			using (var jsEngine = CreateJsEngine())
+			{
+				jsEngine.EmbedHostObject("person", person);
+
+				try
+				{
+					jsEngine.RemoveVariable("person");
+				}
+				catch (Exception e)
+				{
+					currentException = e;
+				}
+			}
+
+			// Assert
+			Assert.Null(currentException);
+		}
+
+		#endregion
+
 		#endregion
 
 
@@ -1034,6 +1065,37 @@ public virtual void EmbeddingOfCustomReferenceTypeWithMethodIsCorrect()
 
 		#endregion
 
+		#region Removal
+
+		[Test]
+		public virtual void RemovingOfEmbeddedCustomReferenceTypeIsCorrect()
+		{
+			// Arrange
+			Type personType = typeof(Person);
+
+			// Act
+			Exception currentException = null;
+
+			using (var jsEngine = CreateJsEngine())
+			{
+				jsEngine.EmbedHostType("Person", personType);
+
+				try
+				{
+					jsEngine.RemoveVariable("Person");
+				}
+				catch (Exception e)
+				{
+					currentException = e;
+				}
+			}
+
+			// Assert
+			Assert.Null(currentException);
+		}
+
+		#endregion
+
 		#endregion
 	}
 }
