From 33ea1925c729eff9519399b3f3bf1575a2bef454 Mon Sep 17 00:00:00 2001 From: Benedikt Schroeder Date: Sun, 20 May 2018 20:36:14 +0200 Subject: [PATCH] Fixed unit tests --- tests/Avalonia.UnitTests/MockAssetLoader.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/Avalonia.UnitTests/MockAssetLoader.cs b/tests/Avalonia.UnitTests/MockAssetLoader.cs index d6b70aee16..ca1135acbd 100644 --- a/tests/Avalonia.UnitTests/MockAssetLoader.cs +++ b/tests/Avalonia.UnitTests/MockAssetLoader.cs @@ -4,7 +4,6 @@ using System.IO; using System.Linq; using System.Reflection; using System.Text; -using System.Threading.Tasks; using Avalonia.Platform; namespace Avalonia.UnitTests @@ -28,9 +27,14 @@ namespace Avalonia.UnitTests return new MemoryStream(Encoding.UTF8.GetBytes(_assets[uri])); } - public Tuple OpenAndGetAssembly(Uri uri, Uri baseUri = null) + public (Stream Stream, Assembly Assembly) OpenAndGetAssembly(Uri uri, Uri baseUri = null) { - return Tuple.Create(Open(uri, baseUri), (Assembly)null); + return (Open(uri, baseUri), (Assembly)null); + } + + public IEnumerable<(string AbsolutePath, Assembly Assembly)> GetAssets(Uri location) + { + return _assets.Keys.Select(x => (x.AbsolutePath, Assembly.GetEntryAssembly())); } public void SetDefaultAssembly(Assembly asm)