Skip to content

Commit 54c0d15

Browse files
IvanAndreychikovIvanAndreychikov
committed
[TASKSCLOUD-250] - Switched all tests to use async methods.
1 parent 6a06546 commit 54c0d15

24 files changed

+421
-414
lines changed

‎Aspose.Tasks.Cloud.Sdk.Tests/Assignment/TestAssignments.cs

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,27 @@
2424
// </summary>
2525
// --------------------------------------------------------------------------------------------------------------------
2626

27-
using System;
28-
using System.Linq;
29-
using System.Net;
30-
3127
using Aspose.Tasks.Cloud.Sdk.Model;
3228
using Aspose.Tasks.Cloud.Sdk.Model.Requests;
3329
using Aspose.Tasks.Cloud.Sdk.Tests.Base;
34-
3530
using NUnit.Framework;
31+
using System;
32+
using System.Linq;
33+
using System.Net;
34+
using Task = System.Threading.Tasks.Task;
3635

3736
namespace Aspose.Tasks.Cloud.Sdk.Tests.Tasks
3837
{
39-
38+
4039
[TestFixture]
4140
public class TestAssignments : BaseTestContext
4241
{
4342
[Test]
44-
public void TestGetAssignments()
43+
public async Task TestGetAssignments()
4544
{
46-
var remoteName = UploadFileToStorage("NewProductDev.mpp");
45+
var remoteName = await UploadFileToStorageAsync("NewProductDev.mpp");
4746

48-
var response = TasksApi.GetAssignments(new GetAssignmentsRequest
47+
var response = await TasksApi.GetAssignmentsAsync(new GetAssignmentsRequest
4948
{
5049
Name = remoteName,
5150
Folder = this.DataFolder
@@ -59,11 +58,11 @@ public void TestGetAssignments()
5958
}
6059

6160
[Test]
62-
public void TestGetAssignment()
61+
public async Task TestGetAssignment()
6362
{
64-
var remoteName = UploadFileToStorage("NewProductDev.mpp");
63+
var remoteName = await UploadFileToStorageAsync("NewProductDev.mpp");
6564

66-
var response = TasksApi.GetAssignment(new GetAssignmentRequest
65+
var response = await TasksApi.GetAssignmentAsync(new GetAssignmentRequest
6766
{
6867
AssignmentUid = 63,
6968
Name = remoteName,
@@ -78,11 +77,11 @@ public void TestGetAssignment()
7877
}
7978

8079
[Test]
81-
public void TestGetResourceAssignments()
80+
public async Task TestGetResourceAssignments()
8281
{
83-
var remoteName = UploadFileToStorage("NewProductDev.mpp");
82+
var remoteName = await UploadFileToStorageAsync("NewProductDev.mpp");
8483

85-
var response = TasksApi.GetResourceAssignments(new GetResourceAssignmentsRequest
84+
var response = await TasksApi.GetResourceAssignmentsAsync(new GetResourceAssignmentsRequest
8685
{
8786
ResourceUid = 1,
8887
Name = remoteName,
@@ -96,11 +95,11 @@ public void TestGetResourceAssignments()
9695
}
9796

9897
[Test]
99-
public void TestAddAssignment()
98+
public async Task TestAddAssignment()
10099
{
101-
var remoteName = UploadFileToStorage("NewProductDev.mpp");
100+
var remoteName = await UploadFileToStorageAsync("NewProductDev.mpp");
102101

103-
var response = TasksApi.PostAssignment(new PostAssignmentRequest
102+
var response = await TasksApi.PostAssignmentAsync(new PostAssignmentRequest
104103
{
105104
ResourceUid = 1,
106105
Units = 0.5D,
@@ -113,14 +112,14 @@ public void TestAddAssignment()
113112
Assert.IsNotNull(response.AssignmentItem);
114113
var assignmentUid = response.AssignmentItem.Uid;
115114

116-
var getResponse = TasksApi.GetAssignment(new GetAssignmentRequest
115+
var getResponse = await TasksApi.GetAssignmentAsync(new GetAssignmentRequest
117116
{
118117
AssignmentUid = assignmentUid,
119118
Name = remoteName,
120119
Folder = this.DataFolder
121120
});
122121

123-
var getTaskResponse = TasksApi.GetTask(new GetTaskRequest
122+
var getTaskResponse = await TasksApi.GetTaskAsync(new GetTaskRequest
124123
{
125124
TaskUid = 0,
126125
Name = remoteName,
@@ -139,11 +138,11 @@ public void TestAddAssignment()
139138
}
140139

141140
[Test]
142-
public void TestEditAssignment()
141+
public async Task TestEditAssignment()
143142
{
144-
var remoteName = UploadFileToStorage("NewProductDev.mpp");
143+
var remoteName = await UploadFileToStorageAsync("NewProductDev.mpp");
145144

146-
var response = TasksApi.GetAssignment(new GetAssignmentRequest
145+
var response = await TasksApi.GetAssignmentAsync(new GetAssignmentRequest
147146
{
148147
AssignmentUid = 63,
149148
Name = remoteName,
@@ -155,7 +154,7 @@ public void TestEditAssignment()
155154

156155
response.Assignment.TaskUid = 0;
157156

158-
var putResponse = TasksApi.PutAssignment(new PutAssignmentRequest
157+
var putResponse = await TasksApi.PutAssignmentAsync(new PutAssignmentRequest
159158
{
160159
Mode = CalculationMode.Automatic,
161160
Recalculate = true,
@@ -167,7 +166,7 @@ public void TestEditAssignment()
167166

168167
Assert.AreEqual((int)HttpStatusCode.OK, putResponse.Code);
169168

170-
var getResponse = TasksApi.GetAssignments(new GetAssignmentsRequest
169+
var getResponse = await TasksApi.GetAssignmentsAsync(new GetAssignmentsRequest
171170
{
172171
Name = remoteName,
173172
Folder = this.DataFolder
@@ -179,11 +178,11 @@ public void TestEditAssignment()
179178
}
180179

181180
[Test]
182-
public void TestDeleteAssignment()
181+
public async Task TestDeleteAssignment()
183182
{
184-
var remoteName = UploadFileToStorage("NewProductDev.mpp");
183+
var remoteName = await UploadFileToStorageAsync("NewProductDev.mpp");
185184

186-
var response = TasksApi.DeleteAssignment(new DeleteAssignmentRequest
185+
var response = await TasksApi.DeleteAssignmentAsync(new DeleteAssignmentRequest
187186
{
188187
AssignmentUid = 63,
189188
Name = remoteName,
@@ -192,7 +191,7 @@ public void TestDeleteAssignment()
192191

193192
Assert.AreEqual((int)HttpStatusCode.OK, response.Code);
194193

195-
var getResponse = TasksApi.GetAssignments(new GetAssignmentsRequest
194+
var getResponse = await TasksApi.GetAssignmentsAsync(new GetAssignmentsRequest
196195
{
197196
Name = remoteName,
198197
Folder = this.DataFolder

‎Aspose.Tasks.Cloud.Sdk.Tests/Base/BaseTestContext.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
using NUnit.Framework;
2929
using System.Collections.Generic;
3030
using System.IO;
31+
using System.Threading.Tasks;
3132

3233
namespace Aspose.Tasks.Cloud.Sdk.Tests.Base
3334
{
@@ -63,19 +64,19 @@ protected BaseTestContext()
6364
}
6465

6566
[OneTimeTearDown]
66-
public void Clean()
67+
public async Task Clean()
6768
{
6869
foreach (var request in clearingRequests)
6970
{
70-
var response = this.TasksApi.DeleteFile(request);
71+
var response = await this.TasksApi.DeleteFileAsync(request);
7172
Assert.That(response, Is.Not.Null.And.Property("Code").EqualTo(200));
7273
}
7374
}
7475

7576
/// <summary>
7677
/// Uploads a test data file to storage and returns the name of the uploaded file.
7778
/// </summary>
78-
protected string UploadFileToStorage(string localName)
79+
protected async Task<string> UploadFileToStorageAsync(string localName)
7980
{
8081
var remoteName = "TempFile_" + localName.Replace(".mpp", string.Empty) + ".mpp";
8182
var fullName = Path.Combine(this.DataFolder, remoteName);
@@ -85,7 +86,7 @@ protected string UploadFileToStorage(string localName)
8586
{
8687

8788
var postRequest = new PostCreateRequest(fullName, fileStream, storage: "Tasks");
88-
var response = this.TasksApi.UploadFile(postRequest);
89+
var response = await this.TasksApi.UploadFileAsync(postRequest);
8990
PrepareClearingRequest(postRequest);
9091

9192
}

‎Aspose.Tasks.Cloud.Sdk.Tests/BasicApiTests.cs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,29 @@
2424
// --------------------------------------------------------------------------------------------------------------------
2525

2626
using System;
27-
using System.Collections.Generic;
2827
using Aspose.Tasks.Cloud.Sdk.Model.Requests;
2928
using Aspose.Tasks.Cloud.Sdk.Tests.Base;
3029
using NUnit.Framework;
3130
using System.IO;
3231
using System.Linq;
32+
using System.Reflection;
3333
using System.Text;
3434
using System.Threading.Tasks;
35-
using NUnit.Compatibility;
3635

3736
namespace Aspose.Tasks.Cloud.Sdk.Tests
3837
{
3938
[TestFixture]
4039
public class BasicApiTests : BaseTestContext
4140
{
41+
private static readonly Func<MethodInfo, bool> AsyncMethodFilteringPredicate = m =>
42+
m.IsPublic && m.ReturnType.IsGenericType
43+
&& m.ReturnType.GetGenericTypeDefinition() == typeof(Task<>);
44+
4245
[Test]
43-
public void TestHandleNonExistingFile()
46+
public async Task TestHandleNonExistingFile()
4447
{
4548
string name = "notExistingFile.mpp";
46-
var response = this.TasksApi.GetTasks(new GetTasksRequest()
49+
var response = await this.TasksApi.GetTasksAsync(new GetTasksRequest()
4750
{
4851
Name = name
4952
});
@@ -58,7 +61,7 @@ public void TestHandleNonExistingFile()
5861
public void TestApiCoverage()
5962
{
6063
var methods = typeof(TasksApi).GetMethods()
61-
.Where(p => p.IsPublic && p.DeclaringType != typeof(object) && !p.Name.Contains("Async"))
64+
.Where(AsyncMethodFilteringPredicate)
6265
.Select(p => p.Name)
6366
.ToList();
6467
var unitTestFolder = DirectoryHelper.GetRootSdkFolder();
@@ -77,15 +80,13 @@ public void TestApiCoverage()
7780
}
7881

7982
/// <summary>
80-
/// Check if all API methods have covered by tests
83+
/// Check if all API methods have sync and async versions and async versions has correct name pattern
8184
/// </summary>
8285
[Test]
8386
public void TestApiSyncAndAsyncMethodsEquivalence()
8487
{
8588
var allMethods = typeof(TasksApi).GetMethods().Where(m => m.DeclaringType != typeof(object));
86-
var asyncMethods = allMethods.Where(p => p.IsPublic
87-
&& p.ReturnType.IsGenericType
88-
&& p.ReturnType.GetGenericTypeDefinition() == typeof(Task<>));
89+
var asyncMethods = allMethods.Where(AsyncMethodFilteringPredicate);
8990

9091
var asyncMethodsWithWrongNamePattern = asyncMethods.Select(m => m.Name).Where(n => !n.Contains("Async"));
9192
Assert.That(asyncMethodsWithWrongNamePattern, Is.Empty);

‎Aspose.Tasks.Cloud.Sdk.Tests/Calendar/TestCalendarExceptions.cs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,26 @@
2424
// </summary>
2525
// --------------------------------------------------------------------------------------------------------------------
2626

27-
using System;
28-
29-
using Aspose.Tasks.Cloud.Sdk.Tests.Base;
3027
using Aspose.Tasks.Cloud.Sdk.Model;
3128
using Aspose.Tasks.Cloud.Sdk.Model.Requests;
29+
using Aspose.Tasks.Cloud.Sdk.Tests.Base;
3230
using NUnit.Framework;
31+
using System;
3332
using System.Collections.Generic;
3433
using System.Net;
34+
using Task = System.Threading.Tasks.Task;
3535

3636
namespace Aspose.Tasks.Cloud.Sdk.Tests.DocumentProperties
3737
{
3838
[TestFixture]
3939
internal sealed class TestCalendarExceptions : BaseTestContext
4040
{
4141
[Test]
42-
public void TestGetCalendarExceptions()
42+
public async Task TestGetCalendarExceptions()
4343
{
44-
var remoteName = UploadFileToStorage("Calenar with exception.mpp");
44+
var remoteName = await UploadFileToStorageAsync("Calenar with exception.mpp");
4545

46-
var getResponse = TasksApi.GetCalendarExceptions(new GetCalendarExceptionsRequest
46+
var getResponse = await TasksApi.GetCalendarExceptionsAsync(new GetCalendarExceptionsRequest
4747
{
4848
Name = remoteName,
4949
Folder = this.DataFolder,
@@ -74,9 +74,9 @@ public void TestGetCalendarExceptions()
7474
}
7575

7676
[Test]
77-
public void TestAddCalendarException()
77+
public async Task TestAddCalendarException()
7878
{
79-
var remoteName = UploadFileToStorage("New project 2013.mpp");
79+
var remoteName = await UploadFileToStorageAsync("New project 2013.mpp");
8080

8181
var calendarException = new CalendarException
8282
{
@@ -91,7 +91,7 @@ public void TestAddCalendarException()
9191
Period = 1
9292
};
9393

94-
var response = TasksApi.PostCalendarException(new PostCalendarExceptionRequest
94+
var response = await TasksApi.PostCalendarExceptionAsync(new PostCalendarExceptionRequest
9595
{
9696
CalendarUid = 1,
9797
CalendarException = calendarException,
@@ -101,7 +101,7 @@ public void TestAddCalendarException()
101101

102102
Assert.AreEqual((int)HttpStatusCode.Created, response.Code);
103103

104-
var getResponse = TasksApi.GetCalendarExceptions(new GetCalendarExceptionsRequest
104+
var getResponse = await TasksApi.GetCalendarExceptionsAsync(new GetCalendarExceptionsRequest
105105
{
106106
Name = remoteName,
107107
Folder = this.DataFolder,
@@ -116,11 +116,11 @@ public void TestAddCalendarException()
116116
}
117117

118118
[Test]
119-
public void TestEditCalendarException()
119+
public async Task TestEditCalendarException()
120120
{
121-
var remoteName = UploadFileToStorage("Calenar with exception.mpp");
121+
var remoteName = await UploadFileToStorageAsync("Calenar with exception.mpp");
122122

123-
var getResponse = TasksApi.GetCalendarExceptions(new GetCalendarExceptionsRequest
123+
var getResponse = await TasksApi.GetCalendarExceptionsAsync(new GetCalendarExceptionsRequest
124124
{
125125
Name = remoteName,
126126
Folder = this.DataFolder,
@@ -141,7 +141,7 @@ public void TestEditCalendarException()
141141
calendarException.FromDate = new DateTime(2014, 10, 28);
142142
calendarException.ToDate = new DateTime(2015, 08, 5);
143143

144-
var response = TasksApi.PutCalendarException(new PutCalendarExceptionRequest
144+
var response = await TasksApi.PutCalendarExceptionAsync(new PutCalendarExceptionRequest
145145
{
146146
CalendarUid = 1,
147147
Index = calendarException.Index,
@@ -152,7 +152,7 @@ public void TestEditCalendarException()
152152

153153
Assert.AreEqual((int)HttpStatusCode.OK, response.Code);
154154

155-
getResponse = TasksApi.GetCalendarExceptions(new GetCalendarExceptionsRequest
155+
getResponse = await TasksApi.GetCalendarExceptionsAsync(new GetCalendarExceptionsRequest
156156
{
157157
Name = remoteName,
158158
Folder = this.DataFolder,
@@ -167,11 +167,11 @@ public void TestEditCalendarException()
167167
}
168168

169169
[Test]
170-
public void TestDeleteCalendarException()
170+
public async Task TestDeleteCalendarException()
171171
{
172-
var remoteName = UploadFileToStorage("Calenar with exception.mpp");
172+
var remoteName = await UploadFileToStorageAsync("Calenar with exception.mpp");
173173

174-
var response = TasksApi.DeleteCalendarException(new DeleteCalendarExceptionRequest
174+
var response = await TasksApi.DeleteCalendarExceptionAsync(new DeleteCalendarExceptionRequest
175175
{
176176
Name = remoteName,
177177
Folder = this.DataFolder,
@@ -181,7 +181,7 @@ public void TestDeleteCalendarException()
181181

182182
Assert.AreEqual((int)HttpStatusCode.OK, response.Code);
183183

184-
var getResponse = TasksApi.GetCalendarExceptions(new GetCalendarExceptionsRequest
184+
var getResponse = await TasksApi.GetCalendarExceptionsAsync(new GetCalendarExceptionsRequest
185185
{
186186
Name = remoteName,
187187
Folder = this.DataFolder,

0 commit comments

Comments
 (0)