Skip to content

Commit e6beada

Browse files
GsantomaggioGsantomaggio
committed
Minor changes
Signed-off-by: Gabriele Santomaggio <[email protected]>
1 parent 04ee878 commit e6beada

File tree

9 files changed

+300
-300
lines changed

9 files changed

+300
-300
lines changed

‎Tests/AmqpTests.cs

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ public class AmqpTests(ITestOutputHelper testOutputHelper) : IntegrationTest(tes
1919
[Fact]
2020
public async Task QueueInfoTest()
2121
{
22-
Assert.NotNull(_connection);
23-
Assert.NotNull(_management);
22+
Assert.NotNull(Connection);
23+
Assert.NotNull(Management);
2424

25-
IQueueInfo declaredQueueInfo = await _management.Queue(_queueName).Quorum().Queue().DeclareAsync();
26-
IQueueInfo retrievedQueueInfo = await _management.GetQueueInfoAsync(_queueName);
25+
IQueueInfo declaredQueueInfo = await Management.Queue(QueueName).Quorum().Queue().DeclareAsync();
26+
IQueueInfo retrievedQueueInfo = await Management.GetQueueInfoAsync(QueueName);
2727

28-
Assert.Equal(_queueName, declaredQueueInfo.Name());
29-
Assert.Equal(_queueName, retrievedQueueInfo.Name());
28+
Assert.Equal(QueueName, declaredQueueInfo.Name());
29+
Assert.Equal(QueueName, retrievedQueueInfo.Name());
3030

3131
Assert.Equal(QueueType.QUORUM, declaredQueueInfo.Type());
3232
Assert.Equal(QueueType.QUORUM, retrievedQueueInfo.Type());
@@ -62,14 +62,14 @@ public async Task QueueDeclareDeletePublishConsume(string subject)
6262
byte[] messageBody = Encoding.UTF8.GetBytes("hello");
6363
const int messageCount = 100;
6464

65-
Assert.NotNull(_connection);
66-
Assert.NotNull(_management);
65+
Assert.NotNull(Connection);
66+
Assert.NotNull(Management);
6767

6868
// IQueueInfo declaredQueueInfo = await _management.Queue().Name(_queueName).Quorum().Queue().Declare();
69-
IQueueInfo declaredQueueInfo = await _management.Queue().Name(_queueName).Classic().Queue().DeclareAsync();
70-
Assert.Equal(_queueName, declaredQueueInfo.Name());
69+
IQueueInfo declaredQueueInfo = await Management.Queue().Name(QueueName).Classic().Queue().DeclareAsync();
70+
Assert.Equal(QueueName, declaredQueueInfo.Name());
7171

72-
IPublisherBuilder publisherBuilder = _connection.PublisherBuilder();
72+
IPublisherBuilder publisherBuilder = Connection.PublisherBuilder();
7373
IPublisher publisher = await publisherBuilder.Queue(declaredQueueInfo.Name()).BuildAsync();
7474

7575
var publishTasks = new List<Task<PublishResult>>();
@@ -91,8 +91,8 @@ public async Task QueueDeclareDeletePublishConsume(string subject)
9191
Assert.Equal(OutcomeState.Accepted, pr.Outcome.State);
9292
}
9393

94-
IQueueInfo retrievedQueueInfo0 = await _management.GetQueueInfoAsync(_queueName);
95-
Assert.Equal(_queueName, retrievedQueueInfo0.Name());
94+
IQueueInfo retrievedQueueInfo0 = await Management.GetQueueInfoAsync(QueueName);
95+
Assert.Equal(QueueName, retrievedQueueInfo0.Name());
9696
Assert.Equal((uint)0, retrievedQueueInfo0.ConsumerCount());
9797
Assert.Equal((ulong)messageCount, retrievedQueueInfo0.MessageCount());
9898

@@ -109,15 +109,15 @@ async Task MessageHandler(IContext ctx, IMessage msg)
109109
}
110110
}
111111

112-
IConsumerBuilder consumerBuilder = _connection.ConsumerBuilder();
113-
IConsumer consumer = await consumerBuilder.Queue(_queueName).MessageHandler(MessageHandler).BuildAsync();
112+
IConsumerBuilder consumerBuilder = Connection.ConsumerBuilder();
113+
IConsumer consumer = await consumerBuilder.Queue(QueueName).MessageHandler(MessageHandler).BuildAsync();
114114

