Now when you call the overloaded version of the ExecuteResource method, that takes the type, need to pass the resource name without the namespace

Author: Taritsyn

src/JavaScriptEngineSwitcher.Core/IJsEngine.cs

@@ -65,15 +65,16 @@ bool SupportsGarbageCollection
 		/// <summary>
 		/// Executes a code from embedded JS-resource
 		/// </summary>
-		/// <param name="resourceName">JS-resource name</param>
-		/// <param name="type">Type from assembly that containing an embedded resource</param>
+		/// <param name="resourceName">The case-sensitive resource name without the namespace of the specified type</param>
+		/// <param name="type">The type, that determines the assembly and whose namespace is used to scope
+		/// the resource name</param>
 		void ExecuteResource(string resourceName, Type type);
 
 		/// <summary>
 		/// Executes a code from embedded JS-resource
 		/// </summary>
-		/// <param name="resourceName">JS-resource name</param>
-		/// <param name="assembly">Assembly that containing an embedded resource</param>
+		/// <param name="resourceName">The case-sensitive resource name</param>
+		/// <param name="assembly">The assembly, which contains the embedded resource</param>
 		void ExecuteResource(string resourceName, Assembly assembly);
 
 		/// <summary>

src/JavaScriptEngineSwitcher.Core/Utilities/AssemblyExtensions.cs

@@ -64,8 +64,9 @@ public static bool Is64BitProcess()
 		/// <summary>
 		/// Gets a content of the embedded resource as string
 		/// </summary>
-		/// <param name="resourceName">Resource name</param>
-		/// <param name="type">Type from assembly that containing an embedded resource</param>
+		/// <param name="resourceName">The case-sensitive resource name without the namespace of the specified type</param>
+		/// <param name="type">The type, that determines the assembly and whose namespace is used to scope
+		/// the resource name</param>
 		/// <returns>Сontent of the embedded resource as string</returns>
 		public static string GetResourceAsString(string resourceName, Type type)
 		{
@@ -89,26 +90,16 @@ public static string GetResourceAsString(string resourceName, Type type)
 
 			Assembly assembly = type.GetTypeInfo().Assembly;
 			string nameSpace = type.Namespace;
+			string resourceFullName = nameSpace != null ? nameSpace + "." + resourceName : resourceName;
 
-			if (nameSpace != null && resourceName.StartsWith(nameSpace, StringComparison.Ordinal))
-			{
-				using (Stream stream = assembly.GetManifestResourceStream(resourceName))
-				{
-					return ReadResourceAsString(resourceName, stream);
-				}
-			}
-
-			using (Stream stream = assembly.GetManifestResourceStream(type, resourceName))
-			{
-				return ReadResourceAsString(resourceName, stream);
-			}
+			return InnerGetResourceAsString(resourceFullName, assembly);
 		}
 
 		/// <summary>
 		/// Gets a content of the embedded resource as string
 		/// </summary>
-		/// <param name="resourceName">Resource name</param>
-		/// <param name="assembly">Assembly that containing an embedded resource</param>
+		/// <param name="resourceName">The case-sensitive resource name</param>
+		/// <param name="assembly">The assembly, which contains the embedded resource</param>
 		/// <returns>Сontent of the embedded resource as string</returns>
 		public static string GetResourceAsString(string resourceName, Assembly assembly)
 		{
@@ -130,23 +121,23 @@ public static string GetResourceAsString(string resourceName, Assembly assembly)
 					string.Format(Strings.Common_ArgumentIsEmpty, "resourceName"), "resourceName");
 			}
 
-			using (Stream stream = assembly.GetManifestResourceStream(resourceName))
-			{
-				return ReadResourceAsString(resourceName, stream);
-			}
+			return InnerGetResourceAsString(resourceName, assembly);
 		}
 
-		private static string ReadResourceAsString(string resourceName, Stream stream)
+		private static string InnerGetResourceAsString(string resourceName, Assembly assembly)
 		{
-			if (stream == null)
+			using (Stream stream = assembly.GetManifestResourceStream(resourceName))
 			{
-				throw new NullReferenceException(
-					string.Format(Strings.Resources_ResourceIsNull, resourceName));
-			}
+				if (stream == null)
+				{
+					throw new NullReferenceException(
+						string.Format(Strings.Resources_ResourceIsNull, resourceName));
+				}
 
-			using (var reader = new StreamReader(stream))
-			{
-				return reader.ReadToEnd();
+				using (var reader = new StreamReader(stream))
+				{
+					return reader.ReadToEnd();
+				}
 			}
 		}
 

src/JavaScriptEngineSwitcher.Core/Utilities/Utils.cs

@@ -33,7 +33,6 @@
 			"buildOptions": {
 				"compile": {
 					"exclude": [
-						"Utilities/AssemblyExtensions.cs",
 						"Utilities/TypeInfoExtensions.cs"
 					]
 				}

src/JavaScriptEngineSwitcher.Core/project.json

@@ -221,28 +221,7 @@ public virtual void ExecutionOfResourceByNameAndTypeIsCorrect()
 		}
 
 		[Fact]
-		public virtual void ExecutionOfResourceByFullNameAndTypeIsCorrect()
-		{
-			// Arrange
-			const string resourceName = "JavaScriptEngineSwitcher.Tests.Resources.cube.js";
-			const string input = "cube(5);";
-			const int targetOutput = 125;
-
-			// Act
-			int output;
-
-			using (var jsEngine = CreateJsEngine())
-			{
-				jsEngine.ExecuteResource(resourceName, typeof(CommonTestsBase));
-				output = jsEngine.Evaluate<int>(input);
-			}
-
-			// Assert
-			Assert.Equal(targetOutput, output);
-		}
-
-		[Fact]
-		public virtual void ExecutionOfResourceByFullNameAndAssemblyIsCorrect()
+		public virtual void ExecutionOfResourceByNameAndAssemblyIsCorrect()
 		{
 			// Arrange
 			const string resourceName = "JavaScriptEngineSwitcher.Tests.Resources.power.js";