Skip to content

Commit fc0a5ff

Browse files
committed
ImageEx tests: Use local image insted of image from web.
use DataRow to test loading ms-appx
1 parent dfaf623 commit fc0a5ff

File tree

2 files changed

+11
-18
lines changed

2 files changed

+11
-18
lines changed
291 Bytes
Loading

UnitTests/UnitTests.UWP/UI/Controls/Test_ImageEx.cs

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using System;
1010
using System.IO;
1111
using System.Linq;
12-
using System.Net.Http;
12+
using System.Reflection;
1313
using System.Threading.Tasks;
1414
using Windows.UI.Xaml;
1515
using Windows.UI.Xaml.Controls;
@@ -29,20 +29,11 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
2929
{
3030
var bitmapImage = new BitmapImage();
3131

32-
using var client = new HttpClient();
33-
var response = await client.GetAsync(new Uri("https://st.depositphotos.com/1428083/2946/i/600/depositphotos_29460297-stock-photo-bird-cage.jpg"));
34-
using var stream = await response.Content.ReadAsStreamAsync();
35-
try
36-
{
37-
using var memStream = new MemoryStream();
38-
await stream.CopyToAsync(memStream);
39-
memStream.Seek(0, SeekOrigin.Begin);
40-
await bitmapImage.SetSourceAsync(memStream.AsRandomAccessStream());
41-
}
42-
catch
43-
{
44-
Assert.Fail();
45-
}
32+
using var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(@"UnitTests.UWP.Assets.StoreLogo.embeded.png");
33+
using var memStream = new MemoryStream();
34+
await stream.CopyToAsync(memStream);
35+
memStream.Seek(0, SeekOrigin.Begin);
36+
await bitmapImage.SetSourceAsync(memStream.AsRandomAccessStream());
4637

4738
var imageLoader = new ImageEx();
4839

@@ -65,9 +56,10 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
6556
}
6657

6758
[TestMethod]
68-
public async Task SetSourceToUriOfData()
59+
[DataRow(ImageString)]
60+
[DataRow(@"ms-appx:///Assets/StoreLogo.png")]
61+
public async Task SetSourceToUri(string uri)
6962
{
70-
var imageOpendedCallCount = 0;
7163
await App.DispatcherQueue.EnqueueAsync(async () =>
7264
{
7365
var imageLoader = new ImageEx();
@@ -76,13 +68,14 @@ await App.DispatcherQueue.EnqueueAsync(async () =>
7668

7769
Assert.AreEqual("Unloaded", GetCurrentState(imageLoader));
7870

71+
var imageOpendedCallCount = 0;
7972
imageLoader.ImageExOpened += (s, e) =>
8073
{
8174
imageOpendedCallCount++;
8275
Assert.AreEqual("Loaded", GetCurrentState(imageLoader));
8376
};
8477

85-
imageLoader.Source = new Uri(ImageString);
78+
imageLoader.Source = new Uri(uri);
8679

8780
// TODO (2021.05.11): Test in a more deterministic way.
8881
// Setting source causes some async code to trigger and

0 commit comments

Comments
 (0)