Was made refactoring of unit tests

Taritsyn · Taritsyn · commit 27ff75c289f0 · 2019-04-17T20:45:19.000+03:00
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
 	"sdk": {
-		"version": "2.2.104"
+		"version": "2.2.106"
 	}
 }
diff --git a/test/MsieJavaScriptEngine.Test.Auto/CommonTests.cs b/test/MsieJavaScriptEngine.Test.Auto/CommonTests.cs
@@ -7,17 +7,6 @@ namespace MsieJavaScriptEngine.Test.Auto
 	[TestFixture]
 	public class CommonTests : CommonTestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine(bool enableDebugging)
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EnableDebugging = enableDebugging,
-				EngineMode = JsEngineMode.Auto,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
-
-			return jsEngine;
-		}
+		protected override JsEngineMode EngineMode => JsEngineMode.Auto;
 	}
 }
diff --git a/test/MsieJavaScriptEngine.Test.Auto/Es5Tests.cs b/test/MsieJavaScriptEngine.Test.Auto/Es5Tests.cs
@@ -7,16 +7,8 @@ namespace MsieJavaScriptEngine.Test.Auto
 	[TestFixture]
 	public class Es5Tests : Es5TestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine()
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EngineMode = JsEngineMode.Auto,
-				UseEcmaScript5Polyfill = true,
-				UseJson2Library = true
-			});
-
-			return jsEngine;
-		}
+		protected override JsEngineMode EngineMode => JsEngineMode.Auto;
+		protected override bool UseEcmaScript5Polyfill => true;
+		protected override bool UseJson2Library => true;
 	}
 }
diff --git a/test/MsieJavaScriptEngine.Test.Auto/InteropTests.cs b/test/MsieJavaScriptEngine.Test.Auto/InteropTests.cs
@@ -7,16 +7,6 @@ namespace MsieJavaScriptEngine.Test.Auto
 	[TestFixture]
 	public class InteropTests : InteropTestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine()
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EngineMode = JsEngineMode.Auto,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
-
-			return jsEngine;
-		}
+		protected override JsEngineMode EngineMode => JsEngineMode.Auto;
 	}
 }
diff --git a/test/MsieJavaScriptEngine.Test.Auto/PrecompilationTests.cs b/test/MsieJavaScriptEngine.Test.Auto/PrecompilationTests.cs
@@ -7,17 +7,6 @@ namespace MsieJavaScriptEngine.Test.Auto
 	[TestFixture]
 	public class PrecompilationTests : PrecompilationTestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine(bool enableDebugging)
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EnableDebugging = enableDebugging,
-				EngineMode = JsEngineMode.Auto,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
-
-			return jsEngine;
-		}
+		protected override JsEngineMode EngineMode => JsEngineMode.Auto;
 	}
 }
diff --git a/test/MsieJavaScriptEngine.Test.ChakraActiveScript/CommonTests.cs b/test/MsieJavaScriptEngine.Test.ChakraActiveScript/CommonTests.cs
@@ -9,18 +9,8 @@ namespace MsieJavaScriptEngine.Test.ChakraActiveScript
 	[TestFixture]
 	public class CommonTests : CommonTestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine(bool enableDebugging)
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EnableDebugging = enableDebugging,
-				EngineMode = JsEngineMode.ChakraActiveScript,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
+		protected override JsEngineMode EngineMode => JsEngineMode.ChakraActiveScript;
 
-			return jsEngine;
-		}
 
 		#region Error handling
 
diff --git a/test/MsieJavaScriptEngine.Test.ChakraActiveScript/Es5Tests.cs b/test/MsieJavaScriptEngine.Test.ChakraActiveScript/Es5Tests.cs
@@ -7,16 +7,6 @@ namespace MsieJavaScriptEngine.Test.ChakraActiveScript
 	[TestFixture]
 	public class Es5Tests : Es5TestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine()
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EngineMode = JsEngineMode.ChakraActiveScript,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
-
-			return jsEngine;
-		}
+		protected override JsEngineMode EngineMode => JsEngineMode.ChakraActiveScript;
 	}
 }
diff --git a/test/MsieJavaScriptEngine.Test.ChakraActiveScript/InteropTests.cs b/test/MsieJavaScriptEngine.Test.ChakraActiveScript/InteropTests.cs
@@ -7,16 +7,6 @@ namespace MsieJavaScriptEngine.Test.ChakraActiveScript
 	[TestFixture]
 	public class InteropTests : InteropTestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine()
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EngineMode = JsEngineMode.ChakraActiveScript,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
-
-			return jsEngine;
-		}
+		protected override JsEngineMode EngineMode => JsEngineMode.ChakraActiveScript;
 	}
 }
