Skip to content

[UWP][UnitTests] Move sample resource resolver into shared test library #3074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RebeccaAnne merged 3 commits into from
Jun 24, 2019
Merged

[UWP][UnitTests] Move sample resource resolver into shared test library #3074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3387958
[UWP][UnitTests] Move sample resource resolver into shared test library
Jun 17, 2019
ba9a2a2
Merge branch 'master' into rebecch/UnitTestResourceResolver
Jun 24, 2019
f30142e
Merge branch 'master' into rebecch/UnitTestResourceResolver
Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion source/uwp/AdaptiveCardTestApp/AdaptiveCardTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
11 changes: 3 additions & 8 deletions source/uwp/AdaptiveCardTestApp/ViewModels/RunningTestsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);

Expand Down
7 changes: 2 additions & 5 deletions source/uwp/UWPTestLibrary/RenderTestHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion ...sourceResolvers/SampleResourceResolver.cs → .../UWPTestLibrary/SampleResourceResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using Windows.Storage;
using Windows.Storage.Streams;

namespace AdaptiveCardTestApp.ResourceResolvers
namespace UWPTestLibrary
{
class SampleResourceResolver : IAdaptiveCardResourceResolver
{
Expand Down
1 change: 1 addition & 0 deletions source/uwp/UWPTestLibrary/UWPTestLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion source/uwp/UWPUnitTests/UnitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down