IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Files: test fix

Browse Source
This commit is contained in:
pavelbannov 2021-01-13 10:21:29 +03:00
parent b7d3cd8650
commit 60562d69a3
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/ASC.Common/Threading/DistributedTaskQueue.cs
View File

@ -147,8 +147,13 @@ namespace ASC.Common.Threading
var cancelation = new CancellationTokenSource(); var cancelation = new CancellationTokenSource();
var token = cancelation.Token; var token = cancelation.Token;
cancelations[distributedTask.Id] = cancelation; cancelations[distributedTask.Id] = cancelation;
TestContext.WriteLine($"ThreadId QueueTask: {Thread.CurrentThread.ManagedThreadId}");
var task = new Task(() => action(distributedTask, token), token, TaskCreationOptions.LongRunning); var task = new Task(() => {
TestContext.WriteLine($"ThreadId QueueTask task: {Thread.CurrentThread.ManagedThreadId}");
action(distributedTask, token);
}, token, TaskCreationOptions.LongRunning);
task task
.ConfigureAwait(false) .ConfigureAwait(false)
.GetAwaiter() .GetAwaiter()

36
products/ASC.Files/Tests/SharedWithMeTest.cs
View File

@ -100,12 +100,13 @@ namespace ASC.Files.Tests
{ {
SecurityContext.AuthenticateMe(NewUser.ID); SecurityContext.AuthenticateMe(NewUser.ID);
FilesControllerHelper.DeleteFolder( var result = FilesControllerHelper.DeleteFolder(
TestFolderRead.Id, TestFolderRead.Id,
deleteAfter, deleteAfter,
immediately); immediately)
.FirstOrDefault();
await WaitLongOperation(FilesCommonResource.ErrorMassage_SecurityException_DeleteFolder); await WaitLongOperation(result, FilesCommonResource.ErrorMassage_SecurityException_DeleteFolder);
} }
[TestCaseSource(typeof(DocumentData), nameof(DocumentData.GetCreateFileItems))] [TestCaseSource(typeof(DocumentData), nameof(DocumentData.GetCreateFileItems))]
@ -155,12 +156,13 @@ namespace ASC.Files.Tests
public async Task DeleteSharedFileReturnsFolderWrapperRead(bool deleteAfter, bool immediately) public async Task DeleteSharedFileReturnsFolderWrapperRead(bool deleteAfter, bool immediately)
{ {
SecurityContext.AuthenticateMe(NewUser.ID); SecurityContext.AuthenticateMe(NewUser.ID);
FilesControllerHelper.DeleteFile( var result = FilesControllerHelper.DeleteFile(
TestFileRead.Id, TestFileRead.Id,
deleteAfter, deleteAfter,
immediately); immediately)
.FirstOrDefault();
await WaitLongOperation(FilesCommonResource.ErrorMassage_SecurityException_DeleteFile); await WaitLongOperation(result, FilesCommonResource.ErrorMassage_SecurityException_DeleteFile);
} }
#endregion #endregion
@ -209,12 +211,13 @@ namespace ASC.Files.Tests
{ {
SecurityContext.AuthenticateMe(NewUser.ID); SecurityContext.AuthenticateMe(NewUser.ID);
FilesControllerHelper.DeleteFolder( var result = FilesControllerHelper.DeleteFolder(
TestFolderReadAndWrite.Id, TestFolderReadAndWrite.Id,
deleteAfter, deleteAfter,
immediately); immediately)
.FirstOrDefault();
await WaitLongOperation(FilesCommonResource.ErrorMassage_SecurityException_DeleteFolder); await WaitLongOperation(result, FilesCommonResource.ErrorMassage_SecurityException_DeleteFolder);
} }
[TestCaseSource(typeof(DocumentData), nameof(DocumentData.ShareParamToFile))] [TestCaseSource(typeof(DocumentData), nameof(DocumentData.ShareParamToFile))]
@ -256,17 +259,24 @@ namespace ASC.Files.Tests
public async Task DeleteSharedFileReturnsFolderWrapperReadAndWrite(bool deleteAfter, bool immediately) public async Task DeleteSharedFileReturnsFolderWrapperReadAndWrite(bool deleteAfter, bool immediately)
{ {
SecurityContext.AuthenticateMe(NewUser.ID); SecurityContext.AuthenticateMe(NewUser.ID);
FilesControllerHelper.DeleteFile( var result = FilesControllerHelper.DeleteFile(
TestFileReadAndWrite.Id, TestFileReadAndWrite.Id,
deleteAfter, deleteAfter,
immediately); immediately)
.FirstOrDefault();
await WaitLongOperation(FilesCommonResource.ErrorMassage_SecurityException_DeleteFile); await WaitLongOperation(result, FilesCommonResource.ErrorMassage_SecurityException_DeleteFile);
} }
#endregion #endregion
private async Task WaitLongOperation(string assertError) private async Task WaitLongOperation(FileOperationWraper result, string assertError)
{ {
if(result != null && result.Finished)
{
Assert.That(result.Error == assertError, result.Error);
return;
}
ItemList<FileOperationResult> statuses; ItemList<FileOperationResult> statuses;
while (true) while (true)
{ {