115115
await WhenTaskCompletes(allMessagesReceivedTcs.Task);
116116

117117
Assert.NotNull(receivedSubject);
118118
Assert.Equal(subject, receivedSubject);
119119

120-
IQueueInfo retrievedQueueInfo1 = await _management.GetQueueInfoAsync(_queueName);
120+
IQueueInfo retrievedQueueInfo1 = await Management.GetQueueInfoAsync(QueueName);
121121
Assert.Equal((uint)1, retrievedQueueInfo1.ConsumerCount());
122122
Assert.Equal((uint)0, retrievedQueueInfo1.MessageCount());
123123

@@ -138,8 +138,8 @@ public async Task BindingTest(string prefix, bool addBindingArgments)
138138
{
139139
byte[] messageBody = Encoding.UTF8.GetBytes("hello");
140140

141-
Assert.NotNull(_connection);
142-
Assert.NotNull(_management);
141+
Assert.NotNull(Connection);
142+
Assert.NotNull(Management);
143143

144144
string now = Now;
145145
string rkStr = $"{prefix}-foo-{now}";
@@ -150,29 +150,29 @@ public async Task BindingTest(string prefix, bool addBindingArgments)
150150
bindingArguments.Add("foo", prefix + "-bar");
151151
}
152152

153-
IExchangeSpecification ex1spec = _management.Exchange($"{prefix}-e1-{_testDisplayName}-{now}").Type(ExchangeType.DIRECT);
154-
IExchangeSpecification ex2spec = _management.Exchange($"{prefix}-e2-{_testDisplayName}-{now}").Type(ExchangeType.FANOUT);
155-
IQueueSpecification queueSpec = _management.Queue(_queueName).Type(QueueType.CLASSIC);
153+
IExchangeSpecification ex1spec = Management.Exchange($"{prefix}-e1-{TestDisplayName}-{now}").Type(ExchangeType.DIRECT);
154+
IExchangeSpecification ex2spec = Management.Exchange($"{prefix}-e2-{TestDisplayName}-{now}").Type(ExchangeType.FANOUT);
155+
IQueueSpecification queueSpec = Management.Queue(QueueName).Type(QueueType.CLASSIC);
156156

157157
await ex1spec.DeclareAsync();
158158
await ex2spec.DeclareAsync();
159159
await queueSpec.DeclareAsync();
160160

161-
IBindingSpecification e1e2Binding = _management.Binding()
161+
IBindingSpecification e1e2Binding = Management.Binding()
162162
.SourceExchange(ex1spec)
163163
.DestinationExchange(ex2spec)
164164
.Key(rkStr)
165165
.Arguments(bindingArguments);
166-
IBindingSpecification e2qBinding = _management.Binding()
166+
IBindingSpecification e2qBinding = Management.Binding()
167167
.SourceExchange(ex2spec)
168168
.DestinationQueue(queueSpec)
169169
.Arguments(bindingArguments);
170170

171171
await e1e2Binding.BindAsync();
172172
await e2qBinding.BindAsync();
173173

174-
IPublisherBuilder publisherBuilder1 = _connection.PublisherBuilder();
175-
IPublisherBuilder publisherBuilder2 = _connection.PublisherBuilder();
174+
IPublisherBuilder publisherBuilder1 = Connection.PublisherBuilder();
175+
IPublisherBuilder publisherBuilder2 = Connection.PublisherBuilder();
176176

177177
IPublisher publisher1 = await publisherBuilder1.Exchange(ex1spec).Key(rkStr).BuildAsync();
178178
IPublisher publisher2 = await publisherBuilder2.Exchange(ex2spec).BuildAsync();
@@ -201,8 +201,8 @@ async Task MessageHandler(IContext ctx, IMessage msg)
201201
}
202202
}
203203

204-
IConsumerBuilder consumerBuilder = _connection.ConsumerBuilder();
205-
IConsumer consumer = await consumerBuilder.Queue(_queueName).MessageHandler(MessageHandler).BuildAsync();
204+
IConsumerBuilder consumerBuilder = Connection.ConsumerBuilder();
205+
IConsumer consumer = await consumerBuilder.Queue(QueueName).MessageHandler(MessageHandler).BuildAsync();
206206

