Queue delete from RMQQueue or RMQChannel

[#119367857]

Author: camelpunch

RMQClient/RMQAllocatedChannel.m

@@ -110,6 +110,14 @@ - (RMQQueue *)queue:(NSString *)queueName {
     return [self queue:queueName options:RMQQueueDeclareNoOptions];
 }
 
+- (void)queueDelete:(NSString *)queueName
+            options:(RMQQueueDeleteOptions)options {
+    [self.queues removeObjectForKey:queueName];
+    [self.dispatcher sendSyncMethod:[[RMQQueueDelete alloc] initWithReserved1:[[RMQShort alloc] init:0]
+                                                                        queue:[[RMQShortstr alloc] init:queueName]
+                                                                      options:options]];
+}
+
 - (void)queueBind:(NSString *)queueName
          exchange:(NSString *)exchangeName
        routingKey:(nonnull NSString *)routingKey {

RMQClient/RMQChannel.h

@@ -21,6 +21,9 @@
 
 - (nonnull RMQQueue *)queue:(nonnull NSString *)queueName;
 
+- (void)queueDelete:(nonnull NSString *)queueName
+            options:(RMQQueueDeleteOptions)options;
+
 - (void)queueBind:(nonnull NSString *)queueName
          exchange:(nonnull NSString *)exchangeName
        routingKey:(nonnull NSString *)routingKey;

RMQClient/RMQQueue.h

@@ -18,6 +18,8 @@
 
 - (void)bind:(nonnull RMQExchange *)exchange routingKey:(nonnull NSString *)routingKey;
 - (void)bind:(nonnull RMQExchange *)exchange;
+- (void)delete:(RMQQueueDeleteOptions)options;
+- (void)delete;
 - (void)publish:(nonnull NSString *)message persistent:(BOOL)isPersistent;
 - (void)publish:(nonnull NSString *)message;
 - (void)pop:(RMQConsumer _Nonnull)handler;

RMQClient/RMQQueue.m

@@ -38,6 +38,14 @@ - (void)bind:(RMQExchange *)exchange {
     [self bind:exchange routingKey:@""];
 }
 
+- (void)delete:(RMQQueueDeleteOptions)options {
+    [self.channel queueDelete:self.name options:options];
+}
+
+- (void)delete {
+    [self delete:RMQQueueDeleteNoOptions];
+}
+
 - (void)publish:(NSString *)message persistent:(BOOL)isPersistent {
     [self.channel basicPublish:message routingKey:self.name exchange:@"" persistent:isPersistent];
 }

RMQClient/RMQUnallocatedChannel.m

@@ -64,6 +64,11 @@ - (RMQQueue *)queue:(NSString *)queueName {
     return [self queue:queueName options:RMQQueueDeclareNoOptions];
 }
 
+- (void)queueDelete:(NSString *)queueName
+            options:(RMQQueueDeleteOptions)options {
+    [self err];
+}
+
 - (void)queueBind:(NSString *)queueName exchange:(NSString *)exchangeName routingKey:(nonnull NSString *)routingKey {
     [self err];
 }

RMQClientTests/ChannelSpy.swift

@@ -12,6 +12,8 @@
     var lastReceivedQueueBindQueueName: String?
     var lastReceivedQueueBindExchange: String?
     var lastReceivedQueueBindRoutingKey: String?
+    var lastReceivedQueueDeleteQueueName: String?
+    var lastReceivedQueueDeleteOptions: RMQQueueDeleteOptions?
     var lastReceivedFrameset: RMQFrameset?
     var queues: [String: RMQQueue] = [:]
     var stubbedMessageCount: RMQLong = RMQLong(0)
@@ -84,6 +86,11 @@
         )
     }
 
+    func queueDelete(queueName: String, options: RMQQueueDeleteOptions) {
+        lastReceivedQueueDeleteQueueName = queueName
+        lastReceivedQueueDeleteOptions = options
+    }
+
     func queueBind(queueName: String, exchange exchangeName: String, routingKey: String) {
         lastReceivedQueueBindQueueName = queueName
         lastReceivedQueueBindExchange = exchangeName

RMQClientTests/MethodFixtures.swift

@@ -119,6 +119,10 @@ class MethodFixtures {
         return RMQQueueDeclareOk(queue: RMQShortstr(name), messageCount: RMQLong(0), consumerCount: RMQLong(0))
     }
 
+    static func queueDelete(name: String, options: RMQQueueDeleteOptions) -> RMQQueueDelete {
+        return RMQQueueDelete(reserved1: RMQShort(0), queue: RMQShortstr(name), options: options)
+    }
+
     static func queueBind(name: String, exchangeName: String, routingKey: String) -> RMQQueueBind {
         return RMQQueueBind(reserved1: RMQShort(0), queue: RMQShortstr(name), exchange: RMQShortstr(exchangeName), routingKey: RMQShortstr(routingKey), options: [], arguments: RMQTable([:]))
     }

RMQClientTests/QueueDeclarationTest.swift

@@ -46,4 +46,22 @@ class QueueDeclarationTest: XCTestCase {
         XCTAssertEqual(RMQError.ChannelQueueNameCollision.rawValue, delegate.lastChannelError?.code)
     }
 
+    func testQueueDeleteSendsAQueueDelete() {
+        let dispatcher = DispatcherSpy()
+        let ch = RMQAllocatedChannel(123, contentBodySize: 100, dispatcher: dispatcher, commandQueue: FakeSerialQueue())
+        ch.queueDelete("my queue", options: [.IfUnused])
+        XCTAssertEqual(MethodFixtures.queueDelete("my queue", options: [.IfUnused]),
+                       dispatcher.lastSyncMethod as? RMQQueueDelete)
+    }
+
+    func testQueueDeclareAfterDeleteSendsAFreshDeclare() {
+        let dispatcher = DispatcherSpy()
+        let ch = RMQAllocatedChannel(123, contentBodySize: 100, dispatcher: dispatcher, commandQueue: FakeSerialQueue())
+        ch.queue("my queue")
+        ch.queueDelete("my queue", options: [])
+        dispatcher.lastSyncMethod = nil
+        ch.queue("my queue")
+        XCTAssertEqual(MethodFixtures.queueDeclare("my queue", options: []), dispatcher.lastSyncMethod as? RMQQueueDeclare)
+    }
+
 }

RMQClientTests/RMQQueueTest.swift

@@ -99,4 +99,17 @@ class RMQQueueTest: XCTestCase {
         XCTAssertEqual("", channel.lastReceivedQueueBindRoutingKey)
     }
 
+    func testDeleteCallsDeleteOnChannel() {
+        let channel = ChannelSpy(123)
+        let queue = RMQQueue(name: "deletable", channel: channel)
+
+        queue.delete()
+        XCTAssertEqual("deletable", channel.lastReceivedQueueDeleteQueueName)
+        XCTAssertEqual([], channel.lastReceivedQueueDeleteOptions)
+
+        queue.delete([.IfEmpty])
+        XCTAssertEqual("deletable", channel.lastReceivedQueueDeleteQueueName)
+        XCTAssertEqual([.IfEmpty], channel.lastReceivedQueueDeleteOptions)
+    }
+
 }

RMQClientTests/RMQUnallocatedChannelTest.swift

@@ -28,6 +28,7 @@ class RMQUnallocatedChannelTest: XCTestCase {
             { ch.headers("") },
             { ch.nack(1) },
             { ch.queue("foo") },
+            { ch.queueDelete("foo", options: []) },
             { ch.queueBind("", exchange: "", routingKey: "") },
             { ch.queueUnbind("", exchange: "", routingKey: "") },
             { ch.reject(1) },