Skip to content

Commit bcfc507

Browse files
HomelessDinosaurHomelessDinosaur
committed
remove all synchronous tests
1 parent c3d75c3 commit bcfc507

File tree

20 files changed

+225
-1613
lines changed

20 files changed

+225
-1613
lines changed

‎src/Nitric.Sdk/Job/Job.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public Job(string name, GrpcClient client = null)
4747
/// Submit a job to the batch service asynchronously
4848
/// </summary>
4949
/// <param name="data">Data to submit to the job</param>
50-
public async void Submit(T data)
50+
public async Task Submit(T data)
5151
{
5252
var request = new JobSubmitRequest
5353
{

‎src/Nitric.Sdk/Nitric.Sdk.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>netstandard2.1</TargetFramework>
4-
<Version>1.0.0</Version>
4+
<Version>1.0.0-b</Version>
55
<PackageId>Nitric.Sdk</PackageId>
66
<Company>Nitric Pty Ltd</Company>
77
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
@@ -22,7 +22,7 @@
2222
<PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
2323
</ItemGroup>
2424

25-
<ItemGroup>
25+
<ItemGroup>
2626
<Protobuf Include="../../nitric/proto/**/*.proto" ProtoRoot="../../" OutputDir="Proto" />
2727
</ItemGroup>
2828

‎src/Nitric.Sdk/Queue/Message.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class ReceivedMessage<T>
4747
/// </summary>
4848
/// <exception cref="ArgumentNullException"></exception>
4949
/// <exception cref="NitricException"></exception>
50-
public async void Complete()
50+
public async Task Complete()
5151
{
5252
var request = new QueueCompleteRequest
5353
{

‎src/Nitric.Sdk/Storage/File.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ internal File(Bucket bucket, string key)
5555
/// </summary>
5656
/// <param name="body">The contents to write.</param>
5757
/// <exception cref="NitricException"></exception>
58-
public async void Write(byte[] body)
58+
public async Task Write(byte[] body)
5959
{
6060
var request = new StorageWriteRequest
6161
{
@@ -78,7 +78,7 @@ public async void Write(byte[] body)
7878
/// </summary>
7979
/// <param name="body">The contents to write.</param>
8080
/// <exception cref="NitricException"></exception>
81-
public async void Write(string body)
81+
public async Task Write(string body)
8282
{
8383
var request = new StorageWriteRequest
8484
{

‎src/Nitric.Sdk/Topics/Topic.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public Topic(string name, GrpcClient client = null)
4747
/// </summary>
4848
/// <param name="message">The message to publish</param>
4949
/// <exception cref="NitricException"></exception>
50-
public async void Publish(T message)
50+
public async Task Publish(T message)
5151
{
5252
var structPayload = Struct.FromJsonSerializable(message);
5353

‎src/Nitric.Sdk/Websocket/Connection.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public Connection(string connectionId, string socketName, GrpcClient client = nu
5151
/// Send a message to the websocket.
5252
/// </summary>
5353
/// <param name="message">The message to be sent</param>
54-
public async void SendMessage(string message)
54+
public async Task SendMessage(string message)
5555
{
5656
var request = new WebsocketSendRequest
5757
{
@@ -72,7 +72,7 @@ public async void SendMessage(string message)
7272
/// <summary>
7373
/// Close the connection to the websocket.
7474
/// </summary>
75-
public async void CloseConnection()
75+
public async Task CloseConnection()
7676
{
7777
var request = new WebsocketCloseConnectionRequest
7878
{

‎test/Nitric.Sdk.Test/Batch/JobTest.cs‎

Lines changed: 6 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -49,108 +49,7 @@ public void TestJobToString()
4949
}
5050

5151
[Fact]
52-
public void TestSubmitJob()
53-
{
54-
var testProfile = new TestSubmission
55-
{
56-
Id = 1234,
57-
Message = "This seems like a good test string?",
58-
Tags = new List<string> { "message", "test" }
59-
};
60-
61-
var payload = Sdk.Common.Struct.FromJsonSerializable(testProfile);
62-
63-
var request = new JobSubmitRequest
64-
{
65-
JobName = "job-name",
66-
Data = new JobData
67-
{
68-
Struct = payload
69-
}
70-
};
71-
72-
Mock<GrpcClient> gc = new Mock<GrpcClient>();
73-
gc.Setup(e =>
74-
e.SubmitJob(It.IsAny<JobSubmitRequest>(), null, null, It.IsAny<CancellationToken>()))
75-
.Returns(new JobSubmitResponse())
76-
.Verifiable();
77-
78-
var kv = new Sdk.Job.Job<TestSubmission>("job-name", gc.Object);
79-
80-
kv.Submit(testProfile);
81-
82-
gc.Verify(
83-
t => t.SubmitJob(request, null, null, It.IsAny<CancellationToken>()), Times.Once);
84-
}
85-
86-
[Fact]
87-
public void TestSubmitJobWithNullPayload()
88-
{
89-
var request = new JobSubmitRequest
90-
{
91-
JobName = "job-name",
92-
};
93-
94-
Mock<GrpcClient> gc = new Mock<GrpcClient>();
95-
gc.Setup(e =>
96-
e.SubmitJob(It.IsAny<JobSubmitRequest>(), null, null, It.IsAny<CancellationToken>()))
97-
.Returns(new JobSubmitResponse())
98-
.Verifiable();
99-
100-
var kv = new Sdk.Job.Job<TestSubmission>("job-name", gc.Object);
101-
102-
kv.Submit(null);
103-
104-
gc.Verify(
105-
t => t.SubmitJob(request, null, null, It.IsAny<CancellationToken>()), Times.Once);
106-
}
107-
108-
[Fact]
109-
public void TestSubmitJobWithError()
110-
{
111-
var testSubmission = new TestSubmission
112-
{
113-
Id = 1234,
114-
Message = "This seems like a good test string?",
115-
Tags = new List<string> { "message", "test" }
116-
};
117-
118-
var payload = Sdk.Common.Struct.FromJsonSerializable(testSubmission);
119-
120-
var request = new JobSubmitRequest
121-
{
122-
JobName = "job-name",
123-
Data = new JobData
124-
{
125-
Struct = payload
126-
}
127-
};
128-
129-
Mock<GrpcClient> gc = new Mock<GrpcClient>();
130-
gc.Setup(e =>
131-
e.SubmitJob(It.IsAny<JobSubmitRequest>(), null, null, It.IsAny<CancellationToken>()))
132-
.Throws(new RpcException(new Status(StatusCode.NotFound, "The specified job does not exist")))
133-
.Verifiable();
134-
135-
var job = new Sdk.Job.Job<TestSubmission>("job-name", gc.Object);
136-
137-
try
138-
{
139-
job.Submit(testSubmission);
140-
Assert.Fail();
141-
}
142-
catch (RpcException e)
143-
{
144-
Assert.Equal("Status(StatusCode=\"NotFound\", Detail=\"The specified job does not exist\")",
145-
e.Message);
146-
}
147-
148-
gc.Verify(
149-
t => t.SubmitJob(request, null, null, It.IsAny<CancellationToken>()), Times.Once);
150-
}
151-
152-
[Fact]
153-
public async Task TestSubmitJobAsync()
52+
public async Task TestSubmitJob()
15453
{
15554
var testSubmission = new TestSubmission
15655
{
@@ -178,14 +77,14 @@ public async Task TestSubmitJobAsync()
17877

17978
var job = new Sdk.Job.Job<TestSubmission>("job-name", gc.Object);
18079

181-
await job.SubmitAsync(testSubmission);
80+
await job.Submit(testSubmission);
18281

18382
gc.Verify(
18483
t => t.SubmitJobAsync(request, null, null, It.IsAny<CancellationToken>()), Times.Once);
18584
}
18685

18786
[Fact]
188-
public async Task TestSubmitJobAsyncWithNullPayload()
87+
public async Task TestSubmitJobWithNullPayload()
18988
{
19089
var request = new JobSubmitRequest
19190
{
@@ -200,14 +99,14 @@ public async Task TestSubmitJobAsyncWithNullPayload()
20099

201100
var kv = new Sdk.Job.Job<TestSubmission>("job-name", gc.Object);
202101

203-
await kv.SubmitAsync(null);
102+
await kv.Submit(null);
204103

205104
gc.Verify(
206105
t => t.SubmitJobAsync(request, null, null, It.IsAny<CancellationToken>()), Times.Once);
207106
}
208107

209108
[Fact]
210-
public async Task TestSubmitJobAsyncWithError()
109+
public async Task TestSubmitJobWithError()
211110
{
212111
var testSubmission = new TestSubmission
213112
{
@@ -237,7 +136,7 @@ public async Task TestSubmitJobAsyncWithError()
237136

238137
try
239138
{
240-
await job.SubmitAsync(testSubmission);
139+
await job.Submit(testSubmission);
241140
Assert.Fail();
242141
}
243142
catch (RpcException e)

0 commit comments

Comments
 (0)