diff --git a/test/MsieJavaScriptEngine.Test.ChakraActiveScript/PrecompilationTests.cs b/test/MsieJavaScriptEngine.Test.ChakraActiveScript/PrecompilationTests.cs
@@ -1,6 +1,4 @@
-﻿using System;
-
-using NUnit.Framework;
+﻿using NUnit.Framework;
 
 using MsieJavaScriptEngine.Test.Common;
 
@@ -9,17 +7,6 @@ namespace MsieJavaScriptEngine.Test.ChakraActiveScript
 	[TestFixture]
 	public class PrecompilationTests : PrecompilationTestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine(bool enableDebugging)
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EnableDebugging = enableDebugging,
-				EngineMode = JsEngineMode.ChakraActiveScript,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
-
-			return jsEngine;
-		}
+		protected override JsEngineMode EngineMode => JsEngineMode.ChakraActiveScript;
 	}
 }
diff --git a/test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/CommonTests.cs b/test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/CommonTests.cs
@@ -10,18 +10,8 @@ namespace MsieJavaScriptEngine.Test.ChakraEdgeJsRt
 	[TestFixture]
 	public class CommonTests : CommonTestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine(bool enableDebugging)
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EnableDebugging = enableDebugging,
-				EngineMode = JsEngineMode.ChakraEdgeJsRt,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
+		protected override JsEngineMode EngineMode => JsEngineMode.ChakraEdgeJsRt;
 
-			return jsEngine;
-		}
 
 		#region Error handling
 
diff --git a/test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/Es5Tests.cs b/test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/Es5Tests.cs
@@ -7,16 +7,6 @@ namespace MsieJavaScriptEngine.Test.ChakraEdgeJsRt
 	[TestFixture]
 	public class Es5Tests : Es5TestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine()
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EngineMode = JsEngineMode.ChakraEdgeJsRt,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
-
-			return jsEngine;
-		}
+		protected override JsEngineMode EngineMode => JsEngineMode.ChakraEdgeJsRt;
 	}
 }
diff --git a/test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/InteropTests.cs b/test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/InteropTests.cs
@@ -11,19 +11,10 @@ namespace MsieJavaScriptEngine.Test.ChakraEdgeJsRt
 	[TestFixture]
 	public class InteropTests : InteropTestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine()
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EngineMode = JsEngineMode.ChakraEdgeJsRt,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
-
-			return jsEngine;
-		}
+		protected override JsEngineMode EngineMode => JsEngineMode.ChakraEdgeJsRt;
 #if NETCOREAPP
 
+
 		[Test]
 		public void EmbeddedInstanceOfDelegateHasFunctionPrototype()
 		{
diff --git a/test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/PrecompilationTests.cs b/test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt/PrecompilationTests.cs
@@ -10,18 +10,8 @@ namespace MsieJavaScriptEngine.Test.ChakraEdgeJsRt
 	[TestFixture]
 	public class PrecompilationTests : PrecompilationTestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine(bool enableDebugging)
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EnableDebugging = enableDebugging,
-				EngineMode = JsEngineMode.ChakraEdgeJsRt,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
+		protected override JsEngineMode EngineMode => JsEngineMode.ChakraEdgeJsRt;
 
-			return jsEngine;
-		}
 
 		#region Error handling
 
diff --git a/test/MsieJavaScriptEngine.Test.ChakraIeJsRt/CommonTests.cs b/test/MsieJavaScriptEngine.Test.ChakraIeJsRt/CommonTests.cs
@@ -9,18 +9,8 @@ namespace MsieJavaScriptEngine.Test.ChakraIeJsRt
 	[TestFixture]
 	public class CommonTests : CommonTestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine(bool enableDebugging)
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EnableDebugging = enableDebugging,
-				EngineMode = JsEngineMode.ChakraIeJsRt,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
+		protected override JsEngineMode EngineMode => JsEngineMode.ChakraIeJsRt;
 
-			return jsEngine;
-		}
 
 		#region Error handling
 
