[UWP][UnitTests] Move sample resource resolver into shared test libra…

…ry (#3074)
microsoft · Jun 24, 2019 · 0b5bd2e · 0b5bd2e
1 parent ed1226c
commit 0b5bd2e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 16 deletions.
diff --git a/source/uwp/AdaptiveCardTestApp/AdaptiveCardTestApp.csproj b/source/uwp/AdaptiveCardTestApp/AdaptiveCardTestApp.csproj
@@ -127,7 +127,6 @@
  <Compile Include="Pages\StartPage.xaml.cs">
  <DependentUpon>StartPage.xaml</DependentUpon>
  </Compile>
- <Compile Include="ResourceResolvers\SampleResourceResolver.cs" />
  <Compile Include="ViewModels\TestResultsViewModel.cs" />
  <Compile Include="ViewModels\TestResultsCategoryViewModel.cs" />
  <Compile Include="ViewModels\RunningTestsViewModel.cs" />

diff --git a/source/uwp/AdaptiveCardTestApp/ViewModels/RunningTestsViewModel.cs b/source/uwp/AdaptiveCardTestApp/ViewModels/RunningTestsViewModel.cs
@@ -1,7 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-using AdaptiveCards.Rendering.Uwp;
-using AdaptiveCardTestApp.ResourceResolvers;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -155,16 +153,13 @@ public async Task AddCardToTimeline(FileViewModel card)
 
  private async Task<TestResultViewModel> TestCard(FileViewModel cardFile, FileViewModel hostConfigFile)
  {
- Dictionary<string, IAdaptiveCardResourceResolver> resourceResolvers = new Dictionary<string, IAdaptiveCardResourceResolver>();
- resourceResolvers.Add("symbol", new SampleResourceResolver());
-
  uint reruns = 0;
  TestResultViewModel result = null;
  bool retryImage = true;
 
  while (retryImage)
  {
- var renderResult = await RenderCard(cardFile, hostConfigFile, resourceResolvers);
+ var renderResult = await RenderCard(cardFile, hostConfigFile);
 
  result = await TestResultViewModel.CreateAsync(
  cardFile: cardFile,
@@ -193,9 +188,9 @@ private async Task<TestResultViewModel> TestCard(FileViewModel cardFile, FileVie
  return result;
  }
 
- private async Task<Tuple<RenderedTestResult, StorageFile, StorageFile>> RenderCard(FileViewModel cardFile, FileViewModel hostConfigFile, Dictionary<string, IAdaptiveCardResourceResolver> resourceResolvers)
+ private async Task<Tuple<RenderedTestResult, StorageFile, StorageFile>> RenderCard(FileViewModel cardFile, FileViewModel hostConfigFile)
  {
- var renderResult = await UWPTestLibrary.RenderTestHelpers.RenderCard(cardFile, hostConfigFile, resourceResolvers);
+ var renderResult = await UWPTestLibrary.RenderTestHelpers.RenderCard(cardFile, hostConfigFile);
 
  UWPTestLibrary.ImageWaiter imageWaiter = new ImageWaiter(renderResult.Tree);
 

diff --git a/source/uwp/UWPTestLibrary/RenderTestHelpers.cs b/source/uwp/UWPTestLibrary/RenderTestHelpers.cs
@@ -51,7 +51,7 @@ public static IEnumerable<UIElement> GetAllDescendants(UIElement element)
  }
  }
 
- public static async Task<RenderedTestResult> RenderCard(FileViewModel cardFile, FileViewModel hostConfigFile, Dictionary<string, IAdaptiveCardResourceResolver> resourceResolvers)
+ public static async Task<RenderedTestResult> RenderCard(FileViewModel cardFile, FileViewModel hostConfigFile)
  {
  string error = null;
  string roundTrippedJsonString = null;
@@ -99,10 +99,7 @@ public static async Task<RenderedTestResult> RenderCard(FileViewModel cardFile,
  renderer.HostConfig = hostConfig;
  }
 
- foreach (var resourceResolver in resourceResolvers)
- {
- renderer.ResourceResolvers.Set(resourceResolver.Key, resourceResolver.Value);
- }
+ renderer.ResourceResolvers.Set("symbol", new SampleResourceResolver());
 
  if (hostConfigFile.Name.Contains(FileLoadHelpers.fixedNonInteractiveName))
  {

diff --git a/...sourceResolvers/SampleResourceResolver.cs → .../UWPTestLibrary/SampleResourceResolver.cs b/...sourceResolvers/SampleResourceResolver.cs → .../UWPTestLibrary/SampleResourceResolver.cs
@@ -10,7 +10,7 @@
 using Windows.Storage;
 using Windows.Storage.Streams;
 
-namespace AdaptiveCardTestApp.ResourceResolvers
+namespace UWPTestLibrary
 {
  class SampleResourceResolver : IAdaptiveCardResourceResolver
  {

diff --git a/source/uwp/UWPTestLibrary/UWPTestLibrary.csproj b/source/uwp/UWPTestLibrary/UWPTestLibrary.csproj
@@ -116,6 +116,7 @@
  <Compile Include="Properties\AssemblyInfo.cs" />
  <Compile Include="RenderedTestResult.cs" />
  <Compile Include="RenderTestHelpers.cs" />
+ <Compile Include="SampleResourceResolver.cs" />
  <Compile Include="StoredTestResultInfo.cs" />
  <Compile Include="TestResultViewModel.cs" />
  <EmbeddedResource Include="Properties\TestLibrary.rd.xml" />

diff --git a/source/uwp/UWPUnitTests/UnitTest.cs b/source/uwp/UWPUnitTests/UnitTest.cs
@@ -122,7 +122,7 @@ async public Task TestCard(FileViewModel hostConfigFile, FileViewModel cardFile)
 
  while (retryImage)
  {
- var renderResult = await UWPTestLibrary.RenderTestHelpers.RenderCard(cardFile, hostConfigFile, new Dictionary<string, AdaptiveCards.Rendering.Uwp.IAdaptiveCardResourceResolver>());
+ var renderResult = await UWPTestLibrary.RenderTestHelpers.RenderCard(cardFile, hostConfigFile);
 
  if (renderResult.Tree != null)
  {