[FIX] Failing unit tests closes #90

novastone-media · Jan 13, 2016 · 9db29b5 · 9db29b5
1 parent 68f4f51
commit 9db29b5
Show file tree

Hide file tree

Showing 67 changed files with 608 additions and 77 deletions.
diff --git a/MQTTClient/MQTTClient.xcodeproj/project.pbxproj b/MQTTClient/MQTTClient.xcodeproj/project.pbxproj
@@ -169,9 +169,6 @@
 		84998C8D1C0EE26600119061 /* MQTTSessionSynchron.h in Headers */ = {isa = PBXBuildFile; fileRef = 84998C871C0EDBAA00119061 /* MQTTSessionSynchron.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		84998C941C0EE3D600119061 /* MQTTSessionSynchron.m in Sources */ = {isa = PBXBuildFile; fileRef = 84998C881C0EDBAA00119061 /* MQTTSessionSynchron.m */; };
 		84998C951C0EE3D600119061 /* MQTTSessionLegacy.m in Sources */ = {isa = PBXBuildFile; fileRef = 84998C811C0ED09700119061 /* MQTTSessionLegacy.m */; };
-		84A592141C3C5343008C5199 /* MQTTTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 84A592131C3C5343008C5199 /* MQTTTransport.m */; };
-		84A592151C3C5343008C5199 /* MQTTTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 84A592131C3C5343008C5199 /* MQTTTransport.m */; };
-		84A592161C3C5343008C5199 /* MQTTTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 84A592131C3C5343008C5199 /* MQTTTransport.m */; };
 		84A592171C3C5343008C5199 /* MQTTTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 84A592131C3C5343008C5199 /* MQTTTransport.m */; };
 		84A592181C3C64A9008C5199 /* MQTTSSLSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = 841D0A7A1C35876E006A82DC /* MQTTSSLSecurityPolicy.m */; };
 		84A592191C3C64A9008C5199 /* MQTTSSLSecurityPolicyDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 841D0A7C1C35876E006A82DC /* MQTTSSLSecurityPolicyDecoder.m */; };
@@ -1165,7 +1162,6 @@
 				84B6A1A11C15E51300618573 /* MQTTTestWebsockets.m in Sources */,
 				84C845A61BDD8DE300FEC354 /* MQTTTestFlows.m in Sources */,
 				8435A25F1BF3C69200D2BF33 /* MQTTTestBlocks.m in Sources */,
-				84A592161C3C5343008C5199 /* MQTTTransport.m in Sources */,
 				840716511BBEF19E00FBB3CB /* MQTTSSLSecurityPolicyTests.m in Sources */,
 				840716531BBEF19E00FBB3CB /* MQTTClientTests.m in Sources */,
 				840716541BBEF19E00FBB3CB /* MQTTTestMultiThreading.m in Sources */,