diff --git a/test/MsieJavaScriptEngine.Test.ChakraIeJsRt/Es5Tests.cs b/test/MsieJavaScriptEngine.Test.ChakraIeJsRt/Es5Tests.cs
@@ -7,16 +7,6 @@ namespace MsieJavaScriptEngine.Test.ChakraIeJsRt
 	[TestFixture]
 	public class Es5Tests : Es5TestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine()
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EngineMode = JsEngineMode.ChakraIeJsRt,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
-
-			return jsEngine;
-		}
+		protected override JsEngineMode EngineMode => JsEngineMode.ChakraIeJsRt;
 	}
 }
diff --git a/test/MsieJavaScriptEngine.Test.ChakraIeJsRt/InteropTests.cs b/test/MsieJavaScriptEngine.Test.ChakraIeJsRt/InteropTests.cs
@@ -11,19 +11,10 @@ namespace MsieJavaScriptEngine.Test.ChakraIeJsRt
 	[TestFixture]
 	public class InteropTests : InteropTestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine()
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EngineMode = JsEngineMode.ChakraIeJsRt,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
-
-			return jsEngine;
-		}
+		protected override JsEngineMode EngineMode => JsEngineMode.ChakraIeJsRt;
 #if NETCOREAPP
 
+
 		[Test]
 		public void EmbeddedInstanceOfDelegateHasFunctionPrototype()
 		{
diff --git a/test/MsieJavaScriptEngine.Test.ChakraIeJsRt/PrecompilationTests.cs b/test/MsieJavaScriptEngine.Test.ChakraIeJsRt/PrecompilationTests.cs
@@ -9,18 +9,8 @@ namespace MsieJavaScriptEngine.Test.ChakraIeJsRt
 	[TestFixture]
 	public class PrecompilationTests : PrecompilationTestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine(bool enableDebugging)
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EnableDebugging = enableDebugging,
-				EngineMode = JsEngineMode.ChakraIeJsRt,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
+		protected override JsEngineMode EngineMode => JsEngineMode.ChakraIeJsRt;
 
-			return jsEngine;
-		}
 
 		#region Error handling
 
diff --git a/test/MsieJavaScriptEngine.Test.Classic/CommonTests.cs b/test/MsieJavaScriptEngine.Test.Classic/CommonTests.cs
@@ -9,18 +9,8 @@ namespace MsieJavaScriptEngine.Test.Classic
 	[TestFixture]
 	public class CommonTests : CommonTestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine(bool enableDebugging)
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EnableDebugging = enableDebugging,
-				EngineMode = JsEngineMode.Classic,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
+		protected override JsEngineMode EngineMode => JsEngineMode.Classic;
 
-			return jsEngine;
-		}
 
 		#region Error handling
 
diff --git a/test/MsieJavaScriptEngine.Test.Classic/Es5Tests.cs b/test/MsieJavaScriptEngine.Test.Classic/Es5Tests.cs
@@ -7,17 +7,10 @@ namespace MsieJavaScriptEngine.Test.Classic
 	[TestFixture]
 	public class Es5Tests : Es5TestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine()
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EngineMode = JsEngineMode.Classic,
-				UseEcmaScript5Polyfill = true,
-				UseJson2Library = true
-			});
+		protected override JsEngineMode EngineMode => JsEngineMode.Classic;
+		protected override bool UseEcmaScript5Polyfill => true;
+		protected override bool UseJson2Library => true;
 
-			return jsEngine;
-		}
 
 		#region Object methods
 
diff --git a/test/MsieJavaScriptEngine.Test.Classic/InteropTests.cs b/test/MsieJavaScriptEngine.Test.Classic/InteropTests.cs
@@ -7,16 +7,6 @@ namespace MsieJavaScriptEngine.Test.Classic
 	[TestFixture]
 	public class InteropTests : InteropTestsBase
 	{
-		protected override MsieJsEngine CreateJsEngine()
-		{
-			var jsEngine = new MsieJsEngine(new JsEngineSettings
-			{
-				EngineMode = JsEngineMode.Classic,
-				UseEcmaScript5Polyfill = false,
-				UseJson2Library = false
-			});
-
-			return jsEngine;
-		}
+		protected override JsEngineMode EngineMode => JsEngineMode.Classic;
 	}
 }
