Add side-by-side v3 and v5 test.

CIPop · Aug 14, 2023 · 2e590a9 · 2e590a9
1 parent e70d4e3
commit 2e590a9
Show file tree

Hide file tree

Showing 3 changed files with 933 additions and 6 deletions.
diff --git a/MQTTPacket/src/MQTTPacketCommon.h b/MQTTPacket/src/MQTTPacketCommon.h
@@ -43,10 +43,7 @@ enum msgTypes
 {
 	CONNECT = 1, CONNACK, PUBLISH, PUBACK, PUBREC, PUBREL,
 	PUBCOMP, SUBSCRIBE, SUBACK, UNSUBSCRIBE, UNSUBACK,
-	PINGREQ, PINGRESP, DISCONNECT
-#if defined(MQTTV5)
-  , AUTH
-#endif
+	PINGREQ, PINGRESP, DISCONNECT, AUTH
 };
 
 /**
@@ -118,7 +115,7 @@ typedef struct {
 	int rem_len;
 	int32_t len;
 	char state;
-}MQTTTransport;
+} MQTTTransport;
 
 int MQTTPacket_readnb(unsigned char* buf, int32_t buflen, MQTTTransport *trp);
 

diff --git a/MQTTPacket/test/CMakeLists.txt b/MQTTPacket/test/CMakeLists.txt
@@ -87,4 +87,30 @@ ADD_TEST(
 SET_TESTS_PROPERTIES(
 	test3
 	PROPERTIES TIMEOUT 540
-)
+)
+
+ADD_EXECUTABLE(
+	test35
+	test35.c
+	../samples/transport.c
+)
+
+# Disabling deprecation warnings:
+#  warning: ‘ftime’ is deprecated [-Wdeprecated-declarations]
+target_compile_options(test35 PRIVATE -Wno-deprecated-declarations)
+
+TARGET_LINK_LIBRARIES(
+	test35
+	paho-embed-mqtt3c
+	paho-embed-mqtt5c
+)
+
+ADD_TEST(
+	NAME test35
+	COMMAND "test35" "--connection" ${MQTT_TEST_BROKER}
+)
+
+SET_TESTS_PROPERTIES(
+	test35
+	PROPERTIES TIMEOUT 540
+)