Updated Client tests (Protocol errors are closedByBroker OR error)

Updated Swift client tests
novastone-media · Apr 9, 2015 · cadb8b9 · cadb8b9
1 parent 3a91efa
commit cadb8b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 26 deletions.
diff --git a/MQTTClient/MQTTClientTests/MQTTClientPublishTests.m b/MQTTClient/MQTTClientTests/MQTTClientPublishTests.m
@@ -117,7 +117,7 @@ - (void)testPublish_a_lot_of_q0
         for (int i = 0; i < ALOT; i++) {
             NSData *data = [[NSString stringWithFormat:@"%@/%s/%d", TOPIC, __FUNCTION__, i] dataUsingEncoding:NSUTF8StringEncoding];
             NSString *topic = [NSString stringWithFormat:@"%@/%s/%d", TOPIC, __FUNCTION__, i];
-            self.sentMid = [self.session publishData:data onTopic:topic retain:false qos:MQTTQoSLevelAtMostOnce];
+            self.sentMid = [self.session publishData:data onTopic:topic retain:false qos:MQTTQosLevelAtMostOnce];
             NSLog(@"testing publish %d", self.sentMid);
         }
         [self shutdown:parameters];
@@ -406,7 +406,10 @@ - (void)testPublish_q2_dup_MQTT_3_3_1_2
 - (void)testPublishCloseExpected:(NSData *)data onTopic:(NSString *)topic retain:(BOOL)retain atLevel:(UInt8)qos
 {
     [self testPublishCore:data onTopic:topic retain:retain atLevel:qos];
-    XCTAssertEqual(self.event, MQTTSessionEventConnectionClosedByBroker, @"No MQTTSessionEventConnectionClosedByBroker happened");
+    XCTAssert(
+              (self.event == MQTTSessionEventConnectionClosedByBroker) ||
+              (self.event == MQTTSessionEventConnectionError),
+              @"No MQTTSessionEventConnectionClosedByBroker or MQTTSessionEventConnectionError happened");
 }
 
 - (void)testPublish:(NSData *)data onTopic:(NSString *)topic retain:(BOOL)retain atLevel:(UInt8)qos

diff --git a/MQTTClient/MQTTClientTests/SwiftTests.swift b/MQTTClient/MQTTClientTests/SwiftTests.swift
@@ -9,10 +9,6 @@
 import Foundation
 
 class SwiftTests : XCTestCase, MQTTSessionDelegate {
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/master
     var session: MQTTSession?;
     var sessionConnected = false;
     var sessionError = false;
@@ -29,26 +25,15 @@ class SwiftTests : XCTestCase, MQTTSessionDelegate {
             will: false,
             willTopic: nil,
             willMsg: nil,
-<<<<<<< HEAD
-            willQoS: MQTTQosLevel.QoSLevelAtMostOnce,
-=======
             willQoS: MQTTQosLevel.AtMostOnce,
->>>>>>> origin/master
             willRetainFlag: false,
             protocolLevel: 4,
             runLoop: nil,
             forMode: nil
         )
-<<<<<<< HEAD
-
-        session!.delegate = self;
-
-        session!.connectToHost("test.mosquitto.org",
-=======
         session!.delegate = self;
 
         session!.connectToHost("localhost",
->>>>>>> origin/master
             port: 1883,
             usingSSL: false)
         while !sessionConnected && !sessionError {
@@ -61,23 +46,14 @@ class SwiftTests : XCTestCase, MQTTSessionDelegate {
     }
 
     func testSubscribe() {
-<<<<<<< HEAD
-        session!.subscribeToTopic("#", atLevel: MQTTQosLevel.QoSLevelAtMostOnce)
-=======
         session!.subscribeToTopic("#", atLevel: MQTTQosLevel.AtMostOnce)
->>>>>>> origin/master
-
         while sessionConnected && !sessionError && !sessionSubAcked {
             NSRunLoop.currentRunLoop().runUntilDate(NSDate(timeIntervalSinceNow: 1))
         }
     }
 
     func testPublish() {
-<<<<<<< HEAD
-        session!.subscribeToTopic("#", atLevel: MQTTQosLevel.QoSLevelAtMostOnce)
-=======
         session!.subscribeToTopic("#", atLevel: MQTTQosLevel.AtMostOnce)
->>>>>>> origin/master
 
         while sessionConnected && !sessionError && !sessionSubAcked {
             NSRunLoop.currentRunLoop().runUntilDate(NSDate(timeIntervalSinceNow: 1))