Send actual framework version in connection.start-ok

[#118965455]

Author: camelpunch

RMQClient/RMQHandshaker.m

@@ -50,11 +50,15 @@ - (RMQConnectionStartOk *)startOk {
                                                       @"basic.nack"                   : yes,
                                                       @"connection.blocked"           : yes,
                                                       @"authentication_failure_close" : yes}];
+
+    NSBundle *bundle = [NSBundle bundleWithIdentifier:@"io.pivotal.RMQClient"];
+    NSString *version = bundle.infoDictionary[@"CFBundleShortVersionString"];
+
     RMQTable *clientProperties = [[RMQTable alloc] init:
                                   @{@"capabilities" : capabilities,
                                     @"product"      : [[RMQLongstr alloc] init:@"RMQClient"],
                                     @"platform"     : [[RMQLongstr alloc] init:@"iOS"],
-                                    @"version"      : [[RMQLongstr alloc] init:RMQClientVersion],
+                                    @"version"      : [[RMQLongstr alloc] init:version],
                                     @"information"  : [[RMQLongstr alloc] init:@"https://github.com/rabbitmq/rabbitmq-objc-client"]}];
 
     return [[RMQConnectionStartOk alloc] initWithClientProperties:clientProperties

RMQClientTests/MethodFixtures.swift

@@ -32,7 +32,7 @@ class MethodFixtures {
         )
     }
 
-    static func connectionStartOk(user user: String = "foo", password: String = "bar") -> RMQConnectionStartOk {
+    static func connectionStartOk(user user: String = "foo", password: String = "bar", version: String = "0.0.1") -> RMQConnectionStartOk {
         let capabilitiesDict: [String: RMQBoolean] = [
             "publisher_confirms"           : rmqTrue,
             "consumer_cancel_notify"       : rmqTrue,
@@ -45,8 +45,8 @@ class MethodFixtures {
             "capabilities" : RMQTable(capabilitiesDict),
             "product"      : RMQLongstr("RMQClient"),
             "platform"     : RMQLongstr("iOS"),
-            "version"      : RMQLongstr("0.0.1"),
-            "information"  : RMQLongstr("https://github.com/camelpunch/RMQClient")
+            "version"      : RMQLongstr(version),
+            "information"  : RMQLongstr("https://github.com/rabbitmq/rabbitmq-objc-client")
         ]
         return RMQConnectionStartOk(
             clientProperties: RMQTable(clientPropertiesDict),

RMQClientTests/RMQConnectionTest.swift

@@ -105,6 +105,29 @@ class RMQConnectionTest: XCTestCase {
         XCTAssert(heartbeatSender.signalActivityReceived)
     }
 
+    func testSendsVersionNumberWithStartOk() {
+        let transport = ControlledInteractionTransport()
+        let q = FakeSerialQueue()
+        let conn = RMQConnection(transport: transport,
+                                 config: TestHelper.connectionConfig(vhost: ""),
+                                 handshakeTimeout: 10,
+                                 channelAllocator: ChannelSpyAllocator(),
+                                 frameHandler: FrameHandlerSpy(),
+                                 delegate: ConnectionDelegateSpy(),
+                                 commandQueue: q,
+                                 waiterFactory: FakeWaiterFactory(),
+                                 heartbeatSender: HeartbeatSenderSpy())
+        conn.start()
+        try! q.step()
+
+        transport.serverSendsPayload(MethodFixtures.connectionStart(), channelNumber: 0)
+
+        let parser = RMQParser(data: transport.outboundData.last!)
+        let outgoingStartOk: RMQConnectionStartOk = RMQFrame(parser: parser).payload as! RMQConnectionStartOk
+
+        XCTAssert(outgoingStartOk.description().rangeOfString(TestHelper.frameworkVersion()) != nil)
+    }
+
     func testSendsConfiguredVHostWithConnectionOpen() {
         let transport = ControlledInteractionTransport()
         let q = FakeSerialQueue()

RMQClientTests/TestHelper.swift

@@ -92,4 +92,9 @@ class TestHelper {
         return (transport, q, conn, delegate)
     }
 
+    static func frameworkVersion() -> String {
+        let bundle = NSBundle(identifier: "io.pivotal.RMQClient")!
+        return bundle.infoDictionary!["CFBundleShortVersionString"] as! String
+    }
+
 }