(#63) Tests: fix everything after the resource migration

ForNeVeR · Dec 31, 2022 · f9aeb82 · f9aeb82
1 parent 16c7420
commit f9aeb82
Show file tree

Hide file tree

Showing 15 changed files with 51 additions and 21 deletions.
diff --git a/WpfMath.Shared/Data/WpfMathResourceMarker.cs b/WpfMath.Shared/Data/WpfMathResourceMarker.cs
@@ -0,0 +1,6 @@
+namespace WpfMath.Data;
+
+/// <summary>Marks an assembly containing the WPF-Math resource files (XML and fonts).</summary>
+public static class WpfMathResourceMarker
+{
+}
diff --git a/WpfMath.Shared/Utils/AssemblyEx.cs b/WpfMath.Shared/Utils/AssemblyEx.cs
@@ -0,0 +1,12 @@
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace WpfMath.Utils;
+
+internal static class AssemblyEx
+{
+    public static Stream ReadResource(this Assembly assembly, string resourceName) =>
+        assembly.GetManifestResourceStream(resourceName)
+        ?? throw new Exception($"Cannot find resource {resourceName} in assembly {assembly}.");
+}
diff --git a/WpfMath.Shared/Utils/TupleExtensions.cs b/WpfMath.Shared/Utils/TupleExtensions.cs
@@ -1,6 +1,8 @@
+using System;
+
 namespace WpfMath.Utils
 {
-#if NET452 // not needed for .NET Core 3.0+ because there're System.TupleExtensions
+#if NET452 // not needed for .NET Core 3.0+ because there are System.TupleExtensions
     internal static class TupleExtensions
     {
         public static void Deconstruct<T1, T2>(this Tuple<T1, T2> tuple, out T1 x1, out T2 x2)

diff --git a/WpfMath.Shared/WpfMath.Shared.csproj b/WpfMath.Shared/WpfMath.Shared.csproj
@@ -14,13 +14,6 @@
       <EmbeddedResource Include="Data\TexSymbols.xml" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Resource Include="Fonts\cmex10.ttf" />
-      <Resource Include="Fonts\cmmi10.ttf" />
-      <Resource Include="Fonts\cmr10.ttf" />
-      <Resource Include="Fonts\cmsy10.ttf" />
-    </ItemGroup>
-
     <ItemGroup>
         <InternalsVisibleTo Include="WpfMath" />
         <InternalsVisibleTo Include="WpfMath.Tests" />

diff --git a/src/WpfMath/Colors/PredefinedColorParser.cs b/src/WpfMath/Colors/PredefinedColorParser.cs
@@ -2,9 +2,10 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Reflection;
 using System.Windows.Media;
 using System.Xml.Linq;
+using WpfMath.Data;
+using WpfMath.Utils;
 
 namespace WpfMath.Colors
 {
@@ -17,7 +18,7 @@ public class PredefinedColorParser : IColorParser
 
         private PredefinedColorParser(string resourceName)
         {
-            using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName))
+            using (var resource = typeof(WpfMathResourceMarker).Assembly.ReadResource(resourceName))
             {
                 var doc = XDocument.Load(resource);
                 _colors = Parse(doc.Root);

diff --git a/src/WpfMath/DefaultTexFontParser.cs b/src/WpfMath/DefaultTexFontParser.cs
@@ -4,6 +4,8 @@
 using System.Reflection;
 using System.Windows.Media;
 using System.Xml.Linq;
+using WpfMath.Data;
+using WpfMath.Utils;
 
 namespace WpfMath
 {
@@ -48,7 +50,8 @@ private static void SetCharChildParsers()
 
         public DefaultTexFontParser()
         {
-            var doc = XDocument.Load(new System.IO.StreamReader(Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName)!));
+            using var resource = typeof(WpfMathResourceMarker).Assembly.ReadResource(resourceName);
+            var doc = XDocument.Load(resource);
             this.rootElement = doc.Root;
 
             this.parsedTextStyles = new Dictionary<string, CharFont[]>();

diff --git a/WpfMath.Shared/Fonts/cmex10.ttf → src/WpfMath/Fonts/cmex10.ttf b/WpfMath.Shared/Fonts/cmex10.ttf → src/WpfMath/Fonts/cmex10.ttf
diff --git a/WpfMath.Shared/Fonts/cmmi10.ttf → src/WpfMath/Fonts/cmmi10.ttf b/WpfMath.Shared/Fonts/cmmi10.ttf → src/WpfMath/Fonts/cmmi10.ttf
diff --git a/WpfMath.Shared/Fonts/cmr10.ttf → src/WpfMath/Fonts/cmr10.ttf b/WpfMath.Shared/Fonts/cmr10.ttf → src/WpfMath/Fonts/cmr10.ttf
diff --git a/WpfMath.Shared/Fonts/cmsy10.ttf → src/WpfMath/Fonts/cmsy10.ttf b/WpfMath.Shared/Fonts/cmsy10.ttf → src/WpfMath/Fonts/cmsy10.ttf
diff --git a/src/WpfMath/GlueSettingsParser.cs b/src/WpfMath/GlueSettingsParser.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Xml.Linq;
+using WpfMath.Data;
+using WpfMath.Utils;
 
 namespace WpfMath
 {
@@ -58,7 +59,8 @@ private static void SetStyleMappings()
 
         public GlueSettingsParser()
         {
-            var doc = XDocument.Load(new System.IO.StreamReader(Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName)!));
+            using var resource = typeof(WpfMathResourceMarker).Assembly.ReadResource(resourceName);
+            var doc = XDocument.Load(resource);
             this.rootElement = doc.Root;
 
             this.glueTypes = new List<Glue>();

diff --git a/src/WpfMath/PredefinedTexFormulaSettingsParser.cs b/src/WpfMath/PredefinedTexFormulaSettingsParser.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Reflection;
 using System.Xml.Linq;
+using WpfMath.Data;
+using WpfMath.Utils;
 
 namespace WpfMath
 {
@@ -31,7 +32,8 @@ private static void AddToMap(IEnumerable<XElement> mapList, string[] table)
 
         public TexPredefinedFormulaSettingsParser()
         {
-            var doc = XDocument.Load(new System.IO.StreamReader(Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName)!));
+            using var resource = typeof(WpfMathResourceMarker).Assembly.ReadResource(resourceName);
+            var doc = XDocument.Load(resource);
             this.rootElement = doc.Root;
         }
 

diff --git a/src/WpfMath/TexPredefinedFormulaParser.cs b/src/WpfMath/TexPredefinedFormulaParser.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
-using System.IO;
-using System.Reflection;
 using System.Windows.Media;
 using System.Xml.Linq;
+using WpfMath.Data;
 using WpfMath.Parsers.PredefinedFormulae;
+using WpfMath.Utils;
 
 namespace WpfMath
 {
@@ -83,7 +83,8 @@ private static Type[] GetArgumentTypes(IEnumerable<XElement> args)
 
         public TexPredefinedFormulaParser()
         {
-            var doc = XDocument.Load(new StreamReader(Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName)!));
+            using var resource = typeof(WpfMathResourceMarker).Assembly.ReadResource(resourceName);
+            var doc = XDocument.Load(resource);
             this.rootElement = doc.Root;
         }
 

diff --git a/src/WpfMath/TexSymbolParser.cs b/src/WpfMath/TexSymbolParser.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
 using System.Xml.Linq;
 using WpfMath.Atoms;
+using WpfMath.Data;
+using WpfMath.Utils;
 
 namespace WpfMath
 {
@@ -38,7 +38,8 @@ private static void SetTypeMappings()
         public TexSymbolParser()
         {
             // for 3.5
-            var doc = XDocument.Load(new StreamReader(Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName)!));
+            using var resource = typeof(WpfMathResourceMarker).Assembly.ReadResource(resourceName);
+            var doc =  XDocument.Load(resource);
             this.rootElement = doc.Root;
         }
 

diff --git a/src/WpfMath/WpfMath.csproj b/src/WpfMath/WpfMath.csproj
@@ -36,6 +36,13 @@ Fixed:
         <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
     </PropertyGroup>
 
+    <ItemGroup>
+      <Resource Include="Fonts\cmex10.ttf" />
+      <Resource Include="Fonts\cmmi10.ttf" />
+      <Resource Include="Fonts\cmr10.ttf" />
+      <Resource Include="Fonts\cmsy10.ttf" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     </ItemGroup>