fix tests
This commit is contained in:
parent
ff79769307
commit
37e0a4715c
@ -26,6 +26,9 @@
|
||||
<PackageReference Include="StackExchange.Redis.Extensions.AspNetCore" Version="7.2.1" />
|
||||
<PackageReference Include="System.Linq.Async" Version="5.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<InternalsVisibleTo Include="ASC.Files.Tests" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\common\ASC.Api.Core\ASC.Api.Core.csproj" />
|
||||
<ProjectReference Include="..\Core\ASC.Files.Core.csproj" />
|
||||
|
||||
@ -26,6 +26,7 @@
|
||||
<PackageReference Include="Microsoft.Graph.Core" Version="1.6.0" />
|
||||
<PackageReference Include="Microsoft.OneDriveSDK" Version="2.1.0" />
|
||||
<PackageReference Include="Microsoft.SharePoint.Client" Version="14.0.4762.1000" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0" />
|
||||
<PackageReference Include="Moq" Version="4.14.7" />
|
||||
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
|
||||
<PackageReference Include="NEST" Version="7.15.2" />
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
@ -10,13 +11,21 @@ using ASC.Core;
|
||||
using ASC.Core.Common.EF;
|
||||
using ASC.Core.Common.EF.Context;
|
||||
using ASC.Core.Tenants;
|
||||
using ASC.Files.Api;
|
||||
using ASC.Files.Core.ApiModels.RequestDto;
|
||||
using ASC.Files.Core.ApiModels.ResponseDto;
|
||||
using ASC.Files.Helpers;
|
||||
using ASC.Files.Model;
|
||||
using ASC.Files.Tests.Infrastructure;
|
||||
using ASC.Web.Files.Classes;
|
||||
using ASC.Web.Files.Services.WCFService;
|
||||
using ASC.Web.Files.Services.WCFService.FileOperations;
|
||||
using ASC.Web.Files.Utils;
|
||||
|
||||
using Autofac;
|
||||
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.Testing;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
@ -27,6 +36,41 @@ using NUnit.Framework.Internal;
|
||||
|
||||
namespace ASC.Files.Tests
|
||||
{
|
||||
class FilesApplication : WebApplicationFactory<Program>
|
||||
{
|
||||
private readonly Dictionary<string, string> _args;
|
||||
|
||||
public FilesApplication(Dictionary<string, string> args)
|
||||
{
|
||||
_args = args;
|
||||
}
|
||||
|
||||
protected override void ConfigureWebHost(IWebHostBuilder builder)
|
||||
{
|
||||
foreach (var s in _args)
|
||||
{
|
||||
builder.UseSetting(s.Key, s.Value);
|
||||
}
|
||||
|
||||
builder.ConfigureAppConfiguration((context, a) =>
|
||||
{
|
||||
(a.Sources[0] as ChainedConfigurationSource).Configuration["pathToConf"] = a.Build()["pathToConf"];
|
||||
});
|
||||
|
||||
builder.ConfigureServices(services =>
|
||||
{
|
||||
var DIHelper = new ASC.Common.DIHelper();
|
||||
DIHelper.Configure(services);
|
||||
foreach (var a in Assembly.Load("ASC.Files").GetTypes().Where(r => r.IsAssignableTo<ControllerBase>()))
|
||||
{
|
||||
DIHelper.TryAdd(a);
|
||||
}
|
||||
});
|
||||
|
||||
base.ConfigureWebHost(builder);
|
||||
}
|
||||
}
|
||||
|
||||
[SetUpFixture]
|
||||
public class MySetUpClass
|
||||
{
|
||||
@ -35,11 +79,17 @@ namespace ASC.Files.Tests
|
||||
[OneTimeSetUp]
|
||||
public void CreateDb()
|
||||
{
|
||||
var host = Program.CreateHostBuilder(new string[] {
|
||||
"--pathToConf", Path.Combine("..", "..", "..", "..","..", "..", "config"),
|
||||
"--ConnectionStrings:default:connectionString", BaseFilesTests.TestConnection,
|
||||
"--migration:enabled", "true",
|
||||
"--core:products:folder", Path.Combine("..", "..", "..", "..","..", "..", "products")}).Build();
|
||||
var host = new FilesApplication(new Dictionary<string, string>
|
||||
{
|
||||
{ "pathToConf", Path.Combine("..","..", "..", "config") },
|
||||
{ "ConnectionStrings:default:connectionString", BaseFilesTests.TestConnection },
|
||||
{ "migration:enabled", "true" },
|
||||
{ "core:products:folder", Path.Combine("..","..", "..", "products") },
|
||||
{ "web:hub::internal", "" }
|
||||
})
|
||||
.WithWebHostBuilder(builder =>
|
||||
{
|
||||
});
|
||||
|
||||
Migrate(host.Services);
|
||||
Migrate(host.Services, Assembly.GetExecutingAssembly().GetName().Name);
|
||||
@ -72,9 +122,15 @@ namespace ASC.Files.Tests
|
||||
public class BaseFilesTests
|
||||
{
|
||||
protected ILog Log { get; set; }
|
||||
protected TagsController TagsController { get; set; }
|
||||
protected SecurityControllerHelper<int> SecurityControllerHelper { get; set; }
|
||||
protected FilesControllerHelper<int> FilesControllerHelper { get; set; }
|
||||
protected OperationControllerHelper<int> OperationControllerHelper { get; set; }
|
||||
protected FoldersControllerHelper<int> FoldersControllerHelper { get; set; }
|
||||
protected GlobalFolderHelper GlobalFolderHelper { get; set; }
|
||||
protected FileStorageService<int> FileStorageService { get; set; }
|
||||
protected FileStorageService<int> FileStorageService { get; set; }
|
||||
protected FileDtoHelper FileDtoHelper { get; set; }
|
||||
protected EntryManager EntryManager { get; set; }
|
||||
protected UserManager UserManager { get; set; }
|
||||
protected Tenant CurrentTenant { get; set; }
|
||||
protected SecurityContext SecurityContext { get; set; }
|
||||
@ -84,14 +140,15 @@ namespace ASC.Files.Tests
|
||||
public const string TestConnection = "Server=localhost;Database=onlyoffice_test;User ID=root;Password=root;Pooling=true;Character Set=utf8;AutoEnlist=false;SSL Mode=none;AllowPublicKeyRetrieval=True";
|
||||
|
||||
public virtual Task SetUp()
|
||||
{
|
||||
var host = Program.CreateHostBuilder(new string[] {
|
||||
"--pathToConf" , Path.Combine("..", "..", "..", "..","..", "..", "config"),
|
||||
"--ConnectionStrings:default:connectionString", TestConnection,
|
||||
"--migration:enabled", "true",
|
||||
"--web:hub:internal", "",
|
||||
})
|
||||
.Build();
|
||||
{
|
||||
var host = new FilesApplication(new Dictionary<string, string>
|
||||
{
|
||||
{ "pathToConf", Path.Combine("..","..", "..", "config") },
|
||||
{ "ConnectionStrings:default:connectionString", TestConnection },
|
||||
{ "migration:enabled", "true" },
|
||||
{ "web:hub:internal", "" }
|
||||
})
|
||||
.WithWebHostBuilder(a => { });
|
||||
|
||||
scope = host.Services.CreateScope();
|
||||
|
||||
@ -100,6 +157,12 @@ namespace ASC.Files.Tests
|
||||
tenantManager.SetCurrentTenant(tenant);
|
||||
CurrentTenant = tenant;
|
||||
|
||||
FileDtoHelper = scope.ServiceProvider.GetService<FileDtoHelper>();
|
||||
EntryManager = scope.ServiceProvider.GetService<EntryManager>();
|
||||
TagsController = scope.ServiceProvider.GetService<TagsController>();
|
||||
SecurityControllerHelper = scope.ServiceProvider.GetService<SecurityControllerHelper<int>>();
|
||||
OperationControllerHelper = scope.ServiceProvider.GetService<OperationControllerHelper<int>>();
|
||||
FoldersControllerHelper = scope.ServiceProvider.GetService<FoldersControllerHelper<int>>();
|
||||
FilesControllerHelper = scope.ServiceProvider.GetService<FilesControllerHelper<int>>();
|
||||
GlobalFolderHelper = scope.ServiceProvider.GetService<GlobalFolderHelper>();
|
||||
UserManager = scope.ServiceProvider.GetService<UserManager>();
|
||||
@ -114,7 +177,7 @@ namespace ASC.Files.Tests
|
||||
|
||||
public async Task DeleteFolderAsync(int folder)
|
||||
{
|
||||
await FilesControllerHelper.DeleteFolder(folder, false, true);
|
||||
await FoldersControllerHelper.DeleteFolder(folder, false, true);
|
||||
while (true)
|
||||
{
|
||||
var statuses = FileStorageService.GetTasksStatuses();
|
||||
@ -137,7 +200,7 @@ namespace ASC.Files.Tests
|
||||
}
|
||||
}
|
||||
|
||||
public BatchModel GetBatchModel(string text)
|
||||
public BatchRequestDto GetBatchModel(string text)
|
||||
{
|
||||
var json = text;
|
||||
|
||||
@ -147,7 +210,7 @@ namespace ASC.Files.Tests
|
||||
var fileIds = root[1].GetProperty("fileIds").EnumerateArray().ToList();
|
||||
var destFolderdId = root[2];
|
||||
|
||||
var batchModel = new BatchModel
|
||||
var batchModel = new BatchRequestDto
|
||||
{
|
||||
FolderIds = folderIds,
|
||||
FileIds = fileIds,
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using ASC.Api.Documents;
|
||||
using ASC.Files.Core.ApiModels.ResponseDto;
|
||||
|
||||
using NUnit.Framework;
|
||||
|
||||
@ -11,8 +11,8 @@ namespace ASC.Files.Tests
|
||||
[TestFixture]
|
||||
class Favorites : BaseFilesTests
|
||||
{
|
||||
private FolderWrapper<int> TestFolder { get; set; }
|
||||
public FileWrapper<int> TestFile { get; private set; }
|
||||
private FolderDto<int> TestFolder { get; set; }
|
||||
public FileDto<int> TestFile { get; private set; }
|
||||
|
||||
public IEnumerable<int> folderIds;
|
||||
public IEnumerable<int> fileIds;
|
||||
@ -21,7 +21,7 @@ namespace ASC.Files.Tests
|
||||
public override async Task SetUp()
|
||||
{
|
||||
await base.SetUp();
|
||||
TestFolder = await FilesControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, "TestFolder").ConfigureAwait(false);
|
||||
TestFolder = await FoldersControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, "TestFolder").ConfigureAwait(false);
|
||||
TestFile = await FilesControllerHelper.CreateFileAsync(GlobalFolderHelper.FolderMy, "TestFile", default).ConfigureAwait(false);
|
||||
folderIds = new List<int> { TestFolder.Id };
|
||||
fileIds = new List<int> { TestFile.Id };
|
||||
@ -45,7 +45,7 @@ namespace ASC.Files.Tests
|
||||
[Order(1)]
|
||||
public void CreateFolderReturnsFolderWrapper(string folderTitle)
|
||||
{
|
||||
var folderWrapper = Assert.ThrowsAsync<InvalidOperationException>(async () => await FilesControllerHelper.CreateFolderAsync(await GlobalFolderHelper.FolderFavoritesAsync, folderTitle));
|
||||
var folderWrapper = Assert.ThrowsAsync<InvalidOperationException>(async () => await FoldersControllerHelper.CreateFolderAsync(await GlobalFolderHelper.FolderFavoritesAsync, folderTitle));
|
||||
Assert.That(folderWrapper.Message == "You don't have enough permission to create");
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using ASC.Api.Documents;
|
||||
using ASC.Files.Core;
|
||||
using ASC.Files.Core.ApiModels.ResponseDto;
|
||||
using ASC.Files.Tests.Infrastructure;
|
||||
using ASC.Web.Files.Services.WCFService.FileOperations;
|
||||
|
||||
@ -13,19 +13,19 @@ namespace ASC.Files.Tests
|
||||
|
||||
public class MyDocuments : BaseFilesTests
|
||||
{
|
||||
private FolderWrapper<int> TestFolder { get; set; }
|
||||
private FolderWrapper<int> TestFolderNotEmpty { get; set; }
|
||||
private FileWrapper<int> TestFile { get; set; }
|
||||
private FolderDto<int> TestFolder { get; set; }
|
||||
private FolderDto<int> TestFolderNotEmpty { get; set; }
|
||||
private FileDto<int> TestFile { get; set; }
|
||||
|
||||
[OneTimeSetUp]
|
||||
public override async Task SetUp()
|
||||
{
|
||||
await base.SetUp();
|
||||
|
||||
TestFolder = await FilesControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, "TestFolder");
|
||||
TestFolderNotEmpty = await FilesControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, "TestFolderNotEmpty");
|
||||
TestFolder = await FoldersControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, "TestFolder");
|
||||
TestFolderNotEmpty = await FoldersControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, "TestFolderNotEmpty");
|
||||
await FilesControllerHelper.CreateFileAsync(TestFolderNotEmpty.Id, "TestFileToContentInTestFolder", default);
|
||||
await FilesControllerHelper.CreateFolderAsync(TestFolderNotEmpty.Id, "TestFolderToContentInTestFolder");
|
||||
await FoldersControllerHelper.CreateFolderAsync(TestFolderNotEmpty.Id, "TestFolderToContentInTestFolder");
|
||||
TestFile = await FilesControllerHelper.CreateFileAsync(GlobalFolderHelper.FolderMy, "TestFile", default);
|
||||
}
|
||||
|
||||
@ -47,7 +47,7 @@ namespace ASC.Files.Tests
|
||||
[Order(5)]
|
||||
public async Task CreateFolderReturnsFolderWrapper(string folderTitle)
|
||||
{
|
||||
var folderWrapper = await FilesControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, folderTitle);
|
||||
var folderWrapper = await FoldersControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, folderTitle);
|
||||
Assert.IsNotNull(folderWrapper);
|
||||
Assert.AreEqual(folderTitle, folderWrapper.Title);
|
||||
await DeleteFolderAsync(folderWrapper.Id);
|
||||
@ -59,7 +59,7 @@ namespace ASC.Files.Tests
|
||||
[Description("Empty Content")]
|
||||
public async Task GetFolderEmptyReturnsFolderContentWrapper(bool withSubFolders, int filesCountExpected, int foldersCountExpected)
|
||||
{
|
||||
var folderContentWrapper = await FilesControllerHelper.GetFolderAsync(
|
||||
var folderContentWrapper = await FoldersControllerHelper.GetFolderAsync(
|
||||
TestFolder.Id,
|
||||
UserOptions.Id,
|
||||
FilterType.None,
|
||||
@ -78,7 +78,7 @@ namespace ASC.Files.Tests
|
||||
[Description("Not Empty Content")]
|
||||
public async Task GetFolderNotEmptyReturnsFolderContentWrapper(bool withSubFolders, int filesCountExpected, int foldersCountExpected)
|
||||
{
|
||||
var folderContentWrapper = await FilesControllerHelper.GetFolderAsync(
|
||||
var folderContentWrapper = await FoldersControllerHelper.GetFolderAsync(
|
||||
TestFolderNotEmpty.Id,
|
||||
UserOptions.Id,
|
||||
FilterType.None,
|
||||
@ -96,7 +96,7 @@ namespace ASC.Files.Tests
|
||||
[Order(8)]
|
||||
public async Task GetFolderInfoReturnsFolderWrapper(string folderTitleExpected)
|
||||
{
|
||||
var folderWrapper = await FilesControllerHelper.GetFolderInfoAsync(TestFolder.Id);
|
||||
var folderWrapper = await FoldersControllerHelper.GetFolderInfoAsync(TestFolder.Id);
|
||||
|
||||
Assert.IsNotNull(folderWrapper);
|
||||
Assert.AreEqual(folderTitleExpected, folderWrapper.Title);
|
||||
@ -109,7 +109,7 @@ namespace ASC.Files.Tests
|
||||
[Order(9)]
|
||||
public async Task RenameFolderReturnsFolderWrapper(string folderTitle)
|
||||
{
|
||||
var folderWrapper = await FilesControllerHelper.RenameFolderAsync(TestFolder.Id, folderTitle);
|
||||
var folderWrapper = await FoldersControllerHelper.RenameFolderAsync(TestFolder.Id, folderTitle);
|
||||
|
||||
Assert.IsNotNull(folderWrapper);
|
||||
Assert.AreEqual(folderTitle, folderWrapper.Title);
|
||||
@ -120,7 +120,7 @@ namespace ASC.Files.Tests
|
||||
[Order(10)]
|
||||
public async Task DeleteFolderReturnsFolderWrapper(bool deleteAfter, bool immediately)
|
||||
{
|
||||
await FilesControllerHelper.DeleteFolder(TestFolder.Id, deleteAfter, immediately);
|
||||
await FoldersControllerHelper.DeleteFolder(TestFolder.Id, deleteAfter, immediately);
|
||||
while (true)
|
||||
{
|
||||
var statuses = FileStorageService.GetTasksStatuses();
|
||||
@ -197,9 +197,9 @@ namespace ASC.Files.Tests
|
||||
{
|
||||
var batchModel = GetBatchModel(json);
|
||||
|
||||
var statuses = await FilesControllerHelper.MoveBatchItemsAsync(batchModel);
|
||||
var statuses = await OperationControllerHelper.MoveBatchItemsAsync(batchModel);
|
||||
|
||||
FileOperationWraper status = null;
|
||||
FileOperationDto status = null;
|
||||
foreach (var item in statuses)
|
||||
{
|
||||
if (item.OperationType == FileOperationType.Move)
|
||||
@ -219,8 +219,8 @@ namespace ASC.Files.Tests
|
||||
{
|
||||
var batchModel = GetBatchModel(json);
|
||||
|
||||
var statuses = await FilesControllerHelper.CopyBatchItemsAsync(batchModel);
|
||||
FileOperationWraper status = null;
|
||||
var statuses = await OperationControllerHelper.CopyBatchItemsAsync(batchModel);
|
||||
FileOperationDto status = null;
|
||||
foreach (var item in statuses)
|
||||
{
|
||||
if (item.OperationType == FileOperationType.Copy)
|
||||
|
||||
@ -2,8 +2,9 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using ASC.Api.Documents;
|
||||
using ASC.Core.Users;
|
||||
using ASC.Files.Core.ApiModels;
|
||||
using ASC.Files.Core.ApiModels.ResponseDto;
|
||||
|
||||
using NUnit.Framework;
|
||||
|
||||
@ -12,8 +13,8 @@ namespace ASC.Files.Tests
|
||||
[TestFixture]
|
||||
class Recent : BaseFilesTests
|
||||
{
|
||||
private FolderWrapper<int> TestFolder { get; set; }
|
||||
public FileWrapper<int> TestFile { get; private set; }
|
||||
private FolderDto<int> TestFolder { get; set; }
|
||||
public FileDto<int> TestFile { get; private set; }
|
||||
public IEnumerable<FileShareParams> TestFileShare { get; private set; }
|
||||
public UserInfo NewUser { get; set; }
|
||||
|
||||
@ -21,7 +22,7 @@ namespace ASC.Files.Tests
|
||||
public override async Task SetUp()
|
||||
{
|
||||
await base.SetUp();
|
||||
TestFolder = await FilesControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, "TestFolder");
|
||||
TestFolder = await FoldersControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, "TestFolder");
|
||||
TestFile = await FilesControllerHelper.CreateFileAsync(GlobalFolderHelper.FolderMy, "TestFile", default);
|
||||
NewUser = UserManager.GetUsers(Guid.Parse("005bb3ff-7de3-47d2-9b3d-61b9ec8a76a5"));
|
||||
TestFileShare = new List<FileShareParams> { new FileShareParams { Access = Core.Security.FileShare.Read, ShareTo = NewUser.Id } };
|
||||
@ -45,7 +46,7 @@ namespace ASC.Files.Tests
|
||||
[Order(1)]
|
||||
public void CreateFolderReturnsFolderWrapper(string folderTitle)
|
||||
{
|
||||
var folderWrapper = Assert.ThrowsAsync<InvalidOperationException>(async () => await FilesControllerHelper.CreateFolderAsync(await GlobalFolderHelper.FolderRecentAsync, folderTitle));
|
||||
var folderWrapper = Assert.ThrowsAsync<InvalidOperationException>(async () => await FoldersControllerHelper.CreateFolderAsync(await GlobalFolderHelper.FolderRecentAsync, folderTitle));
|
||||
Assert.That(folderWrapper.Message == "You don't have enough permission to create");
|
||||
}
|
||||
|
||||
@ -54,7 +55,7 @@ namespace ASC.Files.Tests
|
||||
[Order(1)]
|
||||
public void CreateFileReturnsFolderWrapper(string folderTitle)
|
||||
{
|
||||
var folderWrapper = Assert.ThrowsAsync<InvalidOperationException>(async () => await FilesControllerHelper.CreateFolderAsync(await GlobalFolderHelper.FolderRecentAsync, folderTitle));
|
||||
var folderWrapper = Assert.ThrowsAsync<InvalidOperationException>(async () => await FoldersControllerHelper.CreateFolderAsync(await GlobalFolderHelper.FolderRecentAsync, folderTitle));
|
||||
Assert.That(folderWrapper.Message == "You don't have enough permission to create");
|
||||
}
|
||||
|
||||
@ -63,7 +64,7 @@ namespace ASC.Files.Tests
|
||||
[Order(2)]
|
||||
public async Task RecentFileReturnsFolderWrapper(string fileTitleExpected)
|
||||
{
|
||||
var RecentFolder = await FilesControllerHelper.AddToRecentAsync(TestFile.Id);
|
||||
var RecentFolder = await AddToRecentAsync(TestFile.Id);
|
||||
Assert.IsNotNull(RecentFolder);
|
||||
Assert.AreEqual(fileTitleExpected + ".docx", RecentFolder.Title);
|
||||
}
|
||||
@ -72,7 +73,7 @@ namespace ASC.Files.Tests
|
||||
[Order(4)]
|
||||
public async Task DeleteRecentFileReturnsFolderWrapper(string fileTitleExpected)
|
||||
{
|
||||
var RecentFolder = await FilesControllerHelper.AddToRecentAsync(TestFile.Id);
|
||||
var RecentFolder = await AddToRecentAsync(TestFile.Id);
|
||||
await FilesControllerHelper.DeleteFileAsync(
|
||||
TestFile.Id,
|
||||
false,
|
||||
@ -95,11 +96,19 @@ namespace ASC.Files.Tests
|
||||
[Order(3)]
|
||||
public async Task ShareFileToAnotherUserAddToRecent(string fileTitleExpected, bool notify, string message)
|
||||
{
|
||||
await FilesControllerHelper.SetFileSecurityInfoAsync(TestFile.Id, TestFileShare, notify, message);
|
||||
await SecurityControllerHelper.SetFileSecurityInfoAsync(TestFile.Id, TestFileShare, notify, message);
|
||||
SecurityContext.AuthenticateMe(NewUser.Id);
|
||||
var RecentFile = await FilesControllerHelper.AddToRecentAsync(TestFile.Id);
|
||||
var RecentFile = await AddToRecentAsync(TestFile.Id);
|
||||
Assert.IsNotNull(RecentFile);
|
||||
Assert.AreEqual(fileTitleExpected + ".docx", RecentFile.Title);
|
||||
}
|
||||
|
||||
private async Task<FileDto<int>> AddToRecentAsync(int fileId)
|
||||
{
|
||||
var file = await FileStorageService.GetFileAsync(fileId, -1);
|
||||
EntryManager.MarkAsRecent(file);
|
||||
|
||||
return await FileDtoHelper.GetAsync(file);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,11 +5,12 @@ using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using ASC.Api.Documents;
|
||||
using ASC.Core;
|
||||
using ASC.Core.Users;
|
||||
using ASC.Files.Core.ApiModels;
|
||||
using ASC.Files.Core.ApiModels.ResponseDto;
|
||||
using ASC.Files.Core.Resources;
|
||||
using ASC.Web.Api.Models;
|
||||
using ASC.Web.Api.Models;
|
||||
using ASC.Web.Files.Services.WCFService.FileOperations;
|
||||
|
||||
using NUnit.Framework;
|
||||
@ -19,23 +20,23 @@ namespace ASC.Files.Tests
|
||||
[TestFixture]
|
||||
class SharedWithMeTest : BaseFilesTests
|
||||
{
|
||||
private FolderWrapper<int> TestFolderRead { get; set; }
|
||||
public FileWrapper<int> TestFileRead { get; private set; }
|
||||
private FolderWrapper<int> TestFolderReadAndWrite { get; set; }
|
||||
public FileWrapper<int> TestFileReadAndWrite { get; private set; }
|
||||
private FolderDto<int> TestFolderRead { get; set; }
|
||||
public FileDto<int> TestFileRead { get; private set; }
|
||||
private FolderDto<int> TestFolderReadAndWrite { get; set; }
|
||||
public FileDto<int> TestFileReadAndWrite { get; private set; }
|
||||
public IEnumerable<FileShareParams> TestFolderParamRead { get; private set; }
|
||||
public IEnumerable<FileShareParams> TestFolderParamReadAndWrite { get; private set; }
|
||||
public UserInfo NewUser { get; set; }
|
||||
public TenantManager tenantManager { get; private set; }
|
||||
public EmployeeWraperFull TestUser { get; private set; }
|
||||
public EmployeeFullDto TestUser { get; private set; }
|
||||
|
||||
[OneTimeSetUp]
|
||||
public override async Task SetUp()
|
||||
{
|
||||
await base.SetUp();
|
||||
TestFolderRead = await FilesControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, "TestFolderRead");
|
||||
TestFolderRead = await FoldersControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, "TestFolderRead");
|
||||
TestFileRead = await FilesControllerHelper.CreateFileAsync(GlobalFolderHelper.FolderMy, "TestFileRead", default);
|
||||
TestFolderReadAndWrite = await FilesControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, "TestFolderReadAndWrite");
|
||||
TestFolderReadAndWrite = await FoldersControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, "TestFolderReadAndWrite");
|
||||
TestFileReadAndWrite = await FilesControllerHelper.CreateFileAsync(GlobalFolderHelper.FolderMy, "TestFileReadAndWrite", default);
|
||||
NewUser = UserManager.GetUsers(Guid.Parse("005bb3ff-7de3-47d2-9b3d-61b9ec8a76a5"));
|
||||
TestFolderParamRead = new List<FileShareParams> { new FileShareParams { Access = Core.Security.FileShare.Read, ShareTo = NewUser.Id } };
|
||||
@ -63,7 +64,7 @@ namespace ASC.Files.Tests
|
||||
[Order(1)]
|
||||
public void CreateSharedFolderReturnsFolderWrapperRead(string folderTitle)
|
||||
{
|
||||
var folderWrapper = Assert.ThrowsAsync<InvalidOperationException>(async () => await FilesControllerHelper.CreateFolderAsync(await GlobalFolderHelper.FolderShareAsync, folderTitle));
|
||||
var folderWrapper = Assert.ThrowsAsync<InvalidOperationException>(async () => await FoldersControllerHelper.CreateFolderAsync(await GlobalFolderHelper.FolderShareAsync, folderTitle));
|
||||
Assert.That(folderWrapper.Message == "You don't have enough permission to create");
|
||||
}
|
||||
|
||||
@ -74,7 +75,7 @@ namespace ASC.Files.Tests
|
||||
[Order(2)]
|
||||
public async Task ShareFolderToAnotherUserRead(bool notify, string message)
|
||||
{
|
||||
var shareFolder = await FilesControllerHelper.SetFolderSecurityInfoAsync(TestFolderRead.Id, TestFolderParamRead, notify, message);
|
||||
var shareFolder = await SecurityControllerHelper.SetFolderSecurityInfoAsync(TestFolderRead.Id, TestFolderParamRead, notify, message);
|
||||
Assert.IsNotNull(shareFolder);
|
||||
}
|
||||
|
||||
@ -84,7 +85,7 @@ namespace ASC.Files.Tests
|
||||
public async Task GetSharedFolderInfoReturnsFolderWrapperRead(string folderTitleExpected)
|
||||
{
|
||||
SecurityContext.AuthenticateMe(NewUser.Id);
|
||||
var folderWrapper = await FilesControllerHelper.GetFolderInfoAsync(TestFolderRead.Id);
|
||||
var folderWrapper = await FoldersControllerHelper.GetFolderInfoAsync(TestFolderRead.Id);
|
||||
|
||||
Assert.IsNotNull(folderWrapper);
|
||||
Assert.AreEqual(folderTitleExpected, folderWrapper.Title);
|
||||
@ -97,7 +98,7 @@ namespace ASC.Files.Tests
|
||||
public void RenameSharedFolderReturnsFolderWrapperRead(string folderTitle)
|
||||
{
|
||||
SecurityContext.AuthenticateMe(NewUser.Id);
|
||||
var folderWrapper = Assert.ThrowsAsync<InvalidOperationException>(async () => await FilesControllerHelper.RenameFolderAsync(TestFolderRead.Id, folderTitle));
|
||||
var folderWrapper = Assert.ThrowsAsync<InvalidOperationException>(async () => await FoldersControllerHelper.RenameFolderAsync(TestFolderRead.Id, folderTitle));
|
||||
Assert.That(folderWrapper.Message == "You don't have enough permission to rename the folder");
|
||||
}
|
||||
|
||||
@ -108,7 +109,7 @@ namespace ASC.Files.Tests
|
||||
{
|
||||
SecurityContext.AuthenticateMe(NewUser.Id);
|
||||
|
||||
var result = (await FilesControllerHelper.DeleteFolder(
|
||||
var result = (await FoldersControllerHelper.DeleteFolder(
|
||||
TestFolderRead.Id,
|
||||
deleteAfter,
|
||||
immediately))
|
||||
@ -131,7 +132,7 @@ namespace ASC.Files.Tests
|
||||
[Order(7)]
|
||||
public async Task ShareFileToAnotherUserRead(bool notify, string message)
|
||||
{
|
||||
var shareFolder = await FilesControllerHelper.SetFileSecurityInfoAsync(TestFileRead.Id, TestFolderParamRead, notify, message);
|
||||
var shareFolder = await SecurityControllerHelper.SetFileSecurityInfoAsync(TestFileRead.Id, TestFolderParamRead, notify, message);
|
||||
Assert.IsNotNull(shareFolder);
|
||||
}
|
||||
|
||||
@ -181,7 +182,7 @@ namespace ASC.Files.Tests
|
||||
[Order(11)]
|
||||
public async Task ShareFolderToAnotherUserReadAndWrite(bool notify, string message)
|
||||
{
|
||||
var shareFolder = await FilesControllerHelper.SetFolderSecurityInfoAsync(TestFolderReadAndWrite.Id, TestFolderParamReadAndWrite, notify, message);
|
||||
var shareFolder = await SecurityControllerHelper.SetFolderSecurityInfoAsync(TestFolderReadAndWrite.Id, TestFolderParamReadAndWrite, notify, message);
|
||||
Assert.IsNotNull(shareFolder);
|
||||
}
|
||||
|
||||
@ -191,7 +192,7 @@ namespace ASC.Files.Tests
|
||||
public async Task GetSharedFolderInfoReturnsFolderWrapperReadAndWrite(string folderTitleExpected)
|
||||
{
|
||||
SecurityContext.AuthenticateMe(NewUser.Id);
|
||||
var folderWrapper = await FilesControllerHelper.GetFolderInfoAsync(TestFolderReadAndWrite.Id);
|
||||
var folderWrapper = await FoldersControllerHelper.GetFolderInfoAsync(TestFolderReadAndWrite.Id);
|
||||
|
||||
Assert.IsNotNull(folderWrapper);
|
||||
Assert.AreEqual(folderTitleExpected, folderWrapper.Title);
|
||||
@ -206,7 +207,7 @@ namespace ASC.Files.Tests
|
||||
public async Task RenameSharedFolderReturnsFolderWrapperReadAndWrite(string folderTitle)
|
||||
{
|
||||
SecurityContext.AuthenticateMe(NewUser.Id);
|
||||
var folderWrapper = await FilesControllerHelper.RenameFolderAsync(TestFolderReadAndWrite.Id, folderTitle);
|
||||
var folderWrapper = await FoldersControllerHelper.RenameFolderAsync(TestFolderReadAndWrite.Id, folderTitle);
|
||||
|
||||
Assert.IsNotNull(folderWrapper);
|
||||
Assert.AreEqual(folderTitle, folderWrapper.Title);
|
||||
@ -219,7 +220,7 @@ namespace ASC.Files.Tests
|
||||
{
|
||||
SecurityContext.AuthenticateMe(NewUser.Id);
|
||||
|
||||
var result = (await FilesControllerHelper.DeleteFolder(
|
||||
var result = (await FoldersControllerHelper.DeleteFolder(
|
||||
TestFolderReadAndWrite.Id,
|
||||
deleteAfter,
|
||||
immediately))
|
||||
@ -233,7 +234,7 @@ namespace ASC.Files.Tests
|
||||
[Order(15)]
|
||||
public async Task ShareFileToAnotherUserReadAndWrite(bool notify, string message)
|
||||
{
|
||||
var shareFolder = await FilesControllerHelper.SetFileSecurityInfoAsync(TestFileReadAndWrite.Id, TestFolderParamReadAndWrite, notify, message);
|
||||
var shareFolder = await SecurityControllerHelper.SetFileSecurityInfoAsync(TestFileReadAndWrite.Id, TestFolderParamReadAndWrite, notify, message);
|
||||
Assert.IsNotNull(shareFolder);
|
||||
}
|
||||
|
||||
@ -277,7 +278,7 @@ namespace ASC.Files.Tests
|
||||
}
|
||||
#endregion
|
||||
|
||||
private async Task WaitLongOperation(FileOperationWraper result, string assertError)
|
||||
private async Task WaitLongOperation(FileOperationDto result, string assertError)
|
||||
{
|
||||
if (result != null && result.Finished)
|
||||
{
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using ASC.Api.Documents;
|
||||
using ASC.Files.Core.ApiModels.ResponseDto;
|
||||
using ASC.Web.Files.Services.WCFService.FileOperations;
|
||||
|
||||
using NUnit.Framework;
|
||||
@ -12,14 +12,14 @@ namespace ASC.Files.Tests
|
||||
[TestFixture]
|
||||
class Trash : BaseFilesTests
|
||||
{
|
||||
private FolderWrapper<int> TestFolder { get; set; }
|
||||
public FileWrapper<int> TestFile { get; private set; }
|
||||
private FolderDto<int> TestFolder { get; set; }
|
||||
public FileDto<int> TestFile { get; private set; }
|
||||
|
||||
[OneTimeSetUp]
|
||||
public override async Task SetUp()
|
||||
{
|
||||
await base.SetUp();
|
||||
TestFolder = await FilesControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, "TestFolder");
|
||||
TestFolder = await FoldersControllerHelper.CreateFolderAsync(GlobalFolderHelper.FolderMy, "TestFolder");
|
||||
TestFile = await FilesControllerHelper.CreateFileAsync(GlobalFolderHelper.FolderMy, "TestFile", default);
|
||||
|
||||
}
|
||||
@ -42,7 +42,7 @@ namespace ASC.Files.Tests
|
||||
[Order(1)]
|
||||
public void CreateFolderReturnsFolderWrapper(string folderTitle)
|
||||
{
|
||||
var folderWrapper = Assert.ThrowsAsync<InvalidOperationException>(async () => await FilesControllerHelper.CreateFolderAsync((int)GlobalFolderHelper.FolderTrash, folderTitle));
|
||||
var folderWrapper = Assert.ThrowsAsync<InvalidOperationException>(async () => await FoldersControllerHelper.CreateFolderAsync((int)GlobalFolderHelper.FolderTrash, folderTitle));
|
||||
Assert.That(folderWrapper.Message == "You don't have enough permission to create");
|
||||
}
|
||||
[TestCaseSource(typeof(DocumentData), nameof(DocumentData.GetCreateFileItems))]
|
||||
@ -59,7 +59,7 @@ namespace ASC.Files.Tests
|
||||
[Order(2)]
|
||||
public async Task DeleteFileFromTrash()
|
||||
{
|
||||
var Empty = await FilesControllerHelper.EmptyTrashAsync();
|
||||
var Empty = await OperationControllerHelper.EmptyTrashAsync();
|
||||
|
||||
List<FileOperationResult> statuses;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user