Skip to content

Commit a84c655

Browse files
lukebakkenlukebakken
committed
* Only 84 errors to go...
1 parent 88c3c54 commit a84c655

14 files changed

+94
-78
lines changed

‎projects/Test/Integration/ConnectionRecovery/TestConnectionRecovery.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ await _channel.ExchangeDeclareAsync(exchange: exchangeName,
108108

109109
using (IChannel pubCh = await _conn.CreateChannelAsync())
110110
{
111-
await pubCh.BasicPublishAsync(exchange: exchangeName, routingKey: "unused", body: body);
111+
await pubCh.BasicPublishAsync(exchange: exchangeName, routingKey: (RoutingKey)"unused", body: body);
112112
await pubCh.CloseAsync();
113113
}
114114

‎projects/Test/Integration/ConnectionRecovery/TestRecoveryWithDeletedEntities.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,23 +100,23 @@ public async Task TestThatDeletedExchangesDontReappearOnRecovery()
100100
[Fact]
101101
public async Task TestThatDeletedQueueBindingsDontReappearOnRecovery()
102102
{
103-
QueueName q = (await _channel.QueueDeclareAsync(QueueName.Empty, false, false, false)).QueueName;
103+
QueueDeclareOk q = await _channel.QueueDeclareAsync(QueueName.Empty, false, false, false);
104104

105105
ExchangeName ex_source = GenerateExchangeName();
106106
ExchangeName ex_destination = GenerateExchangeName();
107107

108108
await _channel.ExchangeDeclareAsync(ex_source, ExchangeType.Fanout);
109109
await _channel.ExchangeDeclareAsync(ex_destination, ExchangeType.Fanout);
110110

111-
await _channel.ExchangeBindAsync(destination: ex_destination, source: ex_source, routingKey: "");
112-
await _channel.QueueBindAsync(q, ex_destination, "");
113-
await _channel.QueueUnbindAsync(q, ex_destination, "");
111+
await _channel.ExchangeBindAsync(destination: ex_destination, source: ex_source, routingKey: RoutingKey.Empty);
112+
await _channel.QueueBindAsync(q, ex_destination, RoutingKey.Empty);
113+
await _channel.QueueUnbindAsync(q, ex_destination, RoutingKey.Empty);
114114

115115
try
116116
{
117117
await CloseAndWaitForRecoveryAsync();
118118
Assert.True(_channel.IsOpen);
119-
await _channel.BasicPublishAsync(ex_source, "", _encoding.GetBytes("msg"));
119+
await _channel.BasicPublishAsync(ex_source, RoutingKey.Empty, _encoding.GetBytes("msg"));
120120
await AssertMessageCountAsync(q, 0);
121121
}
122122
finally

‎projects/Test/Integration/ConnectionRecovery/TestRpcAfterRecovery.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ public TestRpcAfterRecovery(ITestOutputHelper output)
4949
[Fact]
5050
public async Task TestPublishRpcRightAfterReconnect()
5151
{
52-
string testQueueName = $"dotnet-client.test.{nameof(TestPublishRpcRightAfterReconnect)}";
52+
QueueName testQueueName = new QueueName($"dotnet-client.test.{nameof(TestPublishRpcRightAfterReconnect)}");
5353
await _channel.QueueDeclareAsync(testQueueName, false, false, false);
5454
var replyConsumer = new AsyncEventingBasicConsumer(_channel);
55-
await _channel.BasicConsumeAsync("amq.rabbitmq.reply-to", true, replyConsumer);
55+
await _channel.BasicConsumeAsync((QueueName)"amq.rabbitmq.reply-to", true, replyConsumer);
5656
var properties = new BasicProperties();
5757
properties.ReplyTo = "amq.rabbitmq.reply-to";
5858

@@ -77,7 +77,7 @@ public async Task TestPublishRpcRightAfterReconnect()
7777

7878
try
7979
{
80-
await _channel.BasicPublishAsync(ExchangeName.Empty, testQueueName, properties, _messageBody);
80+
await _channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)testQueueName, properties, _messageBody);
8181
}
8282
catch (Exception e)
8383
{

‎projects/Test/Integration/TestAsyncConsumer.cs

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,15 @@ public TestAsyncConsumer(ITestOutputHelper output)
5353
public async Task TestBasicRoundtripConcurrent()
5454
{
5555
QueueDeclareOk q = await _channel.QueueDeclareAsync();
56+
QueueName qname = (QueueName)q;
5657

5758
string publish1 = GetUniqueString(512);
5859
byte[] body = _encoding.GetBytes(publish1);
59-
await _channel.BasicPublishAsync(ExchangeName.Empty, q.QueueName, body);
60+
await _channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)qname, body);
6061

6162
string publish2 = GetUniqueString(512);
6263
body = _encoding.GetBytes(publish2);
63-
await _channel.BasicPublishAsync(ExchangeName.Empty, q.QueueName, body);
64+
await _channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)qname, body);
6465