diff --git a/test/MsieJavaScriptEngine.Test.Classic/PrecompilationTests.cs b/test/MsieJavaScriptEngine.Test.Classic/PrecompilationTests.cs
diff --git a/test/MsieJavaScriptEngine.Test.Common/CommonTestsBase.cs b/test/MsieJavaScriptEngine.Test.Common/CommonTestsBase.cs
diff --git a/test/MsieJavaScriptEngine.Test.Common/Es5TestsBase.cs b/test/MsieJavaScriptEngine.Test.Common/Es5TestsBase.cs
diff --git a/test/MsieJavaScriptEngine.Test.Common/FileSystemTestsBase.cs b/test/MsieJavaScriptEngine.Test.Common/FileSystemTestsBase.cs
diff --git a/test/MsieJavaScriptEngine.Test.Common/InteropTestsBase.cs b/test/MsieJavaScriptEngine.Test.Common/InteropTestsBase.cs
diff --git a/test/MsieJavaScriptEngine.Test.Common/PrecompilationTestsBase.cs b/test/MsieJavaScriptEngine.Test.Common/PrecompilationTestsBase.cs
diff --git a/test/MsieJavaScriptEngine.Test.Common/TestsBase.cs b/test/MsieJavaScriptEngine.Test.Common/TestsBase.cs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "2.2.104"`
	`3`	`+ "version": "2.2.106"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,17 +7,6 @@ namespace MsieJavaScriptEngine.Test.Auto`
`7`	`7`	`[TestFixture]`
`8`	`8`	`public class CommonTests : CommonTestsBase`
`9`	`9`	`{`
`10`		`- protected override MsieJsEngine CreateJsEngine(bool enableDebugging)`
`11`		`- {`
`12`		`- var jsEngine = new MsieJsEngine(new JsEngineSettings`
`13`		`- {`
`14`		`- EnableDebugging = enableDebugging,`
`15`		`- EngineMode = JsEngineMode.Auto,`
`16`		`- UseEcmaScript5Polyfill = false,`
`17`		`- UseJson2Library = false`
`18`		`- });`
`19`		`-`
`20`		`- return jsEngine;`
`21`		`- }`
	`10`	`+ protected override JsEngineMode EngineMode => JsEngineMode.Auto;`
`22`	`11`	`}`
`23`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,16 +7,6 @@ namespace MsieJavaScriptEngine.Test.Auto`
`7`	`7`	`[TestFixture]`
`8`	`8`	`public class InteropTests : InteropTestsBase`
`9`	`9`	`{`
`10`		`- protected override MsieJsEngine CreateJsEngine()`
`11`		`- {`
`12`		`- var jsEngine = new MsieJsEngine(new JsEngineSettings`
`13`		`- {`
`14`		`- EngineMode = JsEngineMode.Auto,`
`15`		`- UseEcmaScript5Polyfill = false,`
`16`		`- UseJson2Library = false`
`17`		`- });`
`18`		`-`
`19`		`- return jsEngine;`
`20`		`- }`
	`10`	`+ protected override JsEngineMode EngineMode => JsEngineMode.Auto;`
`21`	`11`	`}`
`22`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,17 +7,6 @@ namespace MsieJavaScriptEngine.Test.Auto`
`7`	`7`	`[TestFixture]`
`8`	`8`	`public class PrecompilationTests : PrecompilationTestsBase`
`9`	`9`	`{`
`10`		`- protected override MsieJsEngine CreateJsEngine(bool enableDebugging)`
`11`		`- {`
`12`		`- var jsEngine = new MsieJsEngine(new JsEngineSettings`
`13`		`- {`
`14`		`- EnableDebugging = enableDebugging,`
`15`		`- EngineMode = JsEngineMode.Auto,`
`16`		`- UseEcmaScript5Polyfill = false,`
`17`		`- UseJson2Library = false`
`18`		`- });`
`19`		`-`
`20`		`- return jsEngine;`
`21`		`- }`
	`10`	`+ protected override JsEngineMode EngineMode => JsEngineMode.Auto;`
`22`	`11`	`}`
`23`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,16 +7,6 @@ namespace MsieJavaScriptEngine.Test.ChakraActiveScript`
`7`	`7`	`[TestFixture]`
`8`	`8`	`public class Es5Tests : Es5TestsBase`
`9`	`9`	`{`
`10`		`- protected override MsieJsEngine CreateJsEngine()`
`11`		`- {`
`12`		`- var jsEngine = new MsieJsEngine(new JsEngineSettings`
`13`		`- {`
`14`		`- EngineMode = JsEngineMode.ChakraActiveScript,`
`15`		`- UseEcmaScript5Polyfill = false,`
`16`		`- UseJson2Library = false`
`17`		`- });`
`18`		`-`
`19`		`- return jsEngine;`
`20`		`- }`
	`10`	`+ protected override JsEngineMode EngineMode => JsEngineMode.ChakraActiveScript;`
`21`	`11`	`}`
`22`	`12`	`}`