ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed the tests for task service (#384)

Browse Source 
* fixed the tests for task service
This commit is contained in:
Leila Lali
2017-06-15 12:49:20 -07:00
committed by GitHub
parent 9b91a93578
commit d9e68831ab
4 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Microsoft.SqlTools.ServiceLayer/TaskServices/SqlTask.cs
View File

@@ -71,12 +71,12 @@ namespace Microsoft.SqlTools.ServiceLayer.TaskServices
/// <summary> /// <summary>
/// Starts the task and monitor the task progress /// Starts the task and monitor the task progress
/// </summary> /// </summary>
public async Task Run() public async Task RunAsync()
{ {
TaskStatus = SqlTaskStatus.InProgress; TaskStatus = SqlTaskStatus.InProgress;
await TaskToRun(this).ContinueWith(task => await TaskToRun(this).ContinueWith(task =>
{ {
if (task.IsCompleted) if (task.IsCompleted && !task.IsCanceled && !task.IsFaulted)
{ {
TaskResult taskResult = task.Result; TaskResult taskResult = task.Result;
TaskStatus = taskResult.TaskStatus; TaskStatus = taskResult.TaskStatus;
@@ -96,6 +96,14 @@ namespace Microsoft.SqlTools.ServiceLayer.TaskServices
}); });
} }
//Run Task synchronously
public void Run()
{
RunAsync().ContinueWith(task =>
{
});
}
/// <summary> /// <summary>
/// Returns true if task has any messages /// Returns true if task has any messages
/// </summary> /// </summary>

34
test/Microsoft.SqlTools.ServiceLayer.UnitTests/TaskServices/SqlTaskTests.cs
View File

@@ -4,6 +4,8 @@
// //
using System; using System;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.SqlTools.ServiceLayer.TaskServices; using Microsoft.SqlTools.ServiceLayer.TaskServices;
using Xunit; using Xunit;
@@ -30,7 +32,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
} }
[Fact] [Fact]
public void RunShouldRunTheFunctionAndGetTheResult() public async Task RunShouldRunTheFunctionAndGetTheResult()
{ {
SqlTaskStatus expectedStatus = SqlTaskStatus.Succeeded; SqlTaskStatus expectedStatus = SqlTaskStatus.Succeeded;
DatabaseOperationStub operation = new DatabaseOperationStub(); DatabaseOperationStub operation = new DatabaseOperationStub();
@@ -41,17 +43,19 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
SqlTask sqlTask = new SqlTask(new TaskMetadata(), operation.FunctionToRun); SqlTask sqlTask = new SqlTask(new TaskMetadata(), operation.FunctionToRun);
Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.NotStarted); Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.NotStarted);
sqlTask.Run().ContinueWith(task => { Task taskToVerify = sqlTask.RunAsync().ContinueWith(task => {
Assert.Equal(sqlTask.TaskStatus, expectedStatus); Assert.Equal(sqlTask.TaskStatus, expectedStatus);
Assert.Equal(sqlTask.IsCompleted, true); Assert.Equal(sqlTask.IsCompleted, true);
Assert.True(sqlTask.Duration > 0); Assert.True(sqlTask.Duration > 0);
}); });
Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.InProgress); Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.InProgress);
Thread.Sleep(1000);
operation.Stop(); operation.Stop();
await taskToVerify;
} }
[Fact] [Fact]
public void ToTaskInfoShouldReturnTaskInfo() public async Task ToTaskInfoShouldReturnTaskInfo()
{ {
SqlTaskStatus expectedStatus = SqlTaskStatus.Succeeded; SqlTaskStatus expectedStatus = SqlTaskStatus.Succeeded;
DatabaseOperationStub operation = new DatabaseOperationStub(); DatabaseOperationStub operation = new DatabaseOperationStub();
@@ -65,7 +69,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
DatabaseName = "database name" DatabaseName = "database name"
}, operation.FunctionToRun); }, operation.FunctionToRun);
sqlTask.Run().ContinueWith(task => Task taskToVerify = sqlTask.RunAsync().ContinueWith(task =>
{ {
var taskInfo = sqlTask.ToTaskInfo(); var taskInfo = sqlTask.ToTaskInfo();
Assert.Equal(taskInfo.TaskId, sqlTask.TaskId.ToString()); Assert.Equal(taskInfo.TaskId, sqlTask.TaskId.ToString());
@@ -73,10 +77,11 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
Assert.Equal(taskInfo.DatabaseName, "database name"); Assert.Equal(taskInfo.DatabaseName, "database name");
}); });
operation.Stop(); operation.Stop();
await taskToVerify;
} }
[Fact] [Fact]
public void FailedOperationShouldReturnTheFailedResult() public async Task FailedOperationShouldReturnTheFailedResult()
{ {
SqlTaskStatus expectedStatus = SqlTaskStatus.Failed; SqlTaskStatus expectedStatus = SqlTaskStatus.Failed;
DatabaseOperationStub operation = new DatabaseOperationStub(); DatabaseOperationStub operation = new DatabaseOperationStub();
@@ -87,17 +92,19 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
SqlTask sqlTask = new SqlTask(new TaskMetadata(), operation.FunctionToRun); SqlTask sqlTask = new SqlTask(new TaskMetadata(), operation.FunctionToRun);
Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.NotStarted); Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.NotStarted);
sqlTask.Run().ContinueWith(task => { Task taskToVerify = sqlTask.RunAsync().ContinueWith(task => {
Assert.Equal(sqlTask.TaskStatus, expectedStatus); Assert.Equal(sqlTask.TaskStatus, expectedStatus);
Assert.Equal(sqlTask.IsCompleted, true); Assert.Equal(sqlTask.IsCompleted, true);
Assert.True(sqlTask.Duration > 0); // Assert.True(sqlTask.Duration > 0);
}); });
Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.InProgress); Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.InProgress);
Thread.Sleep(1000);
operation.Stop(); operation.Stop();
await taskToVerify;
} }
[Fact] [Fact]
public void CancelingTheTaskShouldCancelTheOperation() public async Task CancelingTheTaskShouldCancelTheOperation()
{ {
SqlTaskStatus expectedStatus = SqlTaskStatus.Canceled; SqlTaskStatus expectedStatus = SqlTaskStatus.Canceled;
DatabaseOperationStub operation = new DatabaseOperationStub(); DatabaseOperationStub operation = new DatabaseOperationStub();
@@ -107,17 +114,19 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
SqlTask sqlTask = new SqlTask(new TaskMetadata(), operation.FunctionToRun); SqlTask sqlTask = new SqlTask(new TaskMetadata(), operation.FunctionToRun);
Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.NotStarted); Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.NotStarted);
sqlTask.Run().ContinueWith(task => { Task taskToVerify = sqlTask.RunAsync().ContinueWith(task => {
Assert.Equal(sqlTask.TaskStatus, expectedStatus); Assert.Equal(sqlTask.TaskStatus, expectedStatus);
Assert.Equal(sqlTask.IsCancelRequested, true); Assert.Equal(sqlTask.IsCancelRequested, true);
Assert.True(sqlTask.Duration > 0); Assert.True(sqlTask.Duration > 0);
}); });
Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.InProgress); Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.InProgress);
Thread.Sleep(1000);
sqlTask.Cancel(); sqlTask.Cancel();
await taskToVerify;
} }
[Fact] [Fact]
public void FailedOperationShouldFailTheTask() public async Task FailedOperationShouldFailTheTask()
{ {
SqlTaskStatus expectedStatus = SqlTaskStatus.Failed; SqlTaskStatus expectedStatus = SqlTaskStatus.Failed;
DatabaseOperationStub operation = new DatabaseOperationStub(); DatabaseOperationStub operation = new DatabaseOperationStub();
@@ -127,13 +136,14 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
SqlTask sqlTask = new SqlTask(new TaskMetadata(), operation.FunctionToRun); SqlTask sqlTask = new SqlTask(new TaskMetadata(), operation.FunctionToRun);
Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.NotStarted); Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.NotStarted);
sqlTask.Run().ContinueWith(task => { Task taskToVerify = sqlTask.RunAsync().ContinueWith(task => {
Assert.Equal(sqlTask.TaskStatus, expectedStatus); Assert.Equal(sqlTask.TaskStatus, expectedStatus);
Assert.Equal(sqlTask.IsCancelRequested, true);
Assert.True(sqlTask.Duration > 0); Assert.True(sqlTask.Duration > 0);
}); });
Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.InProgress); Assert.Equal(sqlTask.TaskStatus, SqlTaskStatus.InProgress);
Thread.Sleep(1000);
operation.FailTheOperation(); operation.FailTheOperation();
await taskToVerify;
} }
} }
} }