6566
var consumer = new AsyncEventingBasicConsumer(_channel);
6667

@@ -139,7 +140,7 @@ public async Task TestBasicRoundtripConcurrent()
139140
public async Task TestBasicRoundtripConcurrentManyMessages()
140141
{
141142
const int publish_total = 4096;
142-
string queueName = GenerateQueueName();
143+
QueueName queueName = GenerateQueueName();
143144

144145
string publish1 = GetUniqueString(512);
145146
byte[] body1 = _encoding.GetBytes(publish1);
@@ -215,8 +216,8 @@ public async Task TestBasicRoundtripConcurrentManyMessages()
215216

216217
for (int i = 0; i < publish_total; i++)
217218
{
218-
await publishChannel.BasicPublishAsync(ExchangeName.Empty, queueName, body1);
219-
await publishChannel.BasicPublishAsync(ExchangeName.Empty, queueName, body2);
219+
await publishChannel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)queueName, body1);
220+
await publishChannel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)queueName, body2);
220221
await publishChannel.WaitForConfirmsOrDieAsync();
221222
}
222223

@@ -315,7 +316,7 @@ public async Task TestBasicRoundtripConcurrentManyMessages()
315316
[Fact]
316317
public async Task TestBasicRejectAsync()
317318
{
318-
string queueName = GenerateQueueName();
319+
QueueName queueName = GenerateQueueName();
319320

320321
var publishSyncSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
321322
var cancellationTokenSource = new CancellationTokenSource(TestTimeout);
@@ -370,7 +371,7 @@ public async Task TestBasicRejectAsync()
370371

371372
const string publish1 = "sync-hi-1";
372373
byte[] _body = _encoding.GetBytes(publish1);
373-
await _channel.BasicPublishAsync(ExchangeName.Empty, queueName, _body);
374+
await _channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)queueName, _body);
374375

375376
await _channel.BasicConsumeAsync(queue: queueName, autoAck: false,
376377
consumerTag: ConsumerTag.Empty, noLocal: false, exclusive: false,
@@ -416,7 +417,7 @@ await _channel.BasicConsumeAsync(queue: queueName, autoAck: false,
416417
[Fact]
417418
public async Task TestBasicAckAsync()
418419
{
419-
string queueName = GenerateQueueName();
420+
QueueName queueName = GenerateQueueName();
420421

421422
const int messageCount = 1024;
422423
int messagesReceived = 0;
@@ -472,7 +473,7 @@ await _channel.BasicConsumeAsync(queue: queueName, autoAck: false,
472473
for (int i = 0; i < messageCount; i++)
473474
{
474475
byte[] _body = _encoding.GetBytes(Guid.NewGuid().ToString());
475-
await _channel.BasicPublishAsync(ExchangeName.Empty, queueName, _body);
476+
await _channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)queueName, _body);
476477
await _channel.WaitForConfirmsOrDieAsync();
477478
}
478479

@@ -523,11 +524,11 @@ public async Task TestBasicNackAsync()
523524
publishSyncSource.SetResult(true);
524525
};
525526

526-
QueueDeclareOk q = await _channel.QueueDeclareAsync(string.Empty, false, false, false);
527-
string queueName = q.QueueName;
527+
QueueDeclareOk q = await _channel.QueueDeclareAsync(QueueName.Empty, false, false, false);
528+
QueueName queueName = (QueueName)q;
528529
const string publish1 = "sync-hi-1";
529530
byte[] _body = _encoding.GetBytes(publish1);
530-
await _channel.BasicPublishAsync(ExchangeName.Empty, queueName, _body);
531+
await _channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)queueName, _body);
531532

