From 4d5586c42662966846769f33df2ac3fed5ad10b1 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 22 Nov 2022 18:18:32 +0100 Subject: [PATCH] Test for exception first. --- .../TestSuite.ApiTests/AssetTests.cs | 65 +++++++++---------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/backend/tools/TestSuite/TestSuite.ApiTests/AssetTests.cs b/backend/tools/TestSuite/TestSuite.ApiTests/AssetTests.cs index bc535a8df..024531d43 100644 --- a/backend/tools/TestSuite/TestSuite.ApiTests/AssetTests.cs +++ b/backend/tools/TestSuite/TestSuite.ApiTests/AssetTests.cs @@ -56,9 +56,9 @@ public class AssetTests : IClassFixture progress.AsOptions()); } + Assert.Null(progress.Exception); Assert.NotEmpty(progress.Progress); Assert.NotNull(progress.Asset); - Assert.Null(progress.Exception); await using (var stream = new FileStream("Assets/SampleVideo_1280x720_1mb.mp4", FileMode.Open)) { @@ -101,9 +101,9 @@ public class AssetTests : IClassFixture } } + Assert.Null(progress.Exception); Assert.NotEmpty(progress.Progress); Assert.NotNull(progress.Asset); - Assert.Null(progress.Exception); Assert.True(numUploads > 1); await using (var stream = new FileStream("Assets/SampleVideo_1280x720_1mb.mp4", FileMode.Open)) @@ -215,9 +215,9 @@ public class AssetTests : IClassFixture progress.AsOptions(asset_1.Id)); } + Assert.Null(progress.Exception); Assert.NotNull(progress.Asset); Assert.NotEmpty(progress.Progress); - Assert.Null(progress.Exception); await using (var stream = new FileStream("Assets/SampleVideo_1280x720_1mb.mp4", FileMode.Open)) { @@ -231,51 +231,48 @@ public class AssetTests : IClassFixture [Fact] public async Task Should_replace_asset_using_tus_in_chunks() { - for (var i = 0; i < 5; i++) - { - // STEP 1: Create asset - var asset_1 = await _.Assets.UploadFileAsync(_.AppName, "Assets/logo-squared.png", "image/png"); + // STEP 1: Create asset + var asset_1 = await _.Assets.UploadFileAsync(_.AppName, "Assets/logo-squared.png", "image/png"); - // STEP 2: Reupload asset - progress = new ProgressHandler(); + // STEP 2: Reupload asset + progress = new ProgressHandler(); - var fileParameter = FileParameter.FromPath("Assets/SampleVideo_1280x720_1mb.mp4"); + var fileParameter = FileParameter.FromPath("Assets/SampleVideo_1280x720_1mb.mp4"); - var pausingStream = new PauseStream(fileParameter.Data, 0.5); - var pausingFile = new FileParameter(pausingStream, fileParameter.FileName, fileParameter.ContentType); + var pausingStream = new PauseStream(fileParameter.Data, 0.5); + var pausingFile = new FileParameter(pausingStream, fileParameter.FileName, fileParameter.ContentType); - var numUploads = 0; + var numUploads = 0; - await using (pausingFile.Data) - { - using var cts = new CancellationTokenSource(5000); + await using (pausingFile.Data) + { + using var cts = new CancellationTokenSource(5000); - while (progress.Asset == null && progress.Exception == null) - { - pausingStream.Reset(); + while (progress.Asset == null && progress.Exception == null) + { + pausingStream.Reset(); - await _.Assets.UploadAssetAsync(_.AppName, pausingFile, - progress.AsOptions(asset_1.Id), cts.Token); + await _.Assets.UploadAssetAsync(_.AppName, pausingFile, + progress.AsOptions(asset_1.Id), cts.Token); - await Task.Delay(50, cts.Token); + await Task.Delay(50, cts.Token); - numUploads++; - } + numUploads++; } + } - Assert.NotEmpty(progress.Progress); - Assert.NotNull(progress.Asset); - Assert.Null(progress.Exception); - Assert.True(numUploads > 1); + Assert.Null(progress.Exception); + Assert.NotEmpty(progress.Progress); + Assert.NotNull(progress.Asset); + Assert.True(numUploads > 1); - await using (var stream = new FileStream("Assets/SampleVideo_1280x720_1mb.mp4", FileMode.Open)) - { - var downloaded = await _.DownloadAsync(progress.Asset); + await using (var stream = new FileStream("Assets/SampleVideo_1280x720_1mb.mp4", FileMode.Open)) + { + var downloaded = await _.DownloadAsync(progress.Asset); - // Should dowload with correct size. - Assert.Equal(stream.Length, downloaded.Length); - } + // Should dowload with correct size. + Assert.Equal(stream.Length, downloaded.Length); } }