Merge pull request #3 from Burgyn/tests/addembdebedresources

Add resources in tests as embeddedresources
Burgyn · Dec 31, 2018 · 4efb90c · 4efb90c
2 parents 947c1af + f34b558
commit 4efb90c
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 265 deletions.
diff --git a/tests/MMLib.SwaggerForOcelot.Tests/AssemblyHelper.cs b/tests/MMLib.SwaggerForOcelot.Tests/AssemblyHelper.cs
@@ -0,0 +1,29 @@
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MMLib.SwaggerForOcelot.Tests
+{
+    /// <summary>
+    /// Assembly helper class.
+    /// </summary>
+    public static class AssemblyHelper
+    {
+        private const string RootNamespaceResources = "MMLib.SwaggerForOcelot.Tests.Resources";
+
+        /// <summary>
+        /// Gets the string from resource file asynchronous.
+        /// </summary>
+        /// <param name="resourceFile">The resource file name.</param>
+        public static async Task<string> GetStringFromResourceFileAsync(string resourceFile)
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var resourceStream = assembly.GetManifestResourceStream($"{RootNamespaceResources}.{resourceFile}");
+            using (var reader = new StreamReader(resourceStream, Encoding.UTF8))
+            {
+                return await reader.ReadToEndAsync();
+            }
+        }
+    }
+}
diff --git a/tests/MMLib.SwaggerForOcelot.Tests/MMLib.SwaggerForOcelot.Tests.csproj b/tests/MMLib.SwaggerForOcelot.Tests/MMLib.SwaggerForOcelot.Tests.csproj
@@ -1,11 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Resources\SwaggerBase.txt" />
+    <None Remove="Resources\SwaggerBaseTransformed.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\SwaggerBase.txt" />
+    <EmbeddedResource Include="Resources\SwaggerBaseTransformed.txt" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.5.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
@@ -21,18 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
+    <Folder Include="Properties\" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/MMLib.SwaggerForOcelot.Tests/Properties/Resources.Designer.cs b/tests/MMLib.SwaggerForOcelot.Tests/Properties/Resources.Designer.cs
diff --git a/tests/MMLib.SwaggerForOcelot.Tests/Properties/Resources.resx b/tests/MMLib.SwaggerForOcelot.Tests/Properties/Resources.resx
diff --git a/tests/MMLib.SwaggerForOcelot.Tests/SwaggerJsonFormatterShould.cs b/tests/MMLib.SwaggerForOcelot.Tests/SwaggerJsonFormatterShould.cs
@@ -2,18 +2,22 @@
 using MMLib.SwaggerForOcelot.Configuration;
 using MMLib.SwaggerForOcelot.Transformation;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace MMLib.SwaggerForOcelot.Tests
 {
     public class SwaggerJsonFormatterShould
     {
         [Fact]
-        public void CreateNewJsonByBasicConfiguration()
+        public async Task CreateNewJsonByBasicConfiguration()
         {
             var transformer = new SwaggerJsonTransformer();
+            var swaggerBase = await AssemblyHelper
+                .GetStringFromResourceFileAsync("SwaggerBase.txt");
+
             var transfomed = transformer.Transform(
-                Properties.Resources.SwaggerBase,
+                swaggerBase,
                 new List<ReRouteOptions>()
                 {
                     new ReRouteOptions(){
@@ -23,15 +27,17 @@ public void CreateNewJsonByBasicConfiguration()
                 });
 
             transfomed.Should()
-                .Be(Properties.Resources.SwaggerBaseTransformed);
+                .Be(await AssemblyHelper
+                    .GetStringFromResourceFileAsync("SwaggerBaseTransformed.txt"));
         }
 
         [Fact]
-        public void CreateNewJsonByBasicConfigurationWithVirtualDirectory()
+        public async Task CreateNewJsonByBasicConfigurationWithVirtualDirectory()
         {
             var transformer = new SwaggerJsonTransformer();
             var transfomed = transformer.Transform(
-                Properties.Resources.SwaggerBase,
+                await AssemblyHelper
+                    .GetStringFromResourceFileAsync("SwaggerBase.txt"),
                 new List<ReRouteOptions>()
                 {
                     new ReRouteOptions(){
@@ -42,7 +48,8 @@ public void CreateNewJsonByBasicConfigurationWithVirtualDirectory()
                 });
 
             transfomed.Should()
-                .Be(Properties.Resources.SwaggerBaseTransformed);
+                .Be(await AssemblyHelper
+                    .GetStringFromResourceFileAsync("SwaggerBaseTransformed.txt"));
         }
     }
 }