532533
await _channel.BasicConsumeAsync(queue: queueName, autoAck: false,
533534
consumerTag: ConsumerTag.Empty, noLocal: false, exclusive: false,
@@ -569,12 +570,13 @@ await _channel.BasicConsumeAsync(queue: queueName, autoAck: false,
569570
public async Task NonAsyncConsumerShouldThrowInvalidOperationException()
570571
{
571572
bool sawException = false;
572-
QueueDeclareOk q = await _channel.QueueDeclareAsync(string.Empty, false, false, false);
573-
await _channel.BasicPublishAsync(ExchangeName.Empty, q.QueueName, GetRandomBody(1024));
573+
QueueDeclareOk q = await _channel.QueueDeclareAsync(QueueName.Empty, false, false, false);
574+
QueueName queueName = (QueueName)q;
575+
await _channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)queueName, GetRandomBody(1024));
574576
var consumer = new EventingBasicConsumer(_channel);
575577
try
576578
{
577-
ConsumerTag consumerTag = await _channel.BasicConsumeAsync(q.QueueName, false, ConsumerTag.Empty, false, false, null, consumer);
579+
ConsumerTag consumerTag = await _channel.BasicConsumeAsync(queueName, false, ConsumerTag.Empty, false, false, null, consumer);
578580
}
579581
catch (InvalidOperationException)
580582
{
@@ -592,7 +594,7 @@ public async Task TestDeclarationOfManyAutoDeleteQueuesWithTransientConsumer()
592594
{
593595
tasks.Add(Task.Run(async () =>
594596
{
595-
string q = GenerateQueueName();
597+
QueueName q = GenerateQueueName();
596598
await _channel.QueueDeclareAsync(q, false, false, true);
597599
var dummy = new AsyncEventingBasicConsumer(_channel);
598600
ConsumerTag tag = await _channel.BasicConsumeAsync(q, true, dummy);

‎projects/Test/Integration/TestAsyncConsumerExceptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ protected async Task TestExceptionHandlingWith(IBasicConsumer consumer,
103103
CancellationTokenRegistration ctsr = cts.Token.Register(() => tcs.TrySetResult(false));
104104
try
105105
{
106-
QueueName q = await _channel.QueueDeclareAsync(string.Empty, false, true, false);
106+
QueueName q = await _channel.QueueDeclareAsync(QueueName.Empty, false, true, false);
107107
_channel.CallbackException += (ch, evt) =>
108108
{
109109
// _output.WriteLine($"[INFO] _channel.CallbackException: {evt.Exception}");

‎projects/Test/Integration/TestBasicGet.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public async Task TestBasicGetRoundTrip()
4949
{
5050
const string msg = "for async basic.get";
5151

52-
QueueDeclareOk queueResult = await _channel.QueueDeclareAsync(string.Empty, false, true, true);
52+
QueueDeclareOk queueResult = await _channel.QueueDeclareAsync(QueueName.Empty, false, true, true);
5353
var qn = new QueueName(queueResult.QueueName);
5454
var rk = new RoutingKey(queueResult.QueueName);
5555

@@ -101,11 +101,11 @@ public Task TestBasicGetWithNonEmptyResponseAndAutoAckMode()
101101
}, msg);
102102
}
103103

104-
private Task EnsureNotEmptyAsync(string q, string body)
104+
private Task EnsureNotEmptyAsync(QueueName q, string body)
105105
{
106106
return WithTemporaryChannelAsync(ch =>
107107
{
108-
return ch.BasicPublishAsync(ExchangeName.Empty, q, _encoding.GetBytes(body)).AsTask();
108+
return ch.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)q, _encoding.GetBytes(body)).AsTask();
109109
});
110110
}
111111

@@ -116,12 +116,12 @@ private async Task WithClosedChannelAsync(Func<IChannel, Task> action)
116116
await action(channel);
117117
}
118118

119-
private Task WithNonEmptyQueueAsync(Func<IChannel, string, Task> action)
119+
private Task WithNonEmptyQueueAsync(Func<IChannel, QueueName, Task> action)
120120
{
121121
return WithNonEmptyQueueAsync(action, "msg");
122122
}
123123

124-
private Task WithNonEmptyQueueAsync(Func<IChannel, string, Task> action, string msg)
124+
private Task WithNonEmptyQueueAsync(Func<IChannel, QueueName, Task> action, string msg)
125125
{
126126
return WithTemporaryNonExclusiveQueueAsync(async (ch, q) =>
127127
{
@@ -130,7 +130,7 @@ private Task WithNonEmptyQueueAsync(Func<IChannel, string, Task> action, string
130130
});
131131
}
132132

133-
private Task WithEmptyQueueAsync(Func<IChannel, string, Task> action)
133+
private Task WithEmptyQueueAsync(Func<IChannel, QueueName, Task> action)
134134
{
135135
return WithTemporaryNonExclusiveQueueAsync(async (channel, queue) =>
136136
{

‎projects/Test/Integration/TestBasicPublish.cs

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public async Task TestBasicRoundtripArray()
6262
_channel = await _conn.CreateChannelAsync();
6363

6464
QueueDeclareOk q = await _channel.QueueDeclareAsync();
65+
QueueName qname = (QueueName)q;
6566
var bp = new BasicProperties();
6667
byte[] sendBody = _encoding.GetBytes("hi");
6768
byte[] consumeBody = null;
@@ -73,9 +74,9 @@ public async Task TestBasicRoundtripArray()
7374
consumeBody = a.Body.ToArray();
7475
consumerReceivedSemaphore.Release();
7576
};
76-
ConsumerTag tag = await _channel.BasicConsumeAsync(q.QueueName, true, consumer);
77+
ConsumerTag tag = await _channel.BasicConsumeAsync(qname, true, consumer);
7778

78-
await _channel.BasicPublishAsync(ExchangeName.Empty, q.QueueName, bp, sendBody);
79+
await _channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)qname, bp, sendBody);
7980
bool waitRes = await consumerReceivedSemaphore.WaitAsync(TimeSpan.FromSeconds(5));
8081
await _channel.BasicCancelAsync(tag);
8182

@@ -120,6 +121,7 @@ public async Task TestBasicRoundtripReadOnlyMemory()
120121
_channel = await _conn.CreateChannelAsync();
121122

122123
QueueDeclareOk q = await _channel.QueueDeclareAsync();
124+
QueueName qname = (QueueName)q;
123125
byte[] sendBody = _encoding.GetBytes("hi");
124126
byte[] consumeBody = null;
125127
var consumer = new EventingBasicConsumer(_channel);
@@ -130,9 +132,9 @@ public async Task TestBasicRoundtripReadOnlyMemory()
130132
consumeBody = a.Body.ToArray();
131133
consumerReceivedSemaphore.Release();
132134
};
133-
ConsumerTag tag = await _channel.BasicConsumeAsync(q.QueueName, true, consumer);
135+
ConsumerTag tag = await _channel.BasicConsumeAsync(qname, true, consumer);
134136

135-
await _channel.BasicPublishAsync(ExchangeName.Empty, q.QueueName, new ReadOnlyMemory<byte>(sendBody));
137+
await _channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)qname, new ReadOnlyMemory<byte>(sendBody));
136138
bool waitRes = await consumerReceivedSemaphore.WaitAsync(TimeSpan.FromSeconds(2));
137139
await _channel.BasicCancelAsync(tag);
138140

@@ -148,6 +150,7 @@ public async Task CanNotModifyPayloadAfterPublish()
148150
_channel = await _conn.CreateChannelAsync();
149151

150152
QueueDeclareOk q = await _channel.QueueDeclareAsync();
153+
QueueName qname = (QueueName)q;
151154
byte[] sendBody = new byte[1000];
152155
var consumer = new EventingBasicConsumer(_channel);
153156
using (var consumerReceivedSemaphore = new SemaphoreSlim(0, 1))
@@ -161,9 +164,9 @@ public async Task CanNotModifyPayloadAfterPublish()
161164
}
162165
consumerReceivedSemaphore.Release();
163166
};
164-
ConsumerTag tag = await _channel.BasicConsumeAsync(q.QueueName, true, consumer);
167+
ConsumerTag tag = await _channel.BasicConsumeAsync(qname, true, consumer);
165168