12
test/Microsoft.SqlTools.ServiceLayer.UnitTests/TaskServices/TaskManagerTests.cs
View File

@@ -4,6 +4,7 @@
// //
using System; using System;
using System.Threading.Tasks;
using Microsoft.SqlTools.ServiceLayer.TaskServices; using Microsoft.SqlTools.ServiceLayer.TaskServices;
using Xunit; using Xunit;
@@ -27,7 +28,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
} }
[Fact] [Fact]
public void VerifyCreateAndRunningTask() public async Task VerifyCreateAndRunningTask()
{ {
using (SqlTaskManager manager = new SqlTaskManager()) using (SqlTaskManager manager = new SqlTaskManager())
{ {
@@ -39,13 +40,14 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
DatabaseOperationStub operation = new DatabaseOperationStub(); DatabaseOperationStub operation = new DatabaseOperationStub();
operation.TaskResult = new TaskResult operation.TaskResult = new TaskResult
{ {
TaskStatus = SqlTaskStatus.Succeeded
}; };
SqlTask sqlTask = manager.CreateTask(taskMetaData, operation.FunctionToRun); SqlTask sqlTask = manager.CreateTask(taskMetaData, operation.FunctionToRun);
Assert.NotNull(sqlTask); Assert.NotNull(sqlTask);
Assert.True(taskAddedEventRaised); Assert.True(taskAddedEventRaised);
Assert.False(manager.HasCompletedTasks()); Assert.False(manager.HasCompletedTasks());
sqlTask.Run().ContinueWith(task => Task taskToVerify = sqlTask.RunAsync().ContinueWith(task =>
{ {
Assert.True(manager.HasCompletedTasks()); Assert.True(manager.HasCompletedTasks());
manager.RemoveCompletedTask(sqlTask); manager.RemoveCompletedTask(sqlTask);
@@ -53,12 +55,13 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
}); });
operation.Stop(); operation.Stop();
await taskToVerify;
} }
} }
[Fact] [Fact]
public void CancelTaskShouldCancelTheOperation() public async Task CancelTaskShouldCancelTheOperation()
{ {
using (SqlTaskManager manager = new SqlTaskManager()) using (SqlTaskManager manager = new SqlTaskManager())
{ {
@@ -71,7 +74,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
SqlTask sqlTask = manager.CreateTask(taskMetaData, operation.FunctionToRun); SqlTask sqlTask = manager.CreateTask(taskMetaData, operation.FunctionToRun);
Assert.NotNull(sqlTask); Assert.NotNull(sqlTask);
sqlTask.Run().ContinueWith(task => Task taskToVerify = sqlTask.RunAsync().ContinueWith(task =>
{ {
Assert.Equal(sqlTask.TaskStatus, expectedStatus); Assert.Equal(sqlTask.TaskStatus, expectedStatus);
Assert.Equal(sqlTask.IsCancelRequested, true); Assert.Equal(sqlTask.IsCancelRequested, true);
@@ -79,6 +82,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
}); });
manager.CancelTask(sqlTask.TaskId); manager.CancelTask(sqlTask.TaskId);
await taskToVerify;
} }
} }

