Made refactoring of unit tests

Author: Taritsyn

test/JavaScriptEngineSwitcher.Tests/CommonTestsBase.cs

@@ -0,0 +1,28 @@
+namespace JavaScriptEngineSwitcher.Tests
+{
+	using System;
+	using System.IO;
+	using System.Text.RegularExpressions;
+
+	public abstract class FileSystemTestBase
+	{
+		/// <summary>
+		/// Regular expression for working with the `bin` directory path
+		/// </summary>
+		private readonly Regex _binDirRegex = new Regex(@"\\bin\\(?:Debug|Release)\\?$", RegexOptions.IgnoreCase);
+
+		protected string _baseDirectoryPath;
+
+
+		protected FileSystemTestBase()
+		{
+			string baseDirectoryPath = AppDomain.CurrentDomain.BaseDirectory;
+			if (_binDirRegex.IsMatch(baseDirectoryPath))
+			{
+				baseDirectoryPath = Path.GetFullPath(Path.Combine(baseDirectoryPath, @"..\..\..\"));
+			}
+
+			_baseDirectoryPath = baseDirectoryPath;
+		}
+	}
+}

test/JavaScriptEngineSwitcher.Tests/Es5TestsBase.cs

@@ -63,6 +63,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Es5TestsBase.cs" />
+    <Compile Include="FileSystemTestBase.cs" />
     <Compile Include="Jint\CommonTests.cs" />
     <Compile Include="Jint\Es5Tests.cs" />
     <Compile Include="Jurassic\CommonTests.cs" />

test/JavaScriptEngineSwitcher.Tests/FileSystemTestBase.cs

@@ -1,16 +1,14 @@
 namespace JavaScriptEngineSwitcher.Tests.Jint
 {
-	using NUnit.Framework;
-
 	using Core;
 
-	[TestFixture]
 	public class CommonTests : CommonTestsBase
 	{
-		[TestFixtureSetUp]
-		public override void SetUp()
+		protected override IJsEngine CreateJsEngine()
 		{
-			_jsEngine = JsEngineSwitcher.Current.CreateJsEngineInstance("JintJsEngine");
+			var jsEngine = JsEngineSwitcher.Current.CreateJsEngineInstance("JintJsEngine");
+
+			return jsEngine;
 		}
 	}
 }

test/JavaScriptEngineSwitcher.Tests/Resources/square.js renamed to test/JavaScriptEngineSwitcher.Tests/Files/square.js

@@ -4,13 +4,13 @@
 
 	using Core;
 
-	[TestFixture]
 	public class Es5Tests : Es5TestsBase
 	{
-		[TestFixtureSetUp]
-		public override void SetUp()
+		protected override IJsEngine CreateJsEngine()
 		{
-			_jsEngine = JsEngineSwitcher.Current.CreateJsEngineInstance("JintJsEngine");
+			var jsEngine = JsEngineSwitcher.Current.CreateJsEngineInstance("JintJsEngine");
+
+			return jsEngine;
 		}
 
 		#region Object methods
@@ -36,12 +36,20 @@ public override void ObjectKeysMethodIsSupported()
 			const string targetOutput4 = "foo";
 
 			// Act
-			var output1 = _jsEngine.Evaluate<string>(input1);
-			var output2 = _jsEngine.Evaluate<string>(input2);
-			var output3 = _jsEngine.Evaluate<string>(input3);
-
-			_jsEngine.Execute(input4A);
-			var output4 = _jsEngine.Evaluate<string>(input4B);
+			string output1;
+			string output2;
+			string output3;
+			string output4;
+
+			using (var jsEngine = CreateJsEngine())
+			{
+				output1 = jsEngine.Evaluate<string>(input1);
+				output2 = jsEngine.Evaluate<string>(input2);
+				output3 = jsEngine.Evaluate<string>(input3);
+
+				jsEngine.Execute(input4A);
+				output4 = jsEngine.Evaluate<string>(input4B);
+			}
 
 			// Assert
 			Assert.AreEqual(targetOutput1, output1);

test/JavaScriptEngineSwitcher.Tests/JavaScriptEngineSwitcher.Tests.csproj

@@ -1,16 +1,14 @@
 namespace JavaScriptEngineSwitcher.Tests.Jurassic
 {
-	using NUnit.Framework;
-
 	using Core;
 
-	[TestFixture]
 	public class CommonTests : CommonTestsBase
 	{
-		[TestFixtureSetUp]
-		public override void SetUp()
+		protected override IJsEngine CreateJsEngine()
 		{
-			_jsEngine = JsEngineSwitcher.Current.CreateJsEngineInstance("JurassicJsEngine");
+			var jsEngine = JsEngineSwitcher.Current.CreateJsEngineInstance("JurassicJsEngine");
+
+			return jsEngine;
 		}
 	}
 }

test/JavaScriptEngineSwitcher.Tests/Jint/CommonTests.cs

@@ -4,13 +4,13 @@
 
 	using Core;
 
-	[TestFixture]
 	public class Es5Tests : Es5TestsBase
 	{
-		[TestFixtureSetUp]
-		public override void SetUp()
+		protected override IJsEngine CreateJsEngine()
 		{
-			_jsEngine = JsEngineSwitcher.Current.CreateJsEngineInstance("JurassicJsEngine");
+			var jsEngine = JsEngineSwitcher.Current.CreateJsEngineInstance("JurassicJsEngine");
+
+			return jsEngine;
 		}
 
 		#region Object methods
@@ -36,12 +36,20 @@ public override void ObjectKeysMethodIsSupported()
 			const string targetOutput4 = "displayName,foo";
 
 			// Act
-			var output1 = _jsEngine.Evaluate<string>(input1);
-			var output2 = _jsEngine.Evaluate<string>(input2);
-			var output3 = _jsEngine.Evaluate<string>(input3);
-
-			_jsEngine.Execute(input4A);
-			var output4 = _jsEngine.Evaluate<string>(input4B);
+			string output1;
+			string output2;
+			string output3;
+			string output4;
+
+			using (var jsEngine = CreateJsEngine())
+			{
+				output1 = jsEngine.Evaluate<string>(input1);
+				output2 = jsEngine.Evaluate<string>(input2);
+				output3 = jsEngine.Evaluate<string>(input3);
+
+				jsEngine.Execute(input4A);
+				output4 = jsEngine.Evaluate<string>(input4B);
+			}
 
 			// Assert
 			Assert.AreEqual(targetOutput1, output1);

test/JavaScriptEngineSwitcher.Tests/Jint/Es5Tests.cs

@@ -1,16 +1,14 @@
 namespace JavaScriptEngineSwitcher.Tests.Msie
 {
-	using NUnit.Framework;
-
 	using Core;
 
-	[TestFixture]
 	public class CommonTests : CommonTestsBase
 	{
-		[TestFixtureSetUp]
-		public override void SetUp()
+		protected override IJsEngine CreateJsEngine()
 		{
-			_jsEngine = JsEngineSwitcher.Current.CreateJsEngineInstance("MsieJsEngine");
+			var jsEngine = JsEngineSwitcher.Current.CreateJsEngineInstance("MsieJsEngine");
+
+			return jsEngine;
 		}
 	}
 }