@@ -1185,7 +1181,6 @@
 			files = (
 				84C845A51BDD8DD900FEC354 /* MQTTTestFlows.m in Sources */,
 				8435A25E1BF3C69200D2BF33 /* MQTTTestBlocks.m in Sources */,
-				84A592151C3C5343008C5199 /* MQTTTransport.m in Sources */,
 				8425D70E1BBE8D68005AD733 /* MQTTClientSubscriptionTests.m in Sources */,
 				8407160E1BBEE6A000FBB3CB /* SwiftTests.swift in Sources */,
 				8407160B1BBEE68900FBB3CB /* MQTTTestSessionManager.m in Sources */,
@@ -1206,7 +1201,6 @@
 				8429773F1B87CEF600A119FB /* MQTTTestSessionManager.m in Sources */,
 				8435A25D1BF3C69200D2BF33 /* MQTTTestBlocks.m in Sources */,
 				C21D3C711B1EBD730012DD2F /* MQTTSSLSecurityPolicyTests.m in Sources */,
-				84A592141C3C5343008C5199 /* MQTTTransport.m in Sources */,
 				840785A918A2AA26009158D5 /* MQTTClientPublishTests.m in Sources */,
 				84B6A1891C133A9F00618573 /* MQTTTestWebsockets.m in Sources */,
 				8461914A1883E56800101409 /* MQTTClientTests.m in Sources */,

diff --git a/MQTTClient/MQTTClient/MQTTCoreDataPersistence.m b/MQTTClient/MQTTClient/MQTTCoreDataPersistence.m
@@ -156,8 +156,10 @@ - (MQTTFlow *)flowforClientId:(NSString *)clientId
                             messageId:(UInt16)messageId {
     __block MQTTFlow *flow = nil;
 
+    DDLogVerbose(@"flowforClientId requestingPerform");
     [self.managedObjectContext performBlockAndWait:^{
-
+        DDLogVerbose(@"flowforClientId performing");
+
         NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"MQTTFlow"];
         fetchRequest.predicate = [NSPredicate predicateWithFormat:
                                   @"clientId = %@ and incomingFlag = %@ and messageId = %@",
@@ -175,9 +177,8 @@ - (MQTTFlow *)flowforClientId:(NSString *)clientId
                 flow = [flows lastObject];
             }
         }
-
     }];
-
+    DDLogVerbose(@"flowforClientId performed");
     return flow;
 }
 

diff --git a/MQTTClient/MQTTClient/MQTTDecoder.m b/MQTTClient/MQTTClient/MQTTDecoder.m
@@ -137,7 +137,7 @@ - (void)stream:(NSStream*)sender handleEvent:(NSStreamEvent)eventCode {
                 DDLogVerbose(@"[MQTTDecoder] received (%lu)=%@...", (unsigned long)self.dataBuffer.length,
                                     [self.dataBuffer subdataWithRange:NSMakeRange(0, MIN(256, self.dataBuffer.length))]);
                 [self.delegate decoder:self didReceiveMessage:self.dataBuffer];
-                self.dataBuffer = NULL;
+                self.dataBuffer = nil;
                 self.state = MQTTDecoderStateDecodingHeader;
             }
         }