8
test/Microsoft.SqlTools.ServiceLayer.UnitTests/TaskServices/TaskServiceTests.cs
View File

@@ -51,10 +51,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
serviceHostMock.AddEventHandling(TaskStatusChangedNotification.Type, null); serviceHostMock.AddEventHandling(TaskStatusChangedNotification.Type, null);
DatabaseOperationStub operation = new DatabaseOperationStub(); DatabaseOperationStub operation = new DatabaseOperationStub();
SqlTask sqlTask = service.TaskManager.CreateTask(taskMetaData, operation.FunctionToRun); SqlTask sqlTask = service.TaskManager.CreateTask(taskMetaData, operation.FunctionToRun);
sqlTask.Run().ContinueWith(task => sqlTask.Run();
{
});
serviceHostMock.Verify(x => x.SendEvent(TaskCreatedNotification.Type, serviceHostMock.Verify(x => x.SendEvent(TaskCreatedNotification.Type,
It.Is<TaskInfo>(t => t.TaskId == sqlTask.TaskId.ToString() && t.ProviderName == "MSSQL")), Times.Once()); It.Is<TaskInfo>(t => t.TaskId == sqlTask.TaskId.ToString() && t.ProviderName == "MSSQL")), Times.Once());
@@ -71,7 +68,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
serviceHostMock.AddEventHandling(TaskStatusChangedNotification.Type, null); serviceHostMock.AddEventHandling(TaskStatusChangedNotification.Type, null);
DatabaseOperationStub operation = new DatabaseOperationStub(); DatabaseOperationStub operation = new DatabaseOperationStub();
SqlTask sqlTask = service.TaskManager.CreateTask(taskMetaData, operation.FunctionToRun); SqlTask sqlTask = service.TaskManager.CreateTask(taskMetaData, operation.FunctionToRun);
sqlTask.Run().ContinueWith(task => Task taskToVerify = sqlTask.RunAsync().ContinueWith(task =>
{ {
serviceHostMock.Verify(x => x.SendEvent(TaskStatusChangedNotification.Type, serviceHostMock.Verify(x => x.SendEvent(TaskStatusChangedNotification.Type,
It.Is<TaskProgressInfo>(t => t.Status == SqlTaskStatus.Canceled)), Times.Once()); It.Is<TaskProgressInfo>(t => t.Status == SqlTaskStatus.Canceled)), Times.Once());
@@ -89,6 +86,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.TaskServices
serviceHostMock.Verify(x => x.SendEvent(TaskCreatedNotification.Type, serviceHostMock.Verify(x => x.SendEvent(TaskCreatedNotification.Type,
It.Is<TaskInfo>(t => t.TaskId == sqlTask.TaskId.ToString())), Times.Once()); It.Is<TaskInfo>(t => t.TaskId == sqlTask.TaskId.ToString())), Times.Once());
await taskToVerify;
} }