From 60562d69a330d1b476d70247cecec378a24315d4 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Wed, 13 Jan 2021 10:21:29 +0300
Subject: [PATCH] Files: test fix

---
 .../Threading/DistributedTaskQueue.cs         |  7 +++-
 products/ASC.Files/Tests/SharedWithMeTest.cs  | 36 ++++++++++++-------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/common/ASC.Common/Threading/DistributedTaskQueue.cs b/common/ASC.Common/Threading/DistributedTaskQueue.cs
index 83655a86bb..2e3658cd2c 100644
--- a/common/ASC.Common/Threading/DistributedTaskQueue.cs
+++ b/common/ASC.Common/Threading/DistributedTaskQueue.cs
@@ -147,8 +147,13 @@ namespace ASC.Common.Threading
             var cancelation = new CancellationTokenSource();
             var token = cancelation.Token;
             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
                 .ConfigureAwait(false)
                 .GetAwaiter()
diff --git a/products/ASC.Files/Tests/SharedWithMeTest.cs b/products/ASC.Files/Tests/SharedWithMeTest.cs
index 504600ee5d..442aa8197c 100644
--- a/products/ASC.Files/Tests/SharedWithMeTest.cs
+++ b/products/ASC.Files/Tests/SharedWithMeTest.cs
@@ -100,12 +100,13 @@ namespace ASC.Files.Tests
         {
             SecurityContext.AuthenticateMe(NewUser.ID);
 
-            FilesControllerHelper.DeleteFolder(
+            var result = FilesControllerHelper.DeleteFolder(
                 TestFolderRead.Id,
                 deleteAfter,
-                immediately);
+                immediately)
+                .FirstOrDefault();
 
-            await WaitLongOperation(FilesCommonResource.ErrorMassage_SecurityException_DeleteFolder);
+            await WaitLongOperation(result, FilesCommonResource.ErrorMassage_SecurityException_DeleteFolder);
         }
 
         [TestCaseSource(typeof(DocumentData), nameof(DocumentData.GetCreateFileItems))]
@@ -155,12 +156,13 @@ namespace ASC.Files.Tests
         public async Task DeleteSharedFileReturnsFolderWrapperRead(bool deleteAfter, bool immediately)
         {
             SecurityContext.AuthenticateMe(NewUser.ID);
-            FilesControllerHelper.DeleteFile(
+            var result = FilesControllerHelper.DeleteFile(
                 TestFileRead.Id,
                 deleteAfter,
-                immediately);
+                immediately)
+                .FirstOrDefault();
 
-            await WaitLongOperation(FilesCommonResource.ErrorMassage_SecurityException_DeleteFile);
+            await WaitLongOperation(result, FilesCommonResource.ErrorMassage_SecurityException_DeleteFile);
         }
         #endregion
 
@@ -209,12 +211,13 @@ namespace ASC.Files.Tests
         {
             SecurityContext.AuthenticateMe(NewUser.ID);
 
-            FilesControllerHelper.DeleteFolder(
+            var result = FilesControllerHelper.DeleteFolder(
                 TestFolderReadAndWrite.Id,
                 deleteAfter,
-                immediately);
+                immediately)
+                .FirstOrDefault();
 
-            await WaitLongOperation(FilesCommonResource.ErrorMassage_SecurityException_DeleteFolder);
+            await WaitLongOperation(result, FilesCommonResource.ErrorMassage_SecurityException_DeleteFolder);
         }
 
         [TestCaseSource(typeof(DocumentData), nameof(DocumentData.ShareParamToFile))]
@@ -256,17 +259,24 @@ namespace ASC.Files.Tests
         public async Task DeleteSharedFileReturnsFolderWrapperReadAndWrite(bool deleteAfter, bool immediately)
         {
             SecurityContext.AuthenticateMe(NewUser.ID);
-            FilesControllerHelper.DeleteFile(
+            var result = FilesControllerHelper.DeleteFile(
                 TestFileReadAndWrite.Id,
                 deleteAfter,
-                immediately);
+                immediately)
+                .FirstOrDefault();
 
-            await WaitLongOperation(FilesCommonResource.ErrorMassage_SecurityException_DeleteFile);
+            await WaitLongOperation(result, FilesCommonResource.ErrorMassage_SecurityException_DeleteFile);
         }
         #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;
             while (true)
             {