166-
await _channel.BasicPublishAsync(ExchangeName.Empty, q.QueueName, sendBody);
169+
await _channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)qname, sendBody);
167170
sendBody.AsSpan().Fill(1);
168171

169172
Assert.True(await consumerReceivedSemaphore.WaitAsync(TimeSpan.FromSeconds(5)));
@@ -220,6 +223,7 @@ public async Task TestMaxInboundMessageBodySize()
220223
};
221224

222225
QueueDeclareOk q = await channel.QueueDeclareAsync();
226+
QueueName qname = (QueueName)q;
223227

224228
var consumer = new EventingBasicConsumer(channel);
225229

@@ -248,10 +252,10 @@ public async Task TestMaxInboundMessageBodySize()
248252
Interlocked.Increment(ref count);
249253
};
250254

251-
string tag = await channel.BasicConsumeAsync(q.QueueName, true, consumer);
255+
string tag = await channel.BasicConsumeAsync(qname, true, consumer);
252256

253-
await channel.BasicPublishAsync(ExchangeName.Empty, q.QueueName, msg0);
254-
await channel.BasicPublishAsync(ExchangeName.Empty, q.QueueName, msg1);
257+
await channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)qname, msg0);
258+
await channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)qname, msg1);
255259
Assert.True(await tcs.Task);
256260