207207
await WhenTaskCompletes(allMessagesReceivedTcs.Task);
208208

‎Tests/BindingsTests.cs

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ public class BindingsTests(ITestOutputHelper testOutputHelper) : IntegrationTest
2020
[InlineData("[7][8][~]他被广泛认为是理论计算机科学和人工智能之父。 ", ",,,£## επιρροή στην ανάπτυξη της")]
2121
public async Task SimpleBindingsBetweenExchangeAndQueue(string sourceExchange, string queueDestination)
2222
{
23-
Assert.NotNull(_connection);
24-
Assert.NotNull(_management);
23+
Assert.NotNull(Connection);
24+
Assert.NotNull(Management);
2525

26-
IExchangeSpecification sourceExchangeSpec = _management.Exchange(sourceExchange);
27-
IQueueSpecification destinationQueueSpec = _management.Queue(queueDestination);
26+
IExchangeSpecification sourceExchangeSpec = Management.Exchange(sourceExchange);
27+
IQueueSpecification destinationQueueSpec = Management.Queue(queueDestination);
2828

2929
await sourceExchangeSpec.DeclareAsync();
3030
await destinationQueueSpec.DeclareAsync();
3131

32-
IBindingSpecification bindingSpec = _management.Binding()
32+
IBindingSpecification bindingSpec = Management.Binding()
3333
.SourceExchange(sourceExchangeSpec)
3434
.DestinationQueue(destinationQueueSpec)
3535
.Key("key");
@@ -48,7 +48,7 @@ public async Task SimpleBindingsBetweenExchangeAndQueue(string sourceExchange, s
4848
*/
4949
await sourceExchangeSpec.DeleteAsync();
5050
await destinationQueueSpec.DeleteAsync();
51-
await _connection.CloseAsync();
51+
await Connection.CloseAsync();
5252

5353
await SystemUtils.WaitUntilExchangeDeletedAsync(sourceExchangeSpec);
5454
await SystemUtils.WaitUntilQueueDeletedAsync(destinationQueueSpec);
@@ -57,20 +57,20 @@ public async Task SimpleBindingsBetweenExchangeAndQueue(string sourceExchange, s
5757
[Fact]
5858
public async Task BindBetweenExchangeAndQueueTwoTimes()
5959
{
60-
Assert.NotNull(_connection);
61-
Assert.NotNull(_management);
60+
Assert.NotNull(Connection);
61+
Assert.NotNull(Management);
6262

63-
IExchangeSpecification exchangeSpec = _management.Exchange(_exchangeName);
64-
IQueueSpecification queueSpec = _management.Queue(_queueName);
63+
IExchangeSpecification exchangeSpec = Management.Exchange(ExchangeName);
64+
IQueueSpecification queueSpec = Management.Queue(QueueName);
6565

6666
await exchangeSpec.DeclareAsync();
6767
await queueSpec.DeclareAsync();
6868

69-
IBindingSpecification firstBindingSpec = _management.Binding()
69+
IBindingSpecification firstBindingSpec = Management.Binding()
7070
.SourceExchange(exchangeSpec)
7171
.DestinationQueue(queueSpec)
7272
.Key("first_key");
73-
IBindingSpecification secondBindingSpec = _management.Binding()
73+
IBindingSpecification secondBindingSpec = Management.Binding()
7474
.SourceExchange(exchangeSpec)
7575
.DestinationQueue(queueSpec)
7676
.Key("second_key");
@@ -91,7 +91,7 @@ public async Task BindBetweenExchangeAndQueueTwoTimes()
9191
await exchangeSpec.DeleteAsync();
9292
await queueSpec.DeleteAsync();
9393

94-
await _connection.CloseAsync();
94+
await Connection.CloseAsync();
9595

9696
await SystemUtils.WaitUntilExchangeDeletedAsync(exchangeSpec);
9797
await SystemUtils.WaitUntilQueueDeletedAsync(queueSpec);
@@ -108,18 +108,18 @@ public async Task BindBetweenExchangeAndQueueTwoTimes()
108108
public async Task SimpleBindingsBetweenExchangeAndExchange(string sourceExchangeName, string destinationExchangeName,
109109
string key)
110110
{
111-
Assert.NotNull(_connection);
112-
Assert.NotNull(_management);
111+
Assert.NotNull(Connection);
112+
Assert.NotNull(Management);
113113

114-
IExchangeSpecification sourceExchangeSpec = _management.Exchange(sourceExchangeName);
115-
IExchangeSpecification destinationExchangeSpec = _management.Exchange(destinationExchangeName);
114+
IExchangeSpecification sourceExchangeSpec = Management.Exchange(sourceExchangeName);
115+
IExchangeSpecification destinationExchangeSpec = Management.Exchange(destinationExchangeName);
116116

117117
await Task.WhenAll(
118118
sourceExchangeSpec.DeclareAsync(),
119119
destinationExchangeSpec.DeclareAsync()
120120
);
121121

122-
IBindingSpecification bindingSpecification = _management.Binding()
122+
IBindingSpecification bindingSpecification = Management.Binding()
123123
.SourceExchange(sourceExchangeSpec)
124124
.DestinationExchange(destinationExchangeSpec)
125125
.Key(key);
@@ -135,7 +135,7 @@ await Task.WhenAll(
135135

136136
await sourceExchangeSpec.DeleteAsync();
137137
await destinationExchangeSpec.DeleteAsync();
138-
await _connection.CloseAsync();
138+
await Connection.CloseAsync();
139139

140140
await SystemUtils.WaitUntilExchangeDeletedAsync(sourceExchangeName);
141141
await SystemUtils.WaitUntilExchangeDeletedAsync(destinationExchangeName);
@@ -149,11 +149,11 @@ await Task.WhenAll(
149149
public async Task BindingsBetweenExchangeAndQueuesWithArgumentsDifferentValues(string key1, object value1,
150150
string key2, object value2)
151151
{
152-
Assert.NotNull(_connection);
153-
Assert.NotNull(_management);
152+
Assert.NotNull(Connection);
153+
Assert.NotNull(Management);
154154

155-
IExchangeSpecification exchangeSpec = _management.Exchange(_exchangeName);
156-
IQueueSpecification queueSpec = _management.Queue(_queueName);
155+
IExchangeSpecification exchangeSpec = Management.Exchange(ExchangeName);
156+
IQueueSpecification queueSpec = Management.Queue(QueueName);
157157

158158
await exchangeSpec.DeclareAsync();
159159
await queueSpec.DeclareAsync();
@@ -162,7 +162,7 @@ public async Task BindingsBetweenExchangeAndQueuesWithArgumentsDifferentValues(s
162162
await SystemUtils.WaitUntilQueueExistsAsync(queueSpec);
163163

164164
var arguments = new Dictionary<string, object> { { key1, value1 }, { key2, value2 } };
165-
IBindingSpecification bindingSpecification = _management.Binding()
165+
IBindingSpecification bindingSpecification = Management.Binding()
166166
.SourceExchange(exchangeSpec)
167167
.DestinationQueue(queueSpec)
168168
.Key("key")
@@ -183,7 +183,7 @@ await SystemUtils.WaitUntilBindingsBetweenExchangeAndQueueDontExistWithArgsAsync
183183

184184
await exchangeSpec.DeleteAsync();
185185
await queueSpec.DeleteAsync();
186-
await _connection.CloseAsync();
186+
await Connection.CloseAsync();
187187

188188
await SystemUtils.WaitUntilExchangeDeletedAsync(exchangeSpec);
189189
await SystemUtils.WaitUntilQueueDeletedAsync(queueSpec);
@@ -201,11 +201,11 @@ await SystemUtils.WaitUntilBindingsBetweenExchangeAndQueueDontExistWithArgsAsync
201201
public async Task MultiBindingsBetweenExchangeAndQueuesWithArgumentsDifferentValues(string source,
202202
string destination, string key)
203203
{
204-
Assert.NotNull(_connection);
205-
Assert.NotNull(_management);
204+
Assert.NotNull(Connection);
205+
Assert.NotNull(Management);
206206

207-
IExchangeSpecification exchangeSpec = _management.Exchange(source);
208-
IQueueSpecification queueSpec = _management.Queue(destination);
207+
IExchangeSpecification exchangeSpec = Management.Exchange(source);
208+
IQueueSpecification queueSpec = Management.Queue(destination);
209209

210210
await Task.WhenAll(exchangeSpec.DeclareAsync(), queueSpec.DeclareAsync());
211211

@@ -214,7 +214,7 @@ public async Task MultiBindingsBetweenExchangeAndQueuesWithArgumentsDifferentVal
214214
var bindingSpecTasks = new List<Task>();
215215
for (int i = 0; i < 10; i++)
216216
{
217-
IBindingSpecification bindingSpec = _management.Binding()
217+
IBindingSpecification bindingSpec = Management.Binding()
218218
.SourceExchange(exchangeSpec)
219219
.DestinationQueue(queueSpec)
220220
.Key(key) // single key to use different args
@@ -226,7 +226,7 @@ public async Task MultiBindingsBetweenExchangeAndQueuesWithArgumentsDifferentVal
226226
bindingSpecTasks.Clear();
227227

228228
var specialBindArgs = new Dictionary<string, object>() { { $"v_8", $"p_8" }, { $"v_1", 1 }, { $"v_r", 1000L }, };
229-
IBindingSpecification specialBindSpec = _management.Binding()
229+
IBindingSpecification specialBindSpec = Management.Binding()
230230
.SourceExchange(exchangeSpec)
231231
.DestinationQueue(queueSpec)
232232
.Key(key) // single key to use different args
@@ -245,7 +245,7 @@ public async Task MultiBindingsBetweenExchangeAndQueuesWithArgumentsDifferentVal
245245

246246
await SystemUtils.WaitUntilBindingsBetweenExchangeAndQueueExistWithArgsAsync(exchangeSpec, queueSpec, bindArgs);
247247

248-
await _management.Binding()
248+
await Management.Binding()
249249
.SourceExchange(exchangeSpec)
250250
.DestinationQueue(queueSpec)
251251
.Key(key) // single key to use different args

‎Tests/ConnectionTests/ConnectionTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ public class ConnectionTests(ITestOutputHelper testOutputHelper) : IntegrationTe
1515
[Fact]
1616
public async Task ThrowAmqpClosedExceptionWhenItemIsClosed()
1717
{
18-
Assert.NotNull(_connection);
19-
Assert.NotNull(_management);
18+
Assert.NotNull(Connection);
19+
Assert.NotNull(Management);
2020

21-
IQueueSpecification queueSpec = _management.Queue().Name(_queueName);
21+
IQueueSpecification queueSpec = Management.Queue().Name(QueueName);
2222
await queueSpec.DeclareAsync();
2323

24-
IPublisher publisher = await _connection.PublisherBuilder().Queue(queueSpec).BuildAsync();
24+
IPublisher publisher = await Connection.PublisherBuilder().Queue(queueSpec).BuildAsync();
2525
await publisher.CloseAsync();
2626
publisher.Dispose();
2727

@@ -32,13 +32,13 @@ await Assert.ThrowsAsync<AmqpNotOpenException>(() =>
3232
});
3333

3434
await queueSpec.DeleteAsync();
35-
await _connection.CloseAsync();
36-
Assert.Empty(_connection.GetPublishers());
35+
await Connection.CloseAsync();
36+
Assert.Empty(Connection.GetPublishers());
3737

3838
await Assert.ThrowsAsync<AmqpNotOpenException>(() =>
39-
_connection.PublisherBuilder().Queue("ThrowAmqpClosedExceptionWhenItemIsClosed").BuildAsync());
39+
Connection.PublisherBuilder().Queue("ThrowAmqpClosedExceptionWhenItemIsClosed").BuildAsync());
4040

4141
await Assert.ThrowsAsync<AmqpNotOpenException>(async () =>
42-
await _management.Queue().Name("ThrowAmqpClosedExceptionWhenItemIsClosed").DeclareAsync());
42+
await Management.Queue().Name("ThrowAmqpClosedExceptionWhenItemIsClosed").DeclareAsync());
4343
}
4444
}

0 commit comments

Comments
 (0)