tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Test fix. (#840)

pull/841/head
Sebastian Stehle 4 years ago
committed by GitHub
parent
23beef2904
commit
1bd81b9002
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 127 additions and 131 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  2. 18
      backend/src/Squidex/Squidex.csproj
  3. 2
      backend/tests/docker-compose.yml
  4. 20
      backend/tools/TestSuite/TestSuite.ApiTests/AssetTests.cs
  5. 2
      backend/tools/TestSuite/TestSuite.ApiTests/TestSuite.ApiTests.csproj
  6. 2
      backend/tools/TestSuite/TestSuite.Shared/TestSuite.Shared.csproj

2
backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
View File

@ -31,7 +31,7 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="OpenTelemetry.Api" Version="1.1.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.Assets" Version="2.15.0" />
<PackageReference Include="Squidex.Assets" Version="2.17.0" />
<PackageReference Include="Squidex.Caching" Version="1.9.0" />
<PackageReference Include="Squidex.Hosting.Abstractions" Version="2.13.0" />
<PackageReference Include="Squidex.Log" Version="1.6.0" />

18
backend/src/Squidex/Squidex.csproj
View File

@ -74,16 +74,16 @@
<PackageReference Include="OrleansDashboard.EmbeddedAssets" Version="3.6.1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="ReportGenerator" Version="5.0.3" PrivateAssets="all" />
<PackageReference Include="Squidex.Assets.Azure" Version="2.15.0" />
<PackageReference Include="Squidex.Assets.GoogleCloud" Version="2.15.0" />
<PackageReference Include="Squidex.Assets.FTP" Version="2.15.0" />
<PackageReference Include="Squidex.Assets.ImageMagick" Version="2.15.0" />
<PackageReference Include="Squidex.Assets.ImageSharp" Version="2.15.0" />
<PackageReference Include="Squidex.Assets.Mongo" Version="2.15.0" />
<PackageReference Include="Squidex.Assets.S3" Version="2.15.0" />
<PackageReference Include="Squidex.Assets.TusAdapter" Version="2.15.0" />
<PackageReference Include="Squidex.Assets.Azure" Version="2.17.0" />
<PackageReference Include="Squidex.Assets.GoogleCloud" Version="2.17.0" />
<PackageReference Include="Squidex.Assets.FTP" Version="2.17.0" />
<PackageReference Include="Squidex.Assets.ImageMagick" Version="2.17.0" />
<PackageReference Include="Squidex.Assets.ImageSharp" Version="2.17.0" />
<PackageReference Include="Squidex.Assets.Mongo" Version="2.17.0" />
<PackageReference Include="Squidex.Assets.S3" Version="2.17.0" />
<PackageReference Include="Squidex.Assets.TusAdapter" Version="2.17.0" />
<PackageReference Include="Squidex.Caching.Orleans" Version="1.9.0" />
<PackageReference Include="Squidex.ClientLibrary" Version="8.5.0" />
<PackageReference Include="Squidex.ClientLibrary" Version="8.6.0" />
<PackageReference Include="Squidex.Hosting" Version="2.13.0" />
<PackageReference Include="Squidex.OpenIddict.MongoDb" Version="4.0.1-dev" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

2
backend/tests/docker-compose.yml
View File

@ -3,7 +3,7 @@ services:
mongo:
image: mongo:latest
ports:
- "27017:27017"
- "27018:27017"
networks:
- internal

20
backend/tools/TestSuite/TestSuite.ApiTests/AssetTests.cs
View File

@ -90,11 +90,13 @@ namespace TestSuite.ApiTests
[Fact]
public async Task Should_upload_asset_using_tus_in_chunks()
{
for (var i = 0; i < 5; i++)
{
// STEP 1: Create asset
var fileParameter = FileParameter.FromPath("Assets/SampleVideo_1280x720_1mb.mp4");
var pausingStream = new PauseStream(fileParameter.Data, 0.25);
var pausingStream = new PauseStream(fileParameter.Data, 0.5);
var pausingFile = new FileParameter(pausingStream, fileParameter.FileName, fileParameter.ContentType);
var numUploads = 0;
@ -111,11 +113,6 @@ namespace TestSuite.ApiTests
{
pausingStream.Reset();
if (pausingStream.Position == pausingStream.Length)
{
throw new InvalidOperationException("Stream end reached.");
}
await _.Assets.UploadNewAssetAsync(_.AppName, pausingFile, new AssetUploadOptions
{
ProgressHandler = new AssetDelegatingProgressHandler
@ -169,6 +166,7 @@ namespace TestSuite.ApiTests
Assert.Equal(stream.Length, downloaded.Length);
}
}
}
[Fact]
public async Task Should_upload_asset_with_custom_id()
@ -282,6 +280,8 @@ namespace TestSuite.ApiTests
[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 _.UploadFileAsync("Assets/logo-squared.png", "image/png");
@ -290,7 +290,7 @@ namespace TestSuite.ApiTests
// STEP 2: Reupload asset
var fileParameter = FileParameter.FromPath("Assets/SampleVideo_1280x720_1mb.mp4");
var pausingStream = new PauseStream(fileParameter.Data, 0.25);
var pausingStream = new PauseStream(fileParameter.Data, 0.5);
var pausingFile = new FileParameter(pausingStream, fileParameter.FileName, fileParameter.ContentType);
var numUploads = 0;
@ -307,11 +307,6 @@ namespace TestSuite.ApiTests
{
pausingStream.Reset();
if (pausingStream.Position == pausingStream.Length)
{
throw new InvalidOperationException("Stream end reached.");
}
await _.Assets.UploadExistingAssetAsync(_.AppName, asset_1.Id, pausingFile, new AssetUploadOptions
{
ProgressHandler = new AssetDelegatingProgressHandler
@ -365,6 +360,7 @@ namespace TestSuite.ApiTests
Assert.Equal(stream.Length, downloaded.Length);
}
}
}
[Fact]
public async Task Should_annote_asset()

2
backend/tools/TestSuite/TestSuite.ApiTests/TestSuite.ApiTests.csproj
View File

@ -20,7 +20,7 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="NSwag.Core" Version="13.15.7" />
<PackageReference Include="Squidex.Assets" Version="2.15.0" />
<PackageReference Include="Squidex.Assets" Version="2.17.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

2
backend/tools/TestSuite/TestSuite.Shared/TestSuite.Shared.csproj
View File

@ -21,7 +21,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.ClientLibrary" Version="8.5.0" />
<PackageReference Include="Squidex.ClientLibrary" Version="8.6.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="xunit" Version="2.4.1" />
</ItemGroup>

Write Preview
Loading…
Cancel
Save