257261
Assert.Equal(1, count);
@@ -277,6 +281,7 @@ public async Task TestPropertiesRoundtrip_Headers()
277281
};
278282

279283
QueueDeclareOk q = await _channel.QueueDeclareAsync();
284+
QueueName qname = (QueueName)q;
280285
var bp = new BasicProperties() { Headers = new Dictionary<string, object>() };
281286
bp.Headers["Hello"] = "World";
282287
byte[] sendBody = _encoding.GetBytes("hi");
@@ -292,8 +297,8 @@ public async Task TestPropertiesRoundtrip_Headers()
292297
consumerReceivedSemaphore.Release();
293298
};
294299

295-
ConsumerTag tag = await _channel.BasicConsumeAsync(q.QueueName, true, consumer);
296-
await _channel.BasicPublishAsync(ExchangeName.Empty, q.QueueName, bp, sendBody);
300+
ConsumerTag tag = await _channel.BasicConsumeAsync(qname, true, consumer);
301+
await _channel.BasicPublishAsync(ExchangeName.Empty, (RoutingKey)qname, bp, sendBody);
297302
bool waitResFalse = await consumerReceivedSemaphore.WaitAsync(TimeSpan.FromSeconds(5));
298303
await _channel.BasicCancelAsync(tag);
299304
Assert.True(waitResFalse);

‎projects/Test/Integration/TestBasicPublishAsync.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ public async Task TestQueuePurgeAsync()
5151

5252
await _channel.ConfirmSelectAsync();
5353

54-
QueueDeclareOk q = await _channel.QueueDeclareAsync(string.Empty, false, false, true);
54+
QueueDeclareOk q = await _channel.QueueDeclareAsync(QueueName.Empty, false, false, true);
55+
QueueName qname = (QueueName)q;
5556
var rk = new RoutingKey(q.QueueName);
5657

5758
var publishTask = Task.Run(async () =>
@@ -66,7 +67,7 @@ public async Task TestQueuePurgeAsync()
6667
});
6768

6869
Assert.True(await publishSyncSource.Task);
69-
Assert.Equal((uint)messageCount, await _channel.QueuePurgeAsync(q));
70+
Assert.Equal((uint)messageCount, await _channel.QueuePurgeAsync(qname));
7071
}
7172
}
7273
}

0 commit comments

Comments
 (0)