diff --git a/MQTTClient/MQTTClient/MQTTMessage.m b/MQTTClient/MQTTClient/MQTTMessage.m
@@ -285,7 +285,7 @@ - (NSData *)wireFormat {
     while (length > 0);
 
     // encode message data
-    if (self.data != NULL) {
+    if (self.data != nil) {
         [buffer appendData:self.data];
     }
 

diff --git a/MQTTClient/MQTTClient/MQTTSession.m b/MQTTClient/MQTTClient/MQTTSession.m
@@ -936,13 +936,16 @@ - (void)error:(MQTTSessionEvent)eventCode error:(NSError *)error {
 }
 
 - (UInt16)nextMsgId {
+    DDLogVerbose(@"nextMsgId synchronizing");
     @synchronized(self) {
+        DDLogVerbose(@"nextMsgId synchronized");
         self.txMsgId++;
         while (self.txMsgId == 0 || [self.persistence flowforClientId:self.clientId
                                                          incomingFlag:NO
                                                             messageId:self.txMsgId] != nil) {
             self.txMsgId++;
         }
+        DDLogVerbose(@"nextMsgId synchronized done");
         return self.txMsgId;
     }
 }

diff --git a/MQTTClient/MQTTClientTests/MQTTClientTests-Bridging-Header.h b/MQTTClient/MQTTClientTests/MQTTClientTests-Bridging-Header.h
@@ -4,4 +4,5 @@
 
 #import <XCTest/XCTest.h>
 #import "MQTTClient.h"
-#import "MQTTTestHelpers.h"
+#import "MQTTTestHelpers.h"
+#import "MQTTSessionManager.h"
diff --git a/MQTTClient/MQTTClientTests/MQTTTestHelpers.h b/MQTTClient/MQTTClientTests/MQTTTestHelpers.h
@@ -10,6 +10,7 @@
 #import <XCTest/XCTest.h>
 
 #import "MQTTClient.h"
+#import "MQTTSessionManager.h"
 #import "MQTTSSLSecurityPolicy.h"
 
 #define LOG_LEVEL_DEF ddLogLevel
@@ -25,7 +26,7 @@ static const DDLogLevel ddLogLevel = DDLogLevelWarning;
 #define BULK 100 // some test servers are limited in queue size
 #define ALOT 1000 // some test servers are limited in queue size
 
-@interface MQTTTestHelpers : XCTestCase <MQTTSessionDelegate>
+@interface MQTTTestHelpers : XCTestCase <MQTTSessionDelegate, MQTTSessionManagerDelegate>
 - (void)timedout:(id)object;
 
 + (MQTTSession *)session:(NSDictionary *)parameters;

diff --git a/MQTTClient/MQTTClientTests/MQTTTestHelpers.m b/MQTTClient/MQTTClientTests/MQTTTestHelpers.m
@@ -161,6 +161,14 @@ - (void)newMessage:(MQTTSession *)session data:(NSData *)data onTopic:(NSString
     }
 }
 
+- (void)handleMessage:(NSData *)data onTopic:(NSString *)topic retained:(BOOL)retained {
+    DDLogVerbose(@"[MQTTTestHelpers] handleMessage r%d %@:%@",
+                 retained, topic, data);
+    if (topic && [topic hasPrefix:@"$"]) {
+        self.SYSreceived = true;
+    }
+}
+
 - (void)handleEvent:(MQTTSession *)session event:(MQTTSessionEvent)eventCode error:(NSError *)error {
     DDLogVerbose(@"[MQTTTestHelpers] handleEvent:%ld error:%@", (long)eventCode, error);
     self.event = eventCode;

diff --git a/MQTTClient/MQTTClientTests/MQTTTestHelpers.plist b/MQTTClient/MQTTClientTests/MQTTTestHelpers.plist
@@ -6,7 +6,7 @@
 	<array>
 		<string>#local</string>
 		<string>mosquitto</string>
-		<string>mosquittoWS</string>
+		<string>#mosquittoWS</string>
 		<string>#mosquittoTLS</string>
 		<string>#mosquittoTLSClientCert</string>
 		<string>#mosquittoWSS</string>

diff --git a/MQTTClient/MQTTClientTests/SwiftTests.swift b/MQTTClient/MQTTClientTests/SwiftTests.swift
@@ -58,6 +58,39 @@ class SwiftTests : MQTTTestHelpers {
         }
     }
 
+    func testSessionManager() {
+        for brokerName in brokers.allKeys {
+            var broker: NSDictionary;
+            broker = brokers.valueForKey(brokerName as! String) as! NSDictionary;
+            if (broker.valueForKey("websocket"))?.boolValue != true {
+
+                let m = MQTTSessionManager()
+                m.delegate = self
+
+                m.connectTo(broker.valueForKey("host") as! String,
+                    port: (broker.valueForKey("port")?.integerValue)!,
+                    tls:  (broker.valueForKey("tls")?.boolValue)!,
+                    keepalive: 60,
+                    clean: true,
+                    auth: false,
+                    user: nil,
+                    pass: nil,
+                    will: false,
+                    willTopic: nil,
+                    willMsg: nil,
+                    willQos: MQTTQosLevel.AtMostOnce,
+                    willRetainFlag: false,
+                    withClientId: nil)
+
+                while (m.state != MQTTSessionManagerState.Connected) {
+                    print("waiting for connect %d", m.state);
+                    NSRunLoop.currentRunLoop().runUntilDate(NSDate(timeIntervalSinceNow: 1))
+                }
+
+            }
+        }
+    }
+
     override func handleEvent(session: MQTTSession!, event eventCode: MQTTSessionEvent, error: NSError!) {
         switch eventCode {
         case .Connected:

diff --git a/MQTTClient/dist/documentation/html/_m_q_t_t_c_f_socket_transport_8h_source.html b/MQTTClient/dist/documentation/html/_m_q_t_t_c_f_socket_transport_8h_source.html
@@ -120,7 +120,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Jan 5 2016 21:51:44 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Wed Jan 13 2016 22:45:17 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.10
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/_m_q_t_t_core_data_persistence_8h_source.html b/MQTTClient/dist/documentation/html/_m_q_t_t_core_data_persistence_8h_source.html
@@ -110,7 +110,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Jan 5 2016 21:51:44 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Wed Jan 13 2016 22:45:17 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.10
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/_m_q_t_t_in_memory_persistence_8h_source.html b/MQTTClient/dist/documentation/html/_m_q_t_t_in_memory_persistence_8h_source.html
@@ -108,7 +108,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Jan 5 2016 21:51:44 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Wed Jan 13 2016 22:45:17 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.10
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/_m_q_t_t_persistence_8h_source.html b/MQTTClient/dist/documentation/html/_m_q_t_t_persistence_8h_source.html
@@ -177,7 +177,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Jan 5 2016 21:51:44 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Wed Jan 13 2016 22:45:17 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.10
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/_m_q_t_t_s_s_l_security_policy_8h_source.html b/MQTTClient/dist/documentation/html/_m_q_t_t_s_s_l_security_policy_8h_source.html
@@ -156,7 +156,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Jan 5 2016 21:51:44 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Wed Jan 13 2016 22:45:17 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.10
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/_m_q_t_t_s_s_l_security_policy_transport_8h_source.html b/MQTTClient/dist/documentation/html/_m_q_t_t_s_s_l_security_policy_transport_8h_source.html
@@ -109,7 +109,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Jan 5 2016 21:51:44 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Wed Jan 13 2016 22:45:17 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.10
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/_m_q_t_t_session_8h_source.html b/MQTTClient/dist/documentation/html/_m_q_t_t_session_8h_source.html
@@ -299,7 +299,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Jan 5 2016 21:51:44 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Wed Jan 13 2016 22:45:17 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.10
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/_m_q_t_t_session_manager_8h_source.html b/MQTTClient/dist/documentation/html/_m_q_t_t_session_manager_8h_source.html
@@ -205,7 +205,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Jan 5 2016 21:51:44 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Wed Jan 13 2016 22:45:17 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.10
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/_m_q_t_t_transport_8h_source.html b/MQTTClient/dist/documentation/html/_m_q_t_t_transport_8h_source.html
@@ -157,7 +157,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Jan 5 2016 21:51:44 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Wed Jan 13 2016 22:45:17 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.10
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/_m_q_t_t_websocket_transport_8h_source.html b/MQTTClient/dist/documentation/html/_m_q_t_t_websocket_transport_8h_source.html
@@ -129,7 +129,7 @@
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Jan 5 2016 21:51:44 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Wed Jan 13 2016 22:45:17 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.10
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/annotated.html b/MQTTClient/dist/documentation/html/annotated.html
@@ -112,7 +112,7 @@
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Jan 5 2016 21:51:45 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Wed Jan 13 2016 22:45:17 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.10
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/class_m_q_t_t_c_f_socket_transport-members.html b/MQTTClient/dist/documentation/html/class_m_q_t_t_c_f_socket_transport-members.html
@@ -110,7 +110,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Jan 5 2016 21:51:44 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Wed Jan 13 2016 22:45:17 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.10
 </small></address>

diff --git a/MQTTClient/dist/documentation/html/class_m_q_t_t_core_data_persistence-members.html b/MQTTClient/dist/documentation/html/class_m_q_t_t_core_data_persistence-members.html
@@ -105,7 +105,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Tue Jan 5 2016 21:51:44 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Wed Jan 13 2016 22:45:17 for MQTTClient by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.10